summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-01-05 13:47:34 -0800
committerJeremy Allison <jra@samba.org>2009-01-05 13:47:34 -0800
commit1f8b6238dd161d29ee92902ea006158e180fa87b (patch)
tree8829f27d4ef05c245d360aa01c892a2d73793a3b
parent65fb7f123baf060cae058670a7ecedc6d14e0fd9 (diff)
downloadsamba-1f8b6238dd161d29ee92902ea006158e180fa87b.tar.gz
samba-1f8b6238dd161d29ee92902ea006158e180fa87b.tar.bz2
samba-1f8b6238dd161d29ee92902ea006158e180fa87b.zip
Attempt to fix crash seen with new CUPS async printcap loading code.
Jeremy.
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/printing/print_cups.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d938b94ee0..89143fa109 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 d75d635779..ecdd0e4f38 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"));