mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 08:35:31 +00:00
Code Issues Releases Wiki Activity

Refactor

Browse Source 
Reviewed on Jabber by Evan.
This commit is contained in:
Mukund Sivaraman
2017-09-26 03:02:09 +05:30
parent 2919a6d34b
commit eb1e4cce6c
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/named/server.c
View File

@@ -8104,14 +8104,15 @@ load_configuration(const char *filename, named_server_t *server,
* Write the PID file.
*/
obj = NULL;
if (named_config_get(maps, "pid-file", &obj) == ISC_R_SUCCESS)
if (named_config_get(maps, "pid-file", &obj) == ISC_R_SUCCESS) {
if (cfg_obj_isvoid(obj))
named_os_writepidfile(NULL, first_time);
else
named_os_writepidfile(cfg_obj_asstring(obj),
first_time);
else
} else {
named_os_writepidfile(named_g_defaultpidfile, first_time);
}
/*
* Configure the server-wide session key. This must be done before

17
bin/nsupdate/nsupdate.c
View File

@@ -903,14 +903,14 @@ setup_system(void) {
}
} else {
isc_sockaddr_t *sa;
int i = 0;
int i;
/*
* Count the nameservers (skipping any that we can't use
* because of address family restrictions) and allocate
* the servers array.
*/
ns_total = ns_alloc = 0;
ns_total = 0;
for (sa = ISC_LIST_HEAD(*nslist);
sa != NULL;
sa = ISC_LIST_NEXT(sa, link))
@@ -919,13 +919,11 @@ setup_system(void) {
case AF_INET:
if (have_ipv4) {
ns_total++;
continue;
}
break;
case AF_INET6:
if (have_ipv6) {
ns_total++;
continue;
}
break;
default:
@@ -938,22 +936,21 @@ setup_system(void) {
if (servers == NULL)
fatal("out of memory");
i = 0;
for (sa = ISC_LIST_HEAD(*nslist);
sa != NULL;
sa = ISC_LIST_NEXT(sa, link))
{
switch (sa->type.sa.sa_family) {
case AF_INET:
if (!have_ipv4) {
continue;
if (have_ipv4) {
sa->type.sin.sin_port = htons(dnsport);
}
sa->type.sin.sin_port = htons(dnsport);
break;
case AF_INET6:
if (!have_ipv6) {
continue;
if (have_ipv6) {
sa->type.sin6.sin6_port = htons(dnsport);
}
sa->type.sin6.sin6_port = htons(dnsport);
break;
default:
fatal("bad family");