From: Karolin Seeger <kseeger@samba.org>
Date: Sat, 15 Jan 2011 18:19:43 +0000 (+0100)
Subject: Revert "s3-printing: update parent smbd pcap cache"
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=b6268f507fa3276c2ef22c58bad400a3fed48cd9;p=samba.git

Revert "s3-printing: update parent smbd pcap cache"

This reverts commit 5a2b2d4aeb6fe4af13aa0c92d22ba5bc9b7f7e13.
---

diff --git a/source3/include/local.h b/source3/include/local.h
index d65cc001a91..a88b17be137 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -148,7 +148,6 @@
 #define LPQ_LOCK_TIMEOUT (5)
 #define NMBD_INTERFACES_RELOAD (120)
 #define NMBD_UNEXPECTED_TIMEOUT (15)
-#define SMBD_HOUSEKEEPING_INTERVAL SMBD_SELECT_TIMEOUT
 
 /* the following are in milliseconds */
 #define LOCK_RETRY_TIMEOUT (100)
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index cbcbfadf3ce..f7b0f4cfcef 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2079,7 +2079,7 @@ void check_reload(time_t t)
 			|| (t-last_printer_reload_time  < 0) ) 
 		{
 			DEBUG( 3,( "Printcap cache time expired.\n"));
-			pcap_cache_reload(&reload_printers);
+			reload_printers();
 			last_printer_reload_time = t;
 		}
 	}
@@ -2365,7 +2365,7 @@ void smbd_process(void)
 	}
 
 	if (!(event_add_idle(smbd_event_context(), NULL,
-			     timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
+			     timeval_set(SMBD_SELECT_TIMEOUT, 0),
 			     "housekeeping", housekeeping_fn, NULL))) {
 		DEBUG(0, ("Could not add housekeeping event\n"));
 		exit(1);
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ae806abaccf..0c591357548 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -541,14 +541,6 @@ static bool smbd_open_one_socket(struct smbd_parent_context *parent,
 	return true;
 }
 
-static bool parent_housekeeping_fn(const struct timeval *now, void *private_data)
-{
-	DEBUG(5, ("houskeeping\n"));
-	/* check if we need to reload services */
-	check_reload(time(NULL));
-	return true;
-}
-
 /****************************************************************************
  Open the socket communication.
 ****************************************************************************/
@@ -676,14 +668,6 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
 	claim_connection(NULL,"",
 			 FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_DBWRAP);
 
-	if (!(event_add_idle(smbd_event_context(), NULL,
-			     timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
-			     "parent_housekeeping", parent_housekeeping_fn,
-			     parent))) {
-		DEBUG(0, ("Could not add housekeeping event\n"));
-		exit(1);
-	}
-
         /* Listen to messages */
 
 	messaging_register(smbd_messaging_context(), NULL,