diff options
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/debug.c | 10 | ||||
| -rw-r--r-- | source3/lib/time.c | 18 |
2 files changed, 26 insertions, 2 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c index 9eb490c27e..6524d58ecb 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -346,8 +346,14 @@ BOOL reopen_logs( void ) oldumask = umask( 022 ); pstrcpy(fname, debugf ); - if (lp_loaded() && (*lp_logfile())) - pstrcpy(fname, lp_logfile()); + + if (lp_loaded()) { + char *logfname; + + logfname = lp_logfile(); + if (*logfname) + pstrcpy(fname, logfname); + } pstrcpy( debugf, fname ); if (append_log) diff --git a/source3/lib/time.c b/source3/lib/time.c index 59106386d4..cf088e8ee4 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -42,7 +42,19 @@ int extra_time_offset = 0; #define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN) #endif +/******************************************************************* + External access to time_t_min and time_t_max. +********************************************************************/ +time_t get_time_t_min(void) +{ + return TIME_T_MIN; +} + +time_t get_time_t_max(void) +{ + return TIME_T_MAX; +} /******************************************************************* a gettimeofday wrapper @@ -305,6 +317,12 @@ void unix_to_nt_time(NTTIME *nt, time_t t) nt->high = 0; return; } + if (t == TIME_T_MAX) + { + nt->low = 0xffffffff; + nt->high = 0x7fffffff; + return; + } if (t == -1) { nt->low = 0xffffffff; |