bind/bind.patch@300d43423c2e (annotated)
bind/bind.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@556 | 1 | Index: bin/named/unix/os.c |
| michael@556 | 2 | --- bin/named/unix/os.c.orig 2008-05-06 03:32:51 +0200 |
| michael@556 | 3 | +++ bin/named/unix/os.c 2008-07-25 07:47:14 +0200 |
| michael@556 | 4 | @@ -261,6 +261,13 @@ |
| michael@556 | 5 | SET_CAP(CAP_SETGID); |
| michael@556 | 6 | |
| michael@556 | 7 | /* |
| michael@556 | 8 | + * Since we call chown, we need this. |
| michael@556 | 9 | + */ |
| michael@556 | 10 | +#if defined(CAP_CHOWN) |
| michael@556 | 11 | + SET_CAP(CAP_CHOWN); |
| michael@556 | 12 | +#endif |
| michael@556 | 13 | + |
| michael@556 | 14 | + /* |
| michael@556 | 15 | * Without this, we run into problems reading a configuration file |
| michael@556 | 16 | * owned by a non-root user and non-world-readable on startup. |
| michael@556 | 17 | */ |
| michael@556 | 18 | |
| michael@556 | 19 | ----------------------------------------------------------------------------- |
| michael@556 | 20 | |
| michael@556 | 21 | As mentionned in http://groups.google.com/group/comp.protocols.dns.bind/browse_thread/thread/5a6cb9a54b56b199 |
| michael@556 | 22 | "Assertion debug information" without this patch BIND+dlz crashes when |
| michael@556 | 23 | doing zone transfer request ("host -la domain server") |
| michael@556 | 24 | |
| michael@556 | 25 | Index: bin/named/xfrout.c |
| michael@556 | 26 | --- bin/named/xfrout.c.orig 2008-04-03 08:20:33.000000000 +0200 |
| michael@556 | 27 | +++ bin/named/xfrout.c 2008-11-27 08:58:20.000000000 +0100 |
| michael@556 | 28 | @@ -1744,6 +1745,7 @@ xfrout_senddone(isc_task_t *task, isc_ev |
| michael@556 | 29 | sendstream(xfr); |
| michael@556 | 30 | } else { |
| michael@556 | 31 | /* End of zone transfer stream. */ |
| michael@556 | 32 | + if (xfr->zone != NULL) |
| michael@556 | 33 | inc_stats(xfr->zone, dns_nsstatscounter_xfrdone); |
| michael@556 | 34 | xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic); |
| michael@556 | 35 | ns_client_next(xfr->client, ISC_R_SUCCESS); |
| michael@556 | 36 | |
| michael@556 | 37 | ----------------------------------------------------------------------------- |
| michael@556 | 38 | |
| michael@556 | 39 | OpenPKG intentionally uses a reused "rdnc.key" and a "rdnc.conf" |
| michael@556 | 40 | and hence we don't want to see those warning messages. |
| michael@556 | 41 | |
| michael@556 | 42 | Index: bin/rndc/rndc.c |
| michael@556 | 43 | --- bin/rndc/rndc.c.orig 2010-07-11 02:12:18.000000000 +0200 |
| michael@556 | 44 | +++ bin/rndc/rndc.c 2011-02-06 17:08:38.000000000 +0100 |
| michael@556 | 45 | @@ -468,9 +468,11 @@ |
| michael@556 | 46 | admin_conffile, admin_keyfile); |
| michael@556 | 47 | key_only = ISC_TRUE; |
| michael@556 | 48 | } else if (! c_flag && isc_file_exists(admin_keyfile)) { |
| michael@556 | 49 | + /* |
| michael@556 | 50 | fprintf(stderr, "WARNING: key file (%s) exists, but using " |
| michael@556 | 51 | "default configuration file (%s)\n", |
| michael@556 | 52 | admin_keyfile, admin_conffile); |
| michael@556 | 53 | + */ |
| michael@556 | 54 | } |
| michael@556 | 55 | |
| michael@556 | 56 | DO("create parser", cfg_parser_create(mctx, log, pctxp)); |
