upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-27 09:06:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few places where the new config code would fail if there was no

Browse source 
config file (-c /dev/null).
This commit is contained in:
Brian Wellington 2001-03-06 19:04:42 +00:00
parent 72b7d215f7
commit 7c294304af
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/named/server.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.296 2001/03/06 02:49:29 bwelling Exp $ */
/* $Id: server.c,v 1.297 2001/03/06 19:04:42 bwelling Exp $ */
#include <config.h>
@ -1664,7 +1664,13 @@ load_configuration(const char *filename, ns_server_t *server,
ns_listenlist_t *listenon = NULL;
clistenon = NULL;
(void)cfg_map_get(options, "listen-on", &clistenon);
/*
* Even though listen-on is present in the default
* configuration, we can't use it here, since it isn't
* used if we're in lwresd mode. This way is easier.
*/
if (options != NULL)
(void)cfg_map_get(options, "listen-on", &clistenon);
if (clistenon != NULL) {
result = ns_listenlist_fromconfig(clistenon,
config,
@ -1691,7 +1697,8 @@ load_configuration(const char *filename, ns_server_t *server,
cfg_obj_t *clistenon = NULL;
ns_listenlist_t *listenon = NULL;
(void)cfg_map_get(options, "listen-on-v6", &clistenon);
if (options != NULL)
(void)cfg_map_get(options, "listen-on-v6", &clistenon);
if (clistenon != NULL) {
result = ns_listenlist_fromconfig(clistenon,
config,
@ -1820,7 +1827,7 @@ load_configuration(const char *filename, ns_server_t *server,
/*
* Load the TKEY information from the configuration.
*/
{
if (options != NULL) {
dns_tkeyctx_t *t = NULL;
CHECKM(ns_tkeyctx_fromconfig(options, ns_g_mctx, ns_g_entropy,
&t),