[PATCH] Fix notifyd timestamp handling

vl at samba.org vl at samba.org
Wed Apr 26 09:43:44 UTC 2017


Hi!

The attached patch was sent to me in a personal mail.

Review appreciated!

Thanks, Volker
-------------- next part --------------
From 043d36939f3b738f07f222d304f27916c439004d Mon Sep 17 00:00:00 2001
From: Shilpa Krishnareddy <skrishnareddy at panzura.com>
Date: Tue, 25 Apr 2017 16:59:45 +0200
Subject: [PATCH] notify: Fix ordering of events in notifyd

In notifyd_trigger_parser() while initializing notify_event_msg values from
notify_trigger_msg, 'when' value is ignored. So the smbd process does not get
correct 'when' value and this is causing issues during qsort in
notify_marshall_changes(). Because of this issue, smb2.notify.dir test was
failing.

Signed-off-by: Shilpa Krishnareddy <skrishnareddy at panzura.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
---
 source3/smbd/notifyd/notifyd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c
index 33a875a..f02ccfa 100644
--- a/source3/smbd/notifyd/notifyd.c
+++ b/source3/smbd/notifyd/notifyd.c
@@ -735,7 +735,8 @@ static void notifyd_trigger_parser(TDB_DATA key, TDB_DATA data,
 
 {
 	struct notifyd_trigger_state *tstate = private_data;
-	struct notify_event_msg msg = { .action = tstate->msg->action };
+	struct notify_event_msg msg = { .action = tstate->msg->action,
+					.when = tstate->msg->when };
 	struct iovec iov[2];
 	size_t path_len = key.dsize;
 	struct notifyd_instance *instances = NULL;
-- 
2.1.4



More information about the samba-technical mailing list