diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c index 80f6fa8f49..5502c0ae72 100644 --- a/bin/named/win32/os.c +++ b/bin/named/win32/os.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: os.c,v 1.3 2001/07/27 05:02:11 mayer Exp $ */ +/* $Id: os.c,v 1.4 2001/08/09 02:55:38 mayer Exp $ */ #include #include @@ -57,7 +57,7 @@ ns_paths_init() { ns_g_conffile = isc_ntpaths_get(NAMED_CONF_PATH); ns_g_defaultpidfile = isc_ntpaths_get(NAMED_PID_PATH); lwresd_g_defaultpidfile = isc_ntpaths_get(LWRESD_PID_PATH); - ns_g_autorndckeyfile = isc_ntpaths_get(NAMED_KEY_PATH); + ns_g_autorndckeyfile = isc_ntpaths_get(RNDC_KEY_PATH); Initialized = TRUE; } diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h index 8e0d13843f..fc6eb478bc 100644 --- a/lib/isc/win32/include/isc/ntpaths.h +++ b/lib/isc/win32/include/isc/ntpaths.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ntpaths.h,v 1.11 2001/08/06 05:34:25 mayer Exp $ */ +/* $Id: ntpaths.h,v 1.12 2001/08/09 02:55:41 mayer Exp $ */ /* * Windows-specific path definitions @@ -38,7 +38,6 @@ enum NtPaths { RNDC_CONF_PATH, NAMED_PID_PATH, LWRESD_PID_PATH, - NAMED_KEY_PATH, LOCAL_STATE_DIR, SYS_CONF_DIR, RNDC_KEY_PATH @@ -49,7 +48,6 @@ enum NtPaths { */ #define NAMED_CONFFILE isc_ntpaths_get(NAMED_CONF_PATH) #define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH) -#define RNDC_AUTOCONFFILE isc_ntpaths_get(NAMED_KEY_PATH) #define RNDC_KEYFILE isc_ntpaths_get(RNDC_KEY_PATH) /* diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c index 723c6f65b3..8f4130b92f 100644 --- a/lib/isc/win32/ntpaths.c +++ b/lib/isc/win32/ntpaths.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ntpaths.c,v 1.5 2001/08/06 05:34:23 mayer Exp $ */ +/* $Id: ntpaths.c,v 1.6 2001/08/09 02:55:39 mayer Exp $ */ /* * This module fetches the required path information that is specific @@ -41,7 +41,6 @@ static char lwresd_resolvconfFile[MAX_PATH]; static char rndc_confFile[MAX_PATH]; static char ns_defaultpidfile[MAX_PATH]; static char lwresd_defaultpidfile[MAX_PATH]; -static char named_key_file[MAX_PATH]; static char local_state_dir[MAX_PATH]; static char sys_conf_dir[MAX_PATH]; static char rndc_keyFile[MAX_PATH]; @@ -94,9 +93,6 @@ isc_ntpaths_init() { strcpy(lwresd_defaultpidfile, namedBase); strcat(lwresd_defaultpidfile, "\\etc\\lwresd.pid"); - strcpy(named_key_file, namedBase); - strcat(named_key_file, "\\etc\\named.key"); - strcpy(local_state_dir, namedBase); strcat(local_state_dir, "\\bin"); @@ -130,9 +126,6 @@ isc_ntpaths_get(int ind) { case LWRESD_PID_PATH: return (lwresd_defaultpidfile); break; - case NAMED_KEY_PATH: - return (named_key_file); - break; case LOCAL_STATE_DIR: return (local_state_dir); break;