diff options
author | Shilpa Krishnareddy <skrishnareddy@panzura.com> | 2017-04-25 16:59:45 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2017-04-26 17:02:58 +0200 |
commit | 5701880655c8a82b6d533c7c2e131cc803e7570b (patch) | |
tree | 0c8badd8962d22a2d697d91180c87c0dfb80ef44 /source3 | |
parent | 2f1cc560dc6937d0fd7ce485ea091b979d98e53b (diff) | |
download | samba-5701880655c8a82b6d533c7c2e131cc803e7570b.tar.gz |
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 <skrishnareddy@panzura.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Wed Apr 26 17:02:58 CEST 2017 on sn-devel-144
Diffstat (limited to 'source3')
-rw-r--r-- | source3/smbd/notifyd/notifyd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c index 33a875a3732..f02ccfa11d3 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; |