From cc72b666ed93556a2413055f161e67437024a320 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 16 Aug 2004 15:30:17 +0000
Subject: r1834: prevent infinite recusion in reopen_logs() when expanding the
 smb.conf variable %I (This used to be commit
 08037bd4427a99150c1cc65770681ec3f92f4ad5)

---
 source3/lib/debug.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source3/lib/debug.c')

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index e5e203e076..01aedb4774 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -572,6 +572,7 @@ BOOL reopen_logs( void )
 	oldumask = umask( 022 );
   
 	pstrcpy(fname, debugf );
+	debugf[0] = '\0';
 
 	if (lp_loaded()) {
 		char *logfname;
@@ -726,7 +727,12 @@ void check_log_size( void )
 		errno = old_errno;
 		return( 0 );
 	}
-  
+
+	/* prevent recursion by checking if reopen_logs() has temporaily
+	   set the debugf string to "" */
+	if( debugf[0] == '\0')
+		return( 0 );
+
 #ifdef WITH_SYSLOG
 	if( !lp_syslog_only() )
 #endif
-- 
cgit