From: Gerald Carter <jerry@samba.org>
Date: Mon, 16 Aug 2004 15:30:17 +0000 (+0000)
Subject: r1834: prevent infinite recusion in reopen_logs() when expanding the smb.conf variable %I
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5918
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08037bd4427a99150c1cc65770681ec3f92f4ad5;p=thirdparty%2Fsamba.git

r1834: prevent infinite recusion in reopen_logs() when expanding the smb.conf variable %I
---

diff --git a/source/lib/debug.c b/source/lib/debug.c
index e5e203e076a..01aedb47740 100644
--- a/source/lib/debug.c
+++ b/source/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