Fix to allow a timestamp of zero to cause an instantaneous changenotify

scan - then call this from renames. This allows instantaneous update for
W2k renames.
Jeremy.
(This used to be commit 07dffc4ee931cbc61197e2da277df9c404a77469)

1 files changed, 6 insertions, 3 deletions

diff --git a/source3/smbd/notify_hash.c b/source3/smbd/notify_hash.c
index fe09d9cf9d..95d430d23b 100644
--- a/source3/smbd/notify_hash.c
+++ b/source3/smbd/notify_hash.c
@@ -116,14 +116,15 @@ static void *hash_register_notify(connection_struct *conn, char *path, uint32 fl
 }
 
 /****************************************************************************
-check if a change notify should be issued 
+ Check if a change notify should be issued.
+ A time of zero means instantaneous check - don't modify the last check time.
 *****************************************************************************/
 static BOOL hash_check_notify(connection_struct *conn, uint16 vuid, char *path, uint32 flags, void *datap, time_t t)
 {
 	struct change_data *data = (struct change_data *)datap;
 	struct change_data data2;
 
-	if (t < data->last_check_time + lp_change_notify_timeout()) return False;
+	if (t && t < data->last_check_time + lp_change_notify_timeout()) return False;
 
 	if (!become_user(conn,vuid)) return True;
 	if (!become_service(conn,True)) {
@@ -140,7 +141,9 @@ static BOOL hash_check_notify(connection_struct *conn, uint16 vuid, char *path,
 		return True;
 	}
 
-	data->last_check_time = t;	    
+	if (t)
+		data->last_check_time = t;
+
 	unbecome_user();
 
 	return False;