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

Karolin please pull for 3.3.0.
Jeremy.

diff --git a/source/Makefile.in b/source/Makefile.in
index 5e1aed46f6a4f8f1675868731f0aad8fe7f78a69..597e01f2338c9d17d53f8cc895b04a62eda08d09 100644 (file)
--- 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 5fb1d379a6322563759a33f79f263924ffe5ba95..9c555a6785736eef985188d94c9d70bf7528f7f9 100644 (file)
--- 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");