summaryrefslogtreecommitdiff
path: root/source3/smbd/process.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-09-04 21:59:38 +0000
committerJeremy Allison <jra@samba.org>2002-09-04 21:59:38 +0000
commitcbaa14857b6fd2704fa920c1fb15011e70b7df0f (patch)
tree56e1bb0a2ba03a2cf64f9f722469771ef743393e /source3/smbd/process.c
parenta1aafce4dc69b4bc4967ce9b70550ee3ecfab43b (diff)
downloadsamba-cbaa14857b6fd2704fa920c1fb15011e70b7df0f.tar.gz
samba-cbaa14857b6fd2704fa920c1fb15011e70b7df0f.tar.bz2
samba-cbaa14857b6fd2704fa920c1fb15011e70b7df0f.zip
Merge of (apparently working :-) new printing notify code.
Jeremy. (This used to be commit 8595c6ce4d74539089b600b3b0ff858a04b793ff)
Diffstat (limited to 'source3/smbd/process.c')
-rw-r--r--source3/smbd/process.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2c35eadb18..c796797fad 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1030,7 +1030,11 @@ static int setup_select_timeout(void)
select_timeout *= 1000;
t = change_notify_timeout();
- if (t != -1) select_timeout = MIN(select_timeout, t*1000);
+ if (t != -1)
+ select_timeout = MIN(select_timeout, t*1000);
+
+ if (print_notify_messages_pending())
+ select_timeout = MIN(select_timeout, 1000);
return select_timeout;
}
@@ -1190,6 +1194,10 @@ machine %s in domain %s.\n", global_myname, global_myworkgroup ));
force_check_log_size();
check_log_size();
+ /* Send any queued printer notify message to interested smbd's. */
+
+ print_notify_send_messages();
+
/*
* Modify the select timeout depending upon
* what we have remaining in our queues.