diff options
| author | Gerald Carter <jerry@samba.org> | 2004-08-16 21:07:01 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-08-16 21:07:01 +0000 |
| commit | 06c47874b300f61f721d05769959b3d34ff11d12 (patch) | |
| tree | 8c9d800e26c730119d004f335451c1c43169ddd9 /source/lib | |
| parent | 3563bd6e6496dcd10477e44294d8b783988d325b (diff) | |
| download | samba-06c47874b300f61f721d05769959b3d34ff11d12.tar.gz samba-06c47874b300f61f721d05769959b3d34ff11d12.tar.xz samba-06c47874b300f61f721d05769959b3d34ff11d12.zip | |
r1839: pulling a few more changes from 3.0
Diffstat (limited to 'source/lib')
| -rw-r--r-- | source/lib/debug.c | 8 |
1 files changed, 7 insertions, 1 deletions
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 |