mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Added support for key for win32

Browse Source
This commit is contained in:
Danny Mayer
2001-08-06 05:34:26 +00:00
parent 3571e1bda4
commit 66352c0a05
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/rndc/win32/confgen.dsp
View File

@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 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 # SUBTRACT CPP /X /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD 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" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE=.\os.c
# End Source File
# Begin Source File
SOURCE="..\rndc-confgen.c" SOURCE="..\rndc-confgen.c"
# End Source File # End Source File
# Begin Source File # Begin Source File

6
lib/isc/win32/include/isc/ntpaths.h
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 * Windows-specific path definitions
@@ -40,7 +40,8 @@ enum NtPaths {
LWRESD_PID_PATH, LWRESD_PID_PATH,
NAMED_KEY_PATH, NAMED_KEY_PATH,
LOCAL_STATE_DIR, 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 NAMED_CONFFILE isc_ntpaths_get(NAMED_CONF_PATH)
#define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH) #define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH)
#define RNDC_AUTOCONFFILE isc_ntpaths_get(NAMED_KEY_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 * Information about where the files are on disk

10
lib/isc/win32/ntpaths.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 * 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 named_key_file[MAX_PATH];
static char local_state_dir[MAX_PATH]; static char local_state_dir[MAX_PATH];
static char sys_conf_dir[MAX_PATH]; static char sys_conf_dir[MAX_PATH];
static char rndc_keyFile[MAX_PATH];
static DWORD baseLen = MAX_PATH; static DWORD baseLen = MAX_PATH;
static BOOL Initialized = FALSE; static BOOL Initialized = FALSE;
@@ -82,9 +83,11 @@ isc_ntpaths_init() {
strcpy(lwresd_resolvconfFile, namedBase); strcpy(lwresd_resolvconfFile, namedBase);
strcat(lwresd_resolvconfFile, "\\Drivers\\etc\\resolv.conf"); strcat(lwresd_resolvconfFile, "\\Drivers\\etc\\resolv.conf");
strcpy(rndc_keyFile, namedBase);
strcat(rndc_keyFile, "\\etc\\rndc.key");
strcpy(rndc_confFile, namedBase); strcpy(rndc_confFile, namedBase);
strcat(rndc_confFile, "\\etc\\rndc.conf"); strcat(rndc_confFile, "\\etc\\rndc.conf");
strcpy(ns_defaultpidfile, namedBase); strcpy(ns_defaultpidfile, namedBase);
strcat(ns_defaultpidfile, "\\etc\\named.pid"); strcat(ns_defaultpidfile, "\\etc\\named.pid");
@@ -136,6 +139,9 @@ isc_ntpaths_get(int ind) {
case SYS_CONF_DIR: case SYS_CONF_DIR:
return (sys_conf_dir); return (sys_conf_dir);
break; break;
case RNDC_KEY_PATH:
return (rndc_keyFile);
break;
default: default:
return (NULL); return (NULL);
} }

1
lib/isccfg/win32/libisccfg.def
View File

@@ -34,6 +34,7 @@ cfg_obj_istype
cfg_obj_destroy cfg_obj_destroy
cfg_obj_log cfg_obj_log
cfg_check_namedconf cfg_check_namedconf
cfg_check_key
cfg_log_init cfg_log_init