You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
73 lines
2.6 KiB
73 lines
2.6 KiB
Index: bin/Makefile.in |
|
--- bin/Makefile.in.orig 2018-01-17 07:56:09.000000000 +0100 |
|
+++ bin/Makefile.in 2018-02-26 19:40:06.043497000 +0100 |
|
@@ -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 2018-01-17 07:56:09.000000000 +0100 |
|
+++ bin/named/main.c 2018-02-26 19:41:06.715980000 +0100 |
|
@@ -1084,25 +1084,6 @@ |
|
"running as: %s%s", |
|
program_name, saved_command_line); |
|
|
|
- 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 2018-01-17 07:56:09.000000000 +0100 |
|
+++ bin/named/unix/os.c 2018-02-26 19:40:38.947396000 +0100 |
|
@@ -275,6 +275,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 2018-01-17 07:56:09.000000000 +0100 |
|
+++ bin/rndc/rndc.c 2018-02-26 19:40:40.050074000 +0100 |
|
@@ -581,9 +581,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));
|
|
|