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

[master] Server file names now logged after config parsing

Browse Source 
Merges in rt36671
This commit is contained in:
Thomas Markwalder
2014-09-08 07:45:42 -04:00
parent c7c11ea1fb
commit 3956569b0d
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RELNOTES
View File

@@ -54,6 +54,10 @@ by Eric Young (eay@cryptsoft.com).
Changes since 4.3.1
- Log statements depicting what files will be used by the server now occur
after the configuration file has been processed.
[ISC-Bugs #36671]
- Addressed Coverity issues reported as of 07-31-2014:
[ISC-Bugs #36712] Corrects Coverity reported "high" impact issues
[ISC-Bugs #36933] Corrects Coverity reported "medium" impact issues

31
server/dhcpd.c
View File

@@ -400,11 +400,7 @@ main(int argc, char **argv) {
log_info (copyright);
log_info (arr);
log_info (url);
log_info ("Config file: %s", path_dhcpd_conf);
log_info ("Database file: %s", path_dhcpd_db);
log_info ("PID file: %s", path_dhcpd_pid);
} else {
quiet = 0;
log_perror = 0;
}
@@ -616,7 +612,7 @@ main(int argc, char **argv) {
log_fatal ("Configuration file errors encountered -- exiting");
postconf_initialization (quiet);
#if defined (PARANOIA) && !defined (EARLY_CHROOT)
if (set_chroot) setup_chroot (set_chroot);
#endif /* PARANOIA && !EARLY_CHROOT */
@@ -1018,6 +1014,12 @@ void postconf_initialization (int quiet)
}
#endif
if (!quiet) {
log_info ("Config file: %s", path_dhcpd_conf);
log_info ("Database file: %s", path_dhcpd_db);
log_info ("PID file: %s", path_dhcpd_pid);
}
oc = lookup_option(&server_universe, options, SV_LOG_FACILITY);
if (oc) {
if (evaluate_option_cache(&db, NULL, NULL, NULL, options, NULL,
@@ -1027,17 +1029,14 @@ void postconf_initialization (int quiet)
openlog("dhcpd", DHCP_LOG_OPTIONS, db.data[0]);
/* Log the startup banner into the new
log file. */
if (!quiet) {
/* Don't log to stderr twice. */
tmp = log_perror;
log_perror = 0;
log_info("%s %s",
message, PACKAGE_VERSION);
log_info(copyright);
log_info(arr);
log_info(url);
log_perror = tmp;
}
/* Don't log to stderr twice. */
tmp = log_perror;
log_perror = 0;
log_info("%s %s", message, PACKAGE_VERSION);
log_info(copyright);
log_info(arr);
log_info(url);
log_perror = tmp;
} else
log_fatal("invalid log facility");
data_string_forget(&db, MDL);