Merge from HEAD - baseless parinoia about never having a closed dbf (the debug

file pointer).

Andrew Bartlett
(This used to be commit c8a809a2a83974330bc1015d07d69f40a4a09610)

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 966a53fca34008cdb789477a2a9fc2dbb1f07271..2efdd3c2a3cdcc0f517caf2f2dcd3171e7070503 100644 (file)
--- 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