faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Open rtc log after dropping root privileges

Browse source
This commit is contained in:
Miroslav Lichvar 2009-11-30 16:46:08 +01:00
parent 1a8514a1a8
commit d1c7e1bb6c
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rtc_linux.c
View file

@ -629,16 +629,11 @@ RTC_Linux_Initialise(void)
direc = CNF_GetLogDir(); direc = CNF_GetLogDir();
if (!mkdir_and_parents(direc)) { if (!mkdir_and_parents(direc)) {
LOG(LOGS_ERR, LOGF_RtcLinux, "Could not create directory %s", direc); LOG(LOGS_ERR, LOGF_RtcLinux, "Could not create directory %s", direc);
logfile = NULL;
} else { } else {
logfilename = MallocArray(char, 2 + strlen(direc) + strlen(RTC_LOG)); logfilename = MallocArray(char, 2 + strlen(direc) + strlen(RTC_LOG));
strcpy(logfilename, direc); strcpy(logfilename, direc);
strcat(logfilename, "/"); strcat(logfilename, "/");
strcat(logfilename, RTC_LOG); strcat(logfilename, RTC_LOG);
logfile = fopen(logfilename, "a");
if (!logfile) {
LOG(LOGS_WARN, LOGF_RtcLinux, "Couldn't open logfile %s for update", logfilename);
}
} }
} }
@ -668,7 +663,7 @@ RTC_Linux_Finalise(void)
if (logfile) { if (logfile) {
fclose(logfile); fclose(logfile);
} }
Free(logfilename);
} }
/* ================================================== */ /* ================================================== */
@ -840,7 +835,17 @@ process_reading(time_t rtc_time, struct timeval *system_time)
} }
if (logfile) { if (logfilename) {
if (!logfile) {
logfile = fopen(logfilename, "a");
if (!logfile) {
LOG(LOGS_WARN, LOGF_RtcLinux, "Couldn't open logfile %s for update", logfilename);
Free(logfilename);
logfilename = NULL;
return;
}
}
rtc_fast = (double)(rtc_time - system_time->tv_sec) - 1.0e-6 * (double) system_time->tv_usec; rtc_fast = (double)(rtc_time - system_time->tv_sec) - 1.0e-6 * (double) system_time->tv_usec;
if (((logwrites++) % 32) == 0) { if (((logwrites++) % 32) == 0) {
@ -1177,12 +1182,9 @@ RTC_Linux_Trim(void)
void void
RTC_Linux_CycleLogFile(void) RTC_Linux_CycleLogFile(void)
{ {
if (logfile && logfilename) { if (logfile) {
fclose(logfile); fclose(logfile);
logfile = fopen(logfilename, "a"); logfile = NULL;
if (!logfile) {
LOG(LOGS_WARN, LOGF_RtcLinux, "Could not reopen logfile %s", logfilename);
}
logwrites = 0; logwrites = 0;
} }
} }