|
|
|
|
Index: bin/Makefile.in
|
|
|
|
|
--- bin/Makefile.in.orig 2016-10-12 19:33:25.599370000 +0200
|
|
|
|
|
+++ bin/Makefile.in 2016-10-12 19:33:48.569390394 +0200
|
|
|
|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
VPATH = @srcdir@
|
|
|
|
|
top_srcdir = @top_srcdir@
|
|
|
|
|
|
|
|
|
|
-SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \
|
|
|
|
|
+SUBDIRS = named rndc dig delv dnssec tools nsupdate \
|
|
|
|
|
check confgen @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@
|
|
|
|
|
TARGETS =
|
|
|
|
|
|
|
|
|
|
Index: bin/named/main.c
|
|
|
|
|
--- bin/named/main.c.orig 2016-09-29 09:01:06.000000000 +0200
|
|
|
|
|
+++ bin/named/main.c 2016-10-12 19:33:25.609419713 +0200
|
|
|
|
|
@@ -1058,25 +1058,6 @@
|
|
|
|
|
ISC_LOG_NOTICE, "running as: %s%s",
|
|
|
|
|
program_name, saved_command_line);
|
|
|
|
|
|
|
|
|
|
- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
|
|
|
|
- ISC_LOG_NOTICE,
|
|
|
|
|
- "----------------------------------------------------");
|
|
|
|
|
- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
|
|
|
|
- ISC_LOG_NOTICE,
|
|
|
|
|
- "BIND 9 is maintained by Internet Systems Consortium,");
|
|
|
|
|
- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
|
|
|
|
- ISC_LOG_NOTICE,
|
|
|
|
|
- "Inc. (ISC), a non-profit 501(c)(3) public-benefit ");
|
|
|
|
|
- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
|
|
|
|
- ISC_LOG_NOTICE,
|
|
|
|
|
- "corporation. Support and training for BIND 9 are ");
|
|
|
|
|
- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
|
|
|
|
- ISC_LOG_NOTICE,
|
|
|
|
|
- "available at https://www.isc.org/support");
|
|
|
|
|
- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
|
|
|
|
|
- ISC_LOG_NOTICE,
|
|
|
|
|
- "----------------------------------------------------");
|
|
|
|
|
-
|
|
|
|
|
dump_symboltable();
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Index: bin/named/unix/os.c
|
|
|
|
|
--- bin/named/unix/os.c.orig 2016-09-29 09:01:06.000000000 +0200
|
|
|
|
|
+++ bin/named/unix/os.c 2016-10-12 19:33:25.609419713 +0200
|
|
|
|
|
@@ -274,6 +274,13 @@
|
|
|
|
|
SET_CAP(CAP_SETGID);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
+ * Since we call chown, we need this.
|
|
|
|
|
+ */
|
|
|
|
|
+#if defined(CAP_CHOWN)
|
|
|
|
|
+ SET_CAP(CAP_CHOWN);
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
+ /*
|
|
|
|
|
* Without this, we run into problems reading a configuration file
|
|
|
|
|
* owned by a non-root user and non-world-readable on startup.
|
|
|
|
|
*/
|
|
|
|
|
Index: bin/named/xfrout.c
|
|
|
|
|
--- bin/named/xfrout.c.orig 2016-09-29 09:01:06.000000000 +0200
|
|
|
|
|
+++ bin/named/xfrout.c 2016-10-12 19:33:25.609419713 +0200
|
|
|
|
|
@@ -1617,6 +1617,7 @@
|
|
|
|
|
sendstream(xfr);
|
|
|
|
|
} else {
|
|
|
|
|
/* End of zone transfer stream. */
|
|
|
|
|
+ if (xfr->zone != NULL)
|
|
|
|
|
inc_stats(xfr->zone, dns_nsstatscounter_xfrdone);
|
|
|
|
|
xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic);
|
|
|
|
|
ns_client_next(xfr->client, ISC_R_SUCCESS);
|
|
|
|
|
Index: bin/rndc/rndc.c
|
|
|
|
|
--- bin/rndc/rndc.c.orig 2016-09-29 09:01:06.000000000 +0200
|
|
|
|
|
+++ bin/rndc/rndc.c 2016-10-12 19:33:25.609419713 +0200
|
|
|
|
|
@@ -544,9 +544,11 @@
|
|
|
|
|
admin_conffile, admin_keyfile);
|
|
|
|
|
key_only = ISC_TRUE;
|
|
|
|
|
} else if (! c_flag && isc_file_exists(admin_keyfile)) {
|
|
|
|
|
+ /*
|
|
|
|
|
fprintf(stderr, "WARNING: key file (%s) exists, but using "
|
|
|
|
|
"default configuration file (%s)\n",
|
|
|
|
|
admin_keyfile, admin_conffile);
|
|
|
|
|
+ */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DO("create parser", cfg_parser_create(mctx, log, pctxp));
|
