|
|
|
|
Index: bin/Makefile.in
|
|
|
|
|
--- bin/Makefile.in.orig 2020-03-11 17:46:53.000000000 +0100
|
|
|
|
|
+++ bin/Makefile.in 2020-03-20 12:10:50.363726000 +0100
|
|
|
|
|
@@ -12,7 +12,7 @@
|
|
|
|
|
top_srcdir = @top_srcdir@
|
|
|
|
|
|
|
|
|
|
SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \
|
|
|
|
|
- @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
|
|
|
|
|
+ @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins
|
|
|
|
|
TARGETS =
|
|
|
|
|
|
|
|
|
|
@BIND9_MAKE_RULES@
|
|
|
|
|
Index: bin/named/main.c
|
|
|
|
|
--- bin/named/main.c.orig 2020-03-20 12:10:50.364071000 +0100
|
|
|
|
|
+++ bin/named/main.c 2020-03-20 18:32:03.496660000 +0100
|
|
|
|
|
@@ -1172,24 +1172,6 @@
|
|
|
|
|
NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
"linked to zlib version: %s", zlibVersion());
|
|
|
|
|
#endif /* if defined(HAVE_ZLIB) && defined(ZLIB_VERSION) */
|
|
|
|
|
- isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
|
|
|
|
|
- NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
- "----------------------------------------------------");
|
|
|
|
|
- isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
|
|
|
|
|
- NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
- "BIND 9 is maintained by Internet Systems Consortium,");
|
|
|
|
|
- isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
|
|
|
|
|
- NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
- "Inc. (ISC), a non-profit 501(c)(3) public-benefit ");
|
|
|
|
|
- isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
|
|
|
|
|
- NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
- "corporation. Support and training for BIND 9 are ");
|
|
|
|
|
- isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
|
|
|
|
|
- NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
- "available at https://www.isc.org/support");
|
|
|
|
|
- isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
|
|
|
|
|
- NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,
|
|
|
|
|
- "----------------------------------------------------");
|
|
|
|
|
|
|
|
|
|
dump_symboltable();
|
|
|
|
|
|
|
|
|
|
Index: bin/named/unix/os.c
|
|
|
|
|
--- bin/named/unix/os.c.orig 2020-03-11 17:46:53.000000000 +0100
|
|
|
|
|
+++ bin/named/unix/os.c 2020-03-20 12:10:50.364363000 +0100
|
|
|
|
|
@@ -167,6 +167,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/rndc/rndc.c
|
|
|
|
|
--- bin/rndc/rndc.c.orig 2020-03-11 17:46:53.000000000 +0100
|
|
|
|
|
+++ bin/rndc/rndc.c 2020-03-20 12:10:50.364565000 +0100
|
|
|
|
|
@@ -607,10 +607,12 @@
|
|
|
|
|
}
|
|
|
|
|
key_only = 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));
|
