summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-04 08:49:20 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-04 08:49:20 +0000
commit2a9c68cdc8fe528803ef1bd48fa467082ebc235f (patch)
tree6cea7c278d4ea857c02b519d7f2a04863042d661 /source3
parent863e9ca2c640ce7a94acf81cff7408edc6f64e01 (diff)
downloadsamba-2a9c68cdc8fe528803ef1bd48fa467082ebc235f.tar.gz
samba-2a9c68cdc8fe528803ef1bd48fa467082ebc235f.tar.bz2
samba-2a9c68cdc8fe528803ef1bd48fa467082ebc235f.zip
Merge from HEAD - baseless parinoia about never having a closed dbf (the debug
file pointer). Andrew Bartlett (This used to be commit c8a809a2a83974330bc1015d07d69f40a4a09610)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/debug.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 966a53fca3..2efdd3c2a3 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -556,6 +556,7 @@ BOOL reopen_logs( void )
pstring fname;
mode_t oldumask;
XFILE *new_dbf = NULL;
+ XFILE *old_dbf = NULL;
BOOL ret = True;
if (stdout_logging)
@@ -585,9 +586,10 @@ BOOL reopen_logs( void )
ret = False;
} else {
x_setbuf(new_dbf, NULL);
- if (dbf)
- (void) x_fclose(dbf);
+ old_dbf = dbf;
dbf = new_dbf;
+ if (old_dbf)
+ (void) x_fclose(old_dbf);
}
/* Fix from klausr@ITAP.Physik.Uni-Stuttgart.De