Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
e7e013ab
Commit
e7e013ab
authored
Nov 05, 2019
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Have 'named -V' report geoip-directory
(cherry picked from commit
2eaa75c3
)
parent
ca036f34
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
1 deletion
+21
-1
bin/named/main.c
bin/named/main.c
+21
-1
No files found.
bin/named/main.c
View file @
e7e013ab
...
...
@@ -66,6 +66,7 @@
#include <ns/interfacemgr.h>
#include <named/builtin.h>
#include <named/config.h>
#include <named/control.h>
#include <named/fuzz.h>
#include <named/globals.h>
/* Explicit, though named/log.h includes it. */
...
...
@@ -448,6 +449,12 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) {
static
void
printversion
(
bool
verbose
)
{
char
rndcconf
[
PATH_MAX
],
*
dot
=
NULL
;
#if defined(HAVE_GEOIP2)
isc_mem_t
*
mctx
=
NULL
;
cfg_parser_t
*
parser
=
NULL
;
cfg_obj_t
*
config
=
NULL
;
const
cfg_obj_t
*
defaults
=
NULL
,
*
obj
=
NULL
;
#endif
printf
(
"%s %s%s%s <id:%s>
\n
"
,
named_g_product
,
named_g_version
,
...
...
@@ -534,7 +541,20 @@ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
printf
(
" nsupdate session key: %s
\n
"
,
named_g_defaultsessionkeyfile
);
printf
(
" named PID file: %s
\n
"
,
named_g_defaultpidfile
);
printf
(
" named lock file: %s
\n
"
,
named_g_defaultlockfile
);
#if defined(HAVE_GEOIP2)
#define RTC(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS)
isc_mem_create
(
&
mctx
);
RTC
(
cfg_parser_create
(
mctx
,
named_g_lctx
,
&
parser
));
RTC
(
named_config_parsedefaults
(
parser
,
&
config
));
RTC
(
cfg_map_get
(
config
,
"options"
,
&
defaults
));
RTC
(
cfg_map_get
(
defaults
,
"geoip-directory"
,
&
obj
));
if
(
cfg_obj_isstring
(
obj
))
{
printf
(
" geoip-directory: %s
\n
"
,
cfg_obj_asstring
(
obj
));
}
cfg_obj_destroy
(
parser
,
&
config
);
cfg_parser_destroy
(
&
parser
);
isc_mem_detach
(
&
mctx
);
#endif
/* HAVE_GEOIP2 */
}
static
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment