[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4208-g475c9a7

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  475c9a7ff5a96f7d1392610066fdd1ae28b7e039 (commit)
      from  21d8210724dea1ceb94081cfebef73639d6f3741 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 475c9a7ff5a96f7d1392610066fdd1ae28b7e039
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Thu Oct 2 10:40:08 2008 -0700

    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:
 source/lib/debug.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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