[SCM] Samba Shared Repository - branch master updated - f0c17496366547f14638763a6b8859c365f18792

[Derrell Lipman]

The branch, master has been updated
       via  f0c17496366547f14638763a6b8859c365f18792 (commit)
      from  3c9f3c32d1290b8e6c438a197602afe3e96ae828 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f0c17496366547f14638763a6b8859c365f18792
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Thu Oct 2 09:03:32 2008 -0400

    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

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/debug.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index d835ea7..d91b55d 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;


-- 
Samba Shared Repository