[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  f767059 s3:winbindd fix a compiler warning
       via  9f589ea s3:printing only do printing_subsystem_update when printing is enabled
      from  5f97363 s4:dns_server - introduce the wildcard binding feature

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


- Log -----------------------------------------------------------------
commit f767059911460c0944d5e9289148a0776aeb97e5
Author: Christian Ambach <ambi at samba.org>
Date:   Sat Sep 22 20:44:41 2012 -0700

    s3:winbindd fix a compiler warning
    
    about type potentially being used uninitialized
    
    Autobuild-User(master): Christian Ambach <ambi at samba.org>
    Autobuild-Date(master): Mon Sep 24 03:49:53 CEST 2012 on sn-devel-104

commit 9f589ea4066099ed50e7f2323f572b3a8c98c60e
Author: Christian Ambach <ambi at samba.org>
Date:   Sun Sep 23 08:39:49 2012 +0200

    s3:printing only do printing_subsystem_update when printing is enabled
    
    no point in calling this if printing was disabled and no spoolss service was started
    this hurts CTDB clusters as the smbds on the cluster nodes will fight for the single record in the TDB
    
    This fixes Bug 9197 - Disabling printing still makes smbd create and access printer_list.tdb

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

Summary of changes:
 source3/smbd/server.c                    |    5 ++++-
 source3/winbindd/winbindd_sids_to_xids.c |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d53b19a..15762d8 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1529,7 +1529,10 @@ extern void build_options(bool screen);
 
 	/* do a printer update now that all messaging has been set up,
 	 * before we allow clients to start connecting */
-	printing_subsystem_update(ev_ctx, msg_ctx, false);
+	if (!lp__disable_spoolss() &&
+	    (rpc_spoolss_daemon() != RPC_DAEMON_DISABLED)) {
+		printing_subsystem_update(ev_ctx, msg_ctx, false);
+	}
 
 	TALLOC_FREE(frame);
 	/* make sure we always have a valid stackframe */
diff --git a/source3/winbindd/winbindd_sids_to_xids.c b/source3/winbindd/winbindd_sids_to_xids.c
index ad02189..f500f24 100644
--- a/source3/winbindd/winbindd_sids_to_xids.c
+++ b/source3/winbindd/winbindd_sids_to_xids.c
@@ -239,7 +239,7 @@ NTSTATUS winbindd_sids_to_xids_recv(struct tevent_req *req,
 	num_non_cached = 0;
 
 	for (i=0; i<state->num_sids; i++) {
-		char type;
+		char type = '\0';
 		uint32_t unix_id = UINT32_MAX;
 		bool found = true;
 


-- 
Samba Shared Repository