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

in named-checkconf, pass in the complete path of named.conf

Browse source 
as NAMED_CONFFILE instead of constructing it by compile-time concatenation of NS_SYSCONFDIR
and /named.conf, to facilitate win32 support
This commit is contained in:
Andreas Gustafsson 2001-07-27 17:45:29 +00:00
parent 1d78c8d7cd
commit 321fd0ceb4
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/check/Makefile.in
View file

@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.14 2001/06/29 01:04:53 gson Exp $
# $Id: Makefile.in,v 1.15 2001/07/27 17:45:27 gson Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${DNS_INCLUDES} ${ISCCFG_INCLUDES} ${ISC_INCLUDES}
CDEFINES = -DNS_SYSCONFDIR=\"${sysconfdir}\"
CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@

4
bin/check/named-checkconf.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkconf.c,v 1.11 2001/07/27 04:59:01 mayer Exp $ */
/* $Id: named-checkconf.c,v 1.12 2001/07/27 17:45:26 gson Exp $ */
#include <config.h>
@ -108,7 +108,7 @@ main(int argc, char **argv) {
if (argv[isc_commandline_index] != NULL)
conffile = argv[isc_commandline_index];
if (conffile == NULL || conffile[0] == '\0')
conffile = NS_SYSCONFDIR "/named.conf";
conffile = NAMED_CONFFILE;
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);

4
lib/isc/win32/include/isc/ntpaths.h
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ntpaths.h,v 1.8 2001/07/27 05:16:55 mayer Exp $ */
/* $Id: ntpaths.h,v 1.9 2001/07/27 17:45:29 gson Exp $ */
/*
* Windows-specific path definitions
@ -49,6 +49,8 @@ enum NtPaths {
#define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH)
#define RNDC_AUTOCONFFILE isc_ntpaths_get(NAMED_KEY_PATH)
#define NAMED_CONFFILE isc_ntpaths_get(NAMED_CONF_PATH)
/*
* Information about where the files are on disk
*/