Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/external/mpl/bind/dist/bin/named/main.c,v
rcsdiff: /ftp/cvs/cvsroot/src/external/mpl/bind/dist/bin/named/main.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4.2.4
retrieving revision 1.5
diff -u -p -r1.4.2.4 -r1.5
--- src/external/mpl/bind/dist/bin/named/main.c	2020/04/13 08:02:36	1.4.2.4
+++ src/external/mpl/bind/dist/bin/named/main.c	2019/09/09 14:40:39	1.5
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.4.2.4 2020/04/13 08:02:36 martin Exp $	*/
+/*	$NetBSD: main.c,v 1.5 2019/09/09 14:40:39 christos Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -68,7 +68,6 @@
 #include <ns/interfacemgr.h>
 
 #include <named/builtin.h>
-#include <named/config.h>
 #include <named/control.h>
 #include <named/fuzz.h>
 #include <named/globals.h>	/* Explicit, though named/log.h includes it. */
@@ -364,7 +363,7 @@ save_command_line(int argc, char *argv[]
 			 * nearly always be fine.
 			 */
 			if (quoted || isalnum(*src & 0xff) ||
-			    *src == ',' || *src == '-' || *src == '_' ||
+			    *src == '-' || *src == '_' ||
 			    *src == '.' || *src == '/') {
 				*dst++ = *src++;
 				quoted = false;
@@ -454,12 +453,6 @@ set_flags(const char *arg, struct flag_d
 static void
 printversion(bool verbose) {
 	char rndcconf[PATH_MAX], *dot = NULL;
-#if defined(HAVE_GEOIP2)
-	isc_mem_t *mctx = NULL;
-	cfg_parser_t *parser = NULL;
-	cfg_obj_t *config = NULL;
-	const cfg_obj_t *defaults = NULL, *obj = NULL;
-#endif
 
 	printf("%s %s%s%s <id:%s>\n",
 	       named_g_product, named_g_version,
@@ -546,20 +539,7 @@ OPENSSL_VERSION_NUMBER >= 0x10100000L /*
 	printf("  nsupdate session key: %s\n", named_g_defaultsessionkeyfile);
 	printf("  named PID file:       %s\n", named_g_defaultpidfile);
 	printf("  named lock file:      %s\n", named_g_defaultlockfile);
-#if defined(HAVE_GEOIP2)
-#define RTC(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS)
-	RTC(isc_mem_create(0, 0, &mctx));
-	RTC(cfg_parser_create(mctx, named_g_lctx, &parser));
-	RTC(named_config_parsedefaults(parser, &config));
-	RTC(cfg_map_get(config, "options", &defaults));
-	RTC(cfg_map_get(defaults, "geoip-directory", &obj));
-	if (cfg_obj_isstring(obj)) {
-		printf("  geoip-directory:      %s\n", cfg_obj_asstring(obj));
-	}
-	cfg_obj_destroy(parser, &config);
-	cfg_parser_destroy(&parser);
-	isc_mem_detach(&mctx);
-#endif /* HAVE_GEOIP2 */
+
 }
 
 static void
@@ -636,9 +616,6 @@ parse_T_opt(char *option) {
 		maxudp = 1460;
 	} else if (!strncmp(option, "maxudp=", 7)) {
 		maxudp = atoi(option + 7);
-		if (maxudp <= 0) {
-			named_main_earlyfatal("bad maxudp");
-		}
 	} else if (!strncmp(option, "mkeytimers=", 11)) {
 		p = strtok_r(option + 11, "/", &last);
 		if (p == NULL) {
@@ -1388,17 +1365,6 @@ main(int argc, char *argv[]) {
 	(void) ProfilerStart(NULL);
 #endif
 
-#ifdef WIN32
-	/*
-	 * Prevent unbuffered I/O from crippling named performance on Windows
-	 * when it is logging to stderr (e.g. in system tests).  Use full
-	 * buffering (_IOFBF) as line buffering (_IOLBF) is unavailable on
-	 * Windows and fflush() is called anyway after each log message gets
-	 * written to the default stderr logging channels created by libisc.
-	*/
-	setvbuf(stderr, NULL, _IOFBF, BUFSIZ);
-#endif
-
 	/*
 	 * Record version in core image.
 	 * strings named.core | grep "named version:"