Unregister event fix from metze.

Jeremy.
(This used to be commit 0aee73d45733a8eca437954e0c9fd54884bbe770)

1 files changed, 6 insertions, 3 deletions

diff --git a/source3/lib/module.c b/source3/lib/module.c
index 941a6cfbe3..38fcf0f329 100644
--- a/source3/lib/module.c
+++ b/source3/lib/module.c
@@ -210,18 +210,21 @@ void smb_run_idle_events(time_t now)
 	struct smb_idle_list_ent *event = smb_idle_event_list;
 
 	while (event) {
+		struct smb_idle_list_ent *next = event->next;
 		time_t interval;
 
-		if (event->interval >= SMB_IDLE_EVENT_MIN_INTERVAL) {
+		if (event->interval <= 0) {
+			interval = SMB_IDLE_EVENT_DEFAULT_INTERVAL;
+		} else if (event->interval >= SMB_IDLE_EVENT_MIN_INTERVAL) {
 			interval = event->interval;
 		} else {
 			interval = SMB_IDLE_EVENT_MIN_INTERVAL;
 		}
 		if (now >(event->lastrun+interval)) {
-			event->fn(&event->data,&event->interval,now);
 			event->lastrun = now;
+			event->fn(&event->data,&event->interval,now);
 		}
-		event = event->next;
+		event = next;
 	}
 
 	return;