[SCM] Samba Shared Repository - branch master updated - 1f8b6238dd161d29ee92902ea006158e180fa87b

[Jeremy Allison]

The branch, master has been updated
       via  1f8b6238dd161d29ee92902ea006158e180fa87b (commit)
       via  65fb7f123baf060cae058670a7ecedc6d14e0fd9 (commit)
      from  991b294c411dd846b07952a1f714c0728d87fa98 (commit)

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


- Log -----------------------------------------------------------------
commit 1f8b6238dd161d29ee92902ea006158e180fa87b
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 5 13:47:34 2009 -0800

    Attempt to fix crash seen with new CUPS async printcap loading code.
    Jeremy.

commit 65fb7f123baf060cae058670a7ecedc6d14e0fd9
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 5 13:47:07 2009 -0800

    Fix call to ndr_size_dom_sid, missing parameter.
    Jeremy.

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

Summary of changes:
 source3/Makefile.in           |    2 +-
 source3/printing/print_cups.c |    3 +++
 source3/smbd/nttrans.c        |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d938b94..89143fa 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -744,7 +744,7 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
            web/swat.o web/neg_lang.o
 
-SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
+SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
 	   $(LOCKING_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(KRBCLIENT_OBJ) \
 	   $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
 	   $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index d75d635..ecdd0e4 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -425,6 +425,9 @@ static bool cups_pcap_load_async(int *pfd)
 	}
 
 	/* Child. */
+
+	close_all_print_db();
+
 	if (!reinit_after_fork(smbd_messaging_context(),
 			       smbd_event_context(), true)) {
 		DEBUG(0,("cups_pcap_load_async: reinit_after_fork() failed\n"));
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 3f33237..db92e28 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2182,7 +2182,7 @@ static void call_nt_transact_get_user_quota(connection_struct *conn,
 				tmp_list=tmp_list->next,entry+=entry_len,qt_len+=entry_len) {
 
 				sid_len = ndr_size_dom_sid(
-					&tmp_list->quotas->sid, 0);
+					&tmp_list->quotas->sid, NULL, 0);
 				entry_len = 40 + sid_len;
 
 				/* nextoffset entry 4 bytes */


-- 
Samba Shared Repository