mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
I've added a test for lp_loaded() so that timestamps *will* be output
before the config file has been loaded. Otherwise the default is no
timestamp.
Chris -)-----
(This used to be commit fd7eaed59e
)
This commit is contained in:
parent
ab1bfe5b0d
commit
6a9170b1ae
@ -476,10 +476,15 @@ BOOL dbghdr( int level, char *file, char *func, int line )
|
||||
if( stdout_logging )
|
||||
return( True );
|
||||
|
||||
/* Print it all out at once. */
|
||||
if(lp_timestamp_logs())
|
||||
Debug1( "[%s, %d] %s%s%s(%d)\n",
|
||||
timestring(), level, file, (*file)?":":"", func, line );
|
||||
/* Print the header if timestamps are turned on. If parameters are
|
||||
* not yet loaded, then default to timestamps on.
|
||||
*/
|
||||
if( lp_timestamp_logs() || !(lp_loaded()) )
|
||||
{
|
||||
/* Print it all out at once to prevent split syslog output. */
|
||||
Debug1( "[%s, %d] %s:%s(%d)\n", timestring(), level, file, func, line );
|
||||
}
|
||||
|
||||
return( True );
|
||||
} /* dbghdr */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user