diff options
| author | Karolin Seeger <kseeger@samba.org> | 2011-01-15 19:06:42 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-01-15 19:06:42 +0100 |
| commit | ad450870eacb114b3f15941a4478ba25701e035a (patch) | |
| tree | 820b544d254ea3a696debccc9a61433f99bda80e | |
| parent | 36ea03bbe28122ce03de4969e254dd276cfe5a79 (diff) | |
| download | samba-ad450870eacb114b3f15941a4478ba25701e035a.tar.gz | |
Revert "s3-printing: update parent smbd pcap cache"
This reverts commit 2c2ce9caead5a13edb582313b7d36c7eb12a09fb.
| -rw-r--r-- | source3/include/local.h | 1 | ||||
| -rw-r--r-- | source3/smbd/process.c | 4 | ||||
| -rw-r--r-- | source3/smbd/server.c | 16 |
3 files changed, 2 insertions, 19 deletions
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 4b2e6eb79c2..2abea8f4bcc 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1854,7 +1854,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; } } @@ -2123,7 +2123,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 d393f26d51c..2c5ce400854 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -498,14 +498,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. ****************************************************************************/ @@ -633,14 +625,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, |