upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 21:12:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

initalize a named_g_defaultbindkeys variable

Browse source
This commit is contained in:
Evan Hunt 2019-02-05 14:13:04 -08:00 committed by Mark Andrews
parent 755efa9b18
commit 2f13524164
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/named/include/named/globals.h
View file

@ -90,7 +90,8 @@ EXTERN cfg_obj_t * named_g_config INIT(NULL);
EXTERN const cfg_obj_t * named_g_defaults INIT(NULL);
EXTERN const char * named_g_conffile INIT(NAMED_SYSCONFDIR
"/named.conf");
EXTERN cfg_obj_t * named_g_bindkeys INIT(NULL);
EXTERN cfg_obj_t * named_g_defaultbindkeys INIT(NAMED_SYSCONFDIR
"/bind.keys");
EXTERN const char * named_g_keyfile INIT(NAMED_SYSCONFDIR
"/rndc.key");

3
bin/named/server.c
View file

@ -9714,7 +9714,8 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) {
CHECKFATAL(server->statsfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS,
"isc_mem_strdup");
server->bindkeysfile = isc_mem_strdup(server->mctx, "bind.keys");
server->bindkeysfile = isc_mem_strdup(server->mctx,
named_g_defaultbindkeys);
CHECKFATAL(server->bindkeysfile == NULL ? ISC_R_NOMEMORY :
ISC_R_SUCCESS,
"isc_mem_strdup");

1
bin/named/win32/os.c
View file

@ -59,6 +59,7 @@ named_paths_init(void) {
named_g_defaultlockfile = isc_ntpaths_get(NAMED_LOCK_PATH);
named_g_keyfile = isc_ntpaths_get(RNDC_KEY_PATH);
named_g_defaultsessionkeyfile = isc_ntpaths_get(SESSION_KEY_PATH);
named_g_defaultbindkeys = isc_ntpaths_get(BIND_KEYS_PATH);
named_g_defaultdnstap = NULL;
Initialized = TRUE;

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

@ -33,7 +33,8 @@ enum NtPaths {
LOCAL_STATE_DIR,
SYS_CONF_DIR,
RNDC_KEY_PATH,
SESSION_KEY_PATH
SESSION_KEY_PATH,
BIND_KEYS_PATH
};
/*

7
lib/isc/win32/ntpaths.c
View file

@ -39,6 +39,7 @@ static char sys_conf_dir[MAX_PATH];
static char rndc_keyFile[MAX_PATH];
static char session_keyFile[MAX_PATH];
static char resolv_confFile[MAX_PATH];
static char bind_keysFile[MAX_PATH];
static DWORD baseLen = MAX_PATH;
static BOOL Initialized = FALSE;
@ -98,6 +99,9 @@ isc_ntpaths_init(void) {
strlcat(resolv_confFile, "\\etc\\resolv.conf",
sizeof(resolv_confFile));
strlcpy(bind_keysFile, namedBase, sizeof(bind_keysFile));
strlcat(bind_keysFile, "\\etc\\bind.keys", sizeof(bind_keysFile));
Initialized = TRUE;
}
@ -134,6 +138,9 @@ isc_ntpaths_get(int ind) {
case SESSION_KEY_PATH:
return (session_keyFile);
break;
case BIND_KEYS_PATH:
return (bind_keysFile);
break;
default:
return (NULL);
}