[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4781-g9f5c7f5

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  9f5c7f55abae9278d4e7ca2f359da1b52d0409a2 (commit)
      from  323533d798c00797c6c8a317ae72deb06ff7f7af (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 9f5c7f55abae9278d4e7ca2f359da1b52d0409a2
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 5 11:42:52 2009 -0800

    Attempt to fix crash seen with new CUPS async printcap loading code.
    Karolin please pull for 3.3.0.
    Jeremy.

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

Summary of changes:
 source/Makefile.in           |    2 +-
 source/printing/print_cups.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 5e1aed4..597e01f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -724,7 +724,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/source/printing/print_cups.c b/source/printing/print_cups.c
index 5fb1d37..9c555a6 100644
--- a/source/printing/print_cups.c
+++ b/source/printing/print_cups.c
@@ -425,6 +425,8 @@ static bool cups_pcap_load_async(int *pfd)
 	}
 
 	/* Child. */
+	close_all_print_db();
+
 	if (!reinit_after_fork(smbd_messaging_context(), true)) {
 		DEBUG(0,("cups_pcap_load_async: reinit_after_fork() failed\n"));
 		smb_panic("cups_pcap_load_async: reinit_after_fork() failed");


-- 
Samba Shared Repository