From: Ben Gras <ben@minix3.org>
Date: Tue, 11 Apr 2006 13:42:29 +0000 (+0000)
Subject: added -L option that makes nonamed ignore queries that don't come from
X-Git-Tag: v3.1.2a~30
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=ab3b9ed760c14c9e380c35701a1e353abb43e7a8;p=minix.git

added -L option that makes nonamed ignore queries that don't come from
localhost.
---

diff --git a/commands/simple/nonamed.c b/commands/simple/nonamed.c
index f59c5ee8f..797e6c56a 100755
--- a/commands/simple/nonamed.c
+++ b/commands/simple/nonamed.c
@@ -12,6 +12,7 @@ static const char version[] = "2.7";
 #define nil ((void*)0)
 #include <sys/types.h>
 #include <stdio.h>
+#include <syslog.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -78,6 +79,8 @@ static u32_t stale;		/* Extension time for stale data. */
 static u32_t httl;		/* TTL for /etc/hosts data. */
 static int reinit, done;	/* Reinit config / program is done. */
 static int single;		/* Run single on a nondefault interface. */
+static int localonly;		/* Only accept local queries. */
+#define LOCALHOST	0x7F000001
 
 static void report(const char *label)
 {
@@ -801,7 +804,7 @@ static void init_config(ipaddr_t ifip)
     time_t ht, dt;
 
     /* See if anything really changed. */
-    if (((ifip ^ HTONL(0x7F000000)) & HTONL(0xFF000000)) == 0) ifip= my_ip;
+    if (((ifip ^ HTONL(LOCALHOST)) & HTONL(0xFF000000)) == 0) ifip= my_ip;
     ht= filetime(HOSTS);
     dt= filetime(DHCPCACHE);
     if (ifip == my_ip && ht == hosts_time && dt == dhcp_time) return;
@@ -889,7 +892,7 @@ static int query_hosts(u8_t *qname, unsigned type, dns_t *dp, size_t *pdlen)
     unsigned ancount;
     struct hostent localhost;
     static char *noaliases[]= { nil };
-    static ipaddr_t localaddr= HTONL(0x7F000001L);
+    static ipaddr_t localaddr= HTONL(LOCALHOST);
     static char *localaddrlist[]= { (char *) &localaddr, nil };
 
     if (single) return 0;
@@ -1404,6 +1407,15 @@ static int job_read_udp(void *data, int expired)
 	/* A query. */
 	if (udp.dns.hdr.dh_qdcount != HTONS(1)) return 1;
 
+	if(localonly) {
+		/* Check if it's a local query. */
+		if(ntohl(udp.hdr.uih_src_addr) != LOCALHOST) {
+		   	syslog(LOG_WARNING, "nonamed: dropped query from %s",
+		   		inet_ntoa(udp.hdr.uih_src_addr));
+		   	return 1;
+		}
+	}
+
 	/* Try to compose a reply from local data. */
 	if (compose_reply(&udp.dns, &dlen)) {
 	    udp.hdr.uih_dst_addr= udp.hdr.uih_src_addr;
@@ -2039,6 +2051,9 @@ int main(int argc, char **argv)
 	case 'q':		/* Quit after printing cache contents. */
 	    quit= 1;
 	    break;
+	case 'L':
+	    localonly= 1;
+	    break;
 	default:
 	    usage();
 	}
@@ -2102,6 +2117,9 @@ int main(int argc, char **argv)
     newjob(job_setup_listen, IMMEDIATE, nil);
     newjob(job_find_named, IMMEDIATE, nil);
 
+    /* Open syslog. */
+    openlog("nonamed", LOG_PID, LOG_DAEMON);
+
     while (!done) {
 	/* There is always something in the queue. */
 	assert(queue != nil);