From 9b1ab922a05202000c49c2ba043ccc738907d866 Mon Sep 17 00:00:00 2001 From: Shilpa Krishnareddy 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. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12756 Signed-off-by: Shilpa Krishnareddy Reviewed-by: Volker Lendecke Reviewed-by: Stefan Metzmacher (cherry picked from commit 8a69f92a7dc20fe2ec700b81eec37cb134231c54) --- 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 70f52cd..087952a 100644 --- a/source3/smbd/notifyd/notifyd.c +++ b/source3/smbd/notifyd/notifyd.c @@ -734,7 +734,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