[SCM] Samba Shared Repository - branch master updated - b3abd484dbd7673120f7a7a9613789dc7aeb9341

[Volker Lendecke]

The branch, master has been updated
       via  b3abd484dbd7673120f7a7a9613789dc7aeb9341 (commit)
      from  ff50a88331e95bcb03e7d60a2e1eaded516f309f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b3abd484dbd7673120f7a7a9613789dc7aeb9341
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 30 14:05:26 2008 +0100

    Fix a spinning smbd when printing
    
    Without this, we end up adding more than one timed event. In the event handler
    print_notify_event_send_messages() only one event will be deleted, all others
    will fire indefinitely.

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/notify.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index f6599c4..b24a8a5 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -322,7 +322,7 @@ to notify_queue_head\n", msg->type, msg->field, msg->printer));
 	DLIST_ADD_END(notify_queue_head, pnqueue, struct notify_queue *);
 	num_messages++;
 
-	if (smbd_event_context()) {
+	if ((notify_event == NULL) && (smbd_event_context() != NULL)) {
 		/* Add an event for 1 second's time to send this queue. */
 		notify_event = event_add_timed(smbd_event_context(), NULL,
 					timeval_current_ofs(1,0),


-- 
Samba Shared Repository