"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "remote.c" between
nsd-4.3.5.tar.gz and nsd-4.3.6.tar.gz

About: NSD is an authoritative only, high performance, simple name server daemon.

remote.c  (nsd-4.3.5):remote.c  (nsd-4.3.6)
skipping to change at line 94 skipping to change at line 94
#endif #endif
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
# include <sys/stat.h> # include <sys/stat.h>
#endif #endif
#ifdef HAVE_NETDB_H #ifdef HAVE_NETDB_H
# include <netdb.h> # include <netdb.h>
#endif #endif
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
# include <sys/un.h> # include <sys/un.h>
#endif #endif
#ifndef AF_LOCAL
#define AF_LOCAL AF_UNIX
#endif
/** number of seconds timeout on incoming remote control handshake */ /** number of seconds timeout on incoming remote control handshake */
#define REMOTE_CONTROL_TCP_TIMEOUT 120 #define REMOTE_CONTROL_TCP_TIMEOUT 120
/** repattern to master or slave */ /** repattern to master or slave */
#define REPAT_SLAVE 1 #define REPAT_SLAVE 1
#define REPAT_MASTER 2 #define REPAT_MASTER 2
/** if you want zero to be inhibited in stats output. /** if you want zero to be inhibited in stats output.
* it omits zeroes for types that have no acronym and unused-rcodes */ * it omits zeroes for types that have no acronym and unused-rcodes */
skipping to change at line 2096 skipping to change at line 2099
return; return;
} }
zopt_set_acl_to_tsig(zone->pattern->allow_notify, region, arg2, zopt_set_acl_to_tsig(zone->pattern->allow_notify, region, arg2,
key_opt); key_opt);
zopt_set_acl_to_tsig(zone->pattern->notify, region, arg2, key_opt); zopt_set_acl_to_tsig(zone->pattern->notify, region, arg2, key_opt);
zopt_set_acl_to_tsig(zone->pattern->request_xfr, region, arg2, zopt_set_acl_to_tsig(zone->pattern->request_xfr, region, arg2,
key_opt); key_opt);
zopt_set_acl_to_tsig(zone->pattern->provide_xfr, region, arg2, zopt_set_acl_to_tsig(zone->pattern->provide_xfr, region, arg2,
key_opt); key_opt);
zopt_set_acl_to_tsig(zone->pattern->allow_query, region, arg2,
key_opt);
task_new_add_pattern(xfrd->nsd->task[xfrd->nsd->mytask], task_new_add_pattern(xfrd->nsd->task[xfrd->nsd->mytask],
xfrd->last_task, zone->pattern); xfrd->last_task, zone->pattern);
xfrd_set_reload_now(xfrd); xfrd_set_reload_now(xfrd);
send_ok(ssl); send_ok(ssl);
} }
/** see if TSIG key is used in the acl */ /** see if TSIG key is used in the acl */
static int static int
skipping to change at line 2137 skipping to change at line 2142
key_opt = key_options_find(xfrd->nsd->options, arg); key_opt = key_options_find(xfrd->nsd->options, arg);
if(!key_opt) { if(!key_opt) {
(void)ssl_printf(ssl, "key %s does not exist, nothing to be delet ed\n", arg); (void)ssl_printf(ssl, "key %s does not exist, nothing to be delet ed\n", arg);
return; return;
} }
RBTREE_FOR(zone, struct zone_options*, xfrd->nsd->options->zone_options) RBTREE_FOR(zone, struct zone_options*, xfrd->nsd->options->zone_options)
{ {
if(acl_contains_tsig_key(zone->pattern->allow_notify, arg) || if(acl_contains_tsig_key(zone->pattern->allow_notify, arg) ||
acl_contains_tsig_key(zone->pattern->notify, arg) || acl_contains_tsig_key(zone->pattern->notify, arg) ||
acl_contains_tsig_key(zone->pattern->request_xfr, arg) || acl_contains_tsig_key(zone->pattern->request_xfr, arg) ||
acl_contains_tsig_key(zone->pattern->provide_xfr, arg)) { acl_contains_tsig_key(zone->pattern->provide_xfr, arg) ||
acl_contains_tsig_key(zone->pattern->allow_query, arg)) {
if(!ssl_printf(ssl, "zone %s uses key %s\n", if(!ssl_printf(ssl, "zone %s uses key %s\n",
zone->name, arg)) zone->name, arg))
return; return;
used_key = 1; used_key = 1;
break; break;
} }
} }
if(used_key) { if(used_key) {
(void)ssl_printf(ssl, "error: key: %s is in use and cannot be del eted\n", arg); (void)ssl_printf(ssl, "error: key: %s is in use and cannot be del eted\n", arg);
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)