summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/debug.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 6469a3ca6c..c20229fcde 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -427,11 +427,13 @@ static void bufr_print( void )
static void format_debug_text( char *msg )
{
int i;
+ BOOL timestamp = (!stdout_logging && (lp_timestamp_logs() ||
+ !(lp_loaded())));
for( i = 0; msg[i]; i++ )
{
/* Indent two spaces at each new line. */
- if( 0 == format_pos )
+ if(timestamp && 0 == format_pos)
{
format_bufr[0] = format_bufr[1] = ' ';
format_pos = 2;