[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  9635621 s3: Remove a call to procid_self()
       via  d2069eb s3: Add "msg_ctx" param to winbindd_register_handlers()
       via  cf1d69a s3: Make winbindd_register_handlers static
       via  422ff25 s3: Fix a typo
      from  9a2db48 s3: Remove some calls to procid_self

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


- Log -----------------------------------------------------------------
commit 96356219d662614cbc926d6c2dc4345f0ac432ce
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Oct 19 18:10:22 2012 +0200

    s3: Remove a call to procid_self()
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Oct 19 23:15:04 CEST 2012 on sn-devel-104

commit d2069eb677e7def93cf228cc7719da02c33ba57d
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Oct 19 18:09:21 2012 +0200

    s3: Add "msg_ctx" param to winbindd_register_handlers()

commit cf1d69ae0bb4ca6182cfa838fafe429f127e1980
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Oct 19 18:06:46 2012 +0200

    s3: Make winbindd_register_handlers static

commit 422ff2523d56982480877d51dec4bbd1327b7241
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Oct 19 17:46:14 2012 +0200

    s3: Fix a typo

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

Summary of changes:
 source3/auth/auth_samba4.c        |    2 +-
 source3/winbindd/winbindd.c       |   27 ++++++++++++++-------------
 source3/winbindd/winbindd_proto.h |    1 -
 3 files changed, 15 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 6093de4..f91c1bb 100644
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -106,7 +106,7 @@ static NTSTATUS check_samba4_security(const struct auth_context *auth_context,
 }
 
 /* Hook to allow GENSEC to handle blob-based authentication
- * mechanisms, without directly linking the mechansim code */
+ * mechanisms, without directly linking the mechanism code */
 static NTSTATUS prepare_gensec(TALLOC_CTX *mem_ctx,
 			       struct gensec_security **gensec_context)
 {
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index eba5b09..654c14c 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1074,7 +1074,8 @@ bool winbindd_use_cache(void)
 	return !opt_nocache;
 }
 
-void winbindd_register_handlers(bool foreground)
+static void winbindd_register_handlers(struct messaging_context *msg_ctx,
+				       bool foreground)
 {
 	/* Setup signal handlers */
 
@@ -1101,7 +1102,7 @@ void winbindd_register_handlers(bool foreground)
 
 	/* get broadcast messages */
 
-	if (!serverid_register(procid_self(),
+	if (!serverid_register(messaging_server_id(msg_ctx),
 			       FLAG_MSG_GENERAL |
 			       FLAG_MSG_WINBIND |
 			       FLAG_MSG_DBWRAP)) {
@@ -1111,36 +1112,36 @@ void winbindd_register_handlers(bool foreground)
 
 	/* React on 'smbcontrol winbindd reload-config' in the same way
 	   as to SIGHUP signal */
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_SMB_CONF_UPDATED, msg_reload_services);
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_SHUTDOWN, msg_shutdown);
 
 	/* Handle online/offline messages. */
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_OFFLINE, winbind_msg_offline);
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_ONLINE, winbind_msg_online);
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_ONLINESTATUS, winbind_msg_onlinestatus);
 
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
 
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_VALIDATE_CACHE,
 			   winbind_msg_validate_cache);
 
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_DUMP_DOMAIN_LIST,
 			   winbind_msg_dump_domain_list);
 
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_IP_DROPPED,
 			   winbind_msg_ip_dropped_parent);
 
 	/* Register handler for MSG_DEBUG. */
-	messaging_register(winbind_messaging_context(), NULL,
+	messaging_register(msg_ctx, NULL,
 			   MSG_DEBUG,
 			   winbind_msg_debug);
 
@@ -1495,7 +1496,7 @@ int main(int argc, char **argv, char **envp)
 		exit(1);
 	}
 
-	winbindd_register_handlers(!Fork);
+	winbindd_register_handlers(winbind_messaging_context(), !Fork);
 
 	status = init_system_session_info();
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 5cc90f2..bf8dbf7 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -32,7 +32,6 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground);
 bool winbindd_setup_sig_hup_handler(const char *lfile);
 bool winbindd_use_idmap_cache(void);
 bool winbindd_use_cache(void);
-void winbindd_register_handlers(bool foreground);
 const char *get_winbind_pipe_dir(void);
 char *get_winbind_priv_pipe_dir(void);
 int main(int argc, char **argv, char **envp);


-- 
Samba Shared Repository