svn commit: samba r1834 - branches/SAMBA_3_0/source/lib

[jerry at samba.org]

Author: jerry
Date: 2004-08-16 15:30:17 +0000 (Mon, 16 Aug 2004)
New Revision: 1834
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1834&nolog=1
Log:
prevent infinite recusion in reopen_logs() when expanding the smb.conf variable %I
Modified:
   branches/SAMBA_3_0/source/lib/debug.c

Changeset:
Modified: branches/SAMBA_3_0/source/lib/debug.c
===================================================================
--- branches/SAMBA_3_0/source/lib/debug.c	2004-08-16 15:25:57 UTC (rev 1833)
+++ branches/SAMBA_3_0/source/lib/debug.c	2004-08-16 15:30:17 UTC (rev 1834)
@@ -572,6 +572,7 @@
 	oldumask = umask( 022 );
   
 	pstrcpy(fname, debugf );
+	debugf[0] = '\0';
 
 	if (lp_loaded()) {
 		char *logfname;
@@ -726,7 +727,12 @@
 		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