Added support for key for win32

diff --git a/bin/rndc/win32/confgen.dsp b/bin/rndc/win32/confgen.dsp
index 1baada1052011402a0017074de70a3d2aad37b93..f0050c37b919e9445a7450f18f53bbd9424b0d57 100644 (file)
--- a/bin/rndc/win32/confgen.dsp
+++ b/bin/rndc/win32/confgen.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/dns/sec/dst/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/dns/sec/dst/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/dns/sec/dst/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/dns/sec/dst/include" /I "../../../lib/isccc/include" /I "../../../lib/isccfg/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
 # SUBTRACT CPP /X /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -88,6 +88,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=.\os.c
+# End Source File
+# Begin Source File
+
 SOURCE="..\rndc-confgen.c"
 # End Source File
 # Begin Source File

diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 388474847652f00583961f4dd1619f372eac5e2a..8e0d13843ffdc2241ce17ec7d593b7e8beb1f925 100644 (file)
--- 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.10 2001/07/28 02:50:39 mayer Exp $ */
+/* $Id: ntpaths.h,v 1.11 2001/08/06 05:34:25 mayer Exp $ */
 
 /*
  * Windows-specific path definitions
@@ -40,7 +40,8 @@ enum NtPaths {
        LWRESD_PID_PATH,
        NAMED_KEY_PATH,
        LOCAL_STATE_DIR,
-       SYS_CONF_DIR
+       SYS_CONF_DIR,
+       RNDC_KEY_PATH
 };
 
 /*
@@ -49,6 +50,7 @@ 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)
 
 /*
  * Information about where the files are on disk

diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index 08bbe9425bcf080a66a494175b417fafb34defac..723c6f65b3616ad3a221498b473ed24a20d143f8 100644 (file)
--- 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.4 2001/07/27 05:17:39 mayer Exp $ */
+/* $Id: ntpaths.c,v 1.5 2001/08/06 05:34:23 mayer Exp $ */
 
 /*
  * This module fetches the required path information that is specific
@@ -44,6 +44,7 @@ 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];
 
 static DWORD baseLen = MAX_PATH;
 static BOOL Initialized = FALSE;
@@ -82,9 +83,11 @@ isc_ntpaths_init() {
        strcpy(lwresd_resolvconfFile, namedBase);
        strcat(lwresd_resolvconfFile, "\\Drivers\\etc\\resolv.conf");
 
+       strcpy(rndc_keyFile, namedBase);
+       strcat(rndc_keyFile, "\\etc\\rndc.key");
+
        strcpy(rndc_confFile, namedBase);
        strcat(rndc_confFile, "\\etc\\rndc.conf");
-
        strcpy(ns_defaultpidfile, namedBase);
        strcat(ns_defaultpidfile, "\\etc\\named.pid");
 
@@ -136,6 +139,9 @@ isc_ntpaths_get(int ind) {
        case SYS_CONF_DIR:
                return (sys_conf_dir);
                break;
+       case RNDC_KEY_PATH:
+               return (rndc_keyFile);
+               break;
        default:
                return (NULL);
        }

diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def
index 19dbe86f84b6dc0ee5600bd801c08a3ba979a551..1dd1b82e7acfcba4e25e7bde954fe74ee8f89580 100644 (file)
--- a/lib/isccfg/win32/libisccfg.def
+++ b/lib/isccfg/win32/libisccfg.def
@@ -34,6 +34,7 @@ cfg_obj_istype
 cfg_obj_destroy
 cfg_obj_log
 cfg_check_namedconf
+cfg_check_key
 cfg_log_init