From bfc2d518d18e19bd5a8601289f0d70d7f6d8e95e Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Tue, 8 Feb 2000 21:15:41 +0000 Subject: [PATCH] use ns_g_defaultpidfile --- bin/named/include/named/globals.h | 3 +-- bin/named/server.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index ec65b8105a..89284dc69f 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -75,8 +75,7 @@ EXTERN isc_boolean_t ns_g_coreok INIT(ISC_TRUE); EXTERN const char * ns_g_chrootdir INIT(NULL); EXTERN isc_boolean_t ns_g_foreground INIT(ISC_FALSE); -EXTERN const char * ns_g_defaultpidfile INIT("/var/run/named.pid"); -EXTERN char * ns_g_pidfile INIT(NULL); +EXTERN char * ns_g_defaultpidfile INIT("/var/run/named.pid"); EXTERN const char * ns_g_username INIT(NULL); /* diff --git a/bin/named/server.c b/bin/named/server.c index c7dbc1aa46..2f05f58e05 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -876,7 +876,7 @@ load_configuration(const char *filename, ns_server_t *server, if (dns_c_ctx_getpidfilename(configctx, &pidfilename) == ISC_R_NOTFOUND) - pidfilename = "/var/run/named.pid"; + pidfilename = ns_g_defaultpidfile; ns_os_writepidfile(pidfilename); dns_aclconfctx_destroy(&aclconfctx);