[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  55c279f smbd: add missing newline to debug message in daemon_ready()
       via  dcb8bfe lib/util: s/daemon/name
      from  26b9155 selftest: use dbwrap_tdb_mutexes:* = yes for "plugin_s4_dc" and "member"

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


- Log -----------------------------------------------------------------
commit 55c279f0c4cc915d2cd7bb07ce0628fe42700890
Author: Michael Adam <obnox at samba.org>
Date:   Thu May 22 08:48:32 2014 +0200

    smbd: add missing newline to debug message in daemon_ready()
    
    Wrap overly long line while touching it anyways.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri May 23 04:03:43 CEST 2014 on sn-devel-104

commit dcb8bfea61d21d45df91060c11452e56c6ba8b13
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 12 14:36:57 2014 +0200

    lib/util: s/daemon/name
    
    daemon() is a public function...
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 lib/util/become_daemon.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/become_daemon.c b/lib/util/become_daemon.c
index 35c8b32..0671a1e 100644
--- a/lib/util/become_daemon.c
+++ b/lib/util/become_daemon.c
@@ -125,13 +125,14 @@ _PUBLIC_ void exit_daemon(const char *msg, int error)
 	exit(1);
 }
 
-_PUBLIC_ void daemon_ready(const char *daemon)
+_PUBLIC_ void daemon_ready(const char *name)
 {
-	if (daemon == NULL) {
-		daemon = "Samba";
+	if (name == NULL) {
+		name = "Samba";
 	}
 #ifdef HAVE_SYSTEMD
-	sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", daemon);
+	sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name);
 #endif
-	DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve connections", daemon));
+	DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve "
+		  "connections\n", name));
 }


-- 
Samba Shared Repository