summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>2008-10-02 09:03:32 -0400
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>2008-10-02 09:03:32 -0400
commitf0c17496366547f14638763a6b8859c365f18792 (patch)
treedb97d0de247e3f1fef196aee693b5a53792b32ae /source3
parent3c9f3c32d1290b8e6c438a197602afe3e96ae828 (diff)
downloadsamba-f0c17496366547f14638763a6b8859c365f18792.tar.gz
samba-f0c17496366547f14638763a6b8859c365f18792.tar.bz2
samba-f0c17496366547f14638763a6b8859c365f18792.zip
Fix bug 5805: don't close stdout
- When calling setup_logging multiple times, the code was closing the debug file descriptor before opening or assigning the new one. We don't, however, want to close the debug file descriptor if it is stdout. Derrell
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/debug.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index d835ea7c17..d91b55dd23 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -578,7 +578,9 @@ void setup_logging(const char *pname, bool interactive)
stdout_logging = False;
if (dbf) {
x_fflush(dbf);
- (void) x_fclose(dbf);
+ if (dbf != x_stdout) {
+ (void) x_fclose(dbf);
+ }
}
dbf = NULL;