[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  547f682 s3-smbd: Align debug level for the same information.
       via  c7c9694 s3-nmbd: Align debug level for the same information.
      from  6cdde27 ctdb:daemon avoid goto ctdb_remove_orphaned_ifaces()

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


- Log -----------------------------------------------------------------
commit 547f682c153cec96fd0eafa9c76407ed45b39901
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 26 16:20:01 2014 +0100

    s3-smbd: Align debug level for the same information.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10388
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Apr  1 23:16:19 CEST 2014 on sn-devel-104

commit c7c969439d7c0b3ed6bd1999c7ff0db7686a2b84
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 26 16:18:55 2014 +0100

    s3-nmbd: Align debug level for the same information.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10388
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 source3/nmbd/nmbd.c   |    4 ++--
 source3/smbd/server.c |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 050afb3..80c2329 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -947,12 +947,12 @@ static bool open_sockets(bool isdaemon, int port)
 	set_samba_nb_type();
 
 	if (!is_daemon && !is_a_socket(0)) {
-		DEBUG(0,("standard input is not a socket, assuming -D option\n"));
+		DEBUG(3, ("standard input is not a socket, assuming -D option\n"));
 		is_daemon = True;
 	}
 
 	if (is_daemon && !opt_interactive) {
-		DEBUG( 2, ( "Becoming a daemon.\n" ) );
+		DEBUG(3, ("Becoming a daemon.\n"));
 		become_daemon(Fork, no_process_group, log_stdout);
 	}
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 9d6a250..29e688d 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1307,8 +1307,10 @@ extern void build_options(bool screen);
 #endif
 
 	if (!is_daemon && !is_a_socket(0)) {
-		if (!interactive)
-			DEBUG(0,("standard input is not a socket, assuming -D option\n"));
+		if (!interactive) {
+			DEBUG(3, ("Standard input is not a socket, "
+				  "assuming -D option\n"));
+		}
 
 		/*
 		 * Setting is_daemon here prevents us from eventually calling
@@ -1319,7 +1321,7 @@ extern void build_options(bool screen);
 	}
 
 	if (is_daemon && !interactive) {
-		DEBUG( 3, ( "Becoming a daemon.\n" ) );
+		DEBUG(3, ("Becoming a daemon.\n"));
 		become_daemon(Fork, no_process_group, log_stdout);
 	}
 


-- 
Samba Shared Repository