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

[Derrell Lipman]

The branch, v3-2-test has been updated
       via  7142872d2c6e0be42307671afa31016f6940007d (commit)
      from  d596f78517f33f5a4c4849be3162d4f3031f045f (commit)

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


- Log -----------------------------------------------------------------
commit 7142872d2c6e0be42307671afa31016f6940007d
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Thu Oct 2 09:17:49 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:
 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