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

Jeremy.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d938b94ee0e5ca8143e7199fb356addda42a9442..89143fa10933dc1e83ed021fde2caafae30d96d6 100644 (file)
--- 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 d75d635779d05b915db495e5d5dd54aa82435fe7..ecdd0e4f3839d1428d4cacbd010c86de61320b03 100644 (file)
--- 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"));