[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5701880 notify: Fix ordering of events in notifyd
      from  2f1cc56 s4-messaging: Add helpful comments

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5701880655c8a82b6d533c7c2e131cc803e7570b
Author: Shilpa Krishnareddy <skrishnareddy at panzura.com>
Date:   Tue Apr 25 16:59:45 2017 +0200

    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 at panzura.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Apr 26 17:02:58 CEST 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/notifyd/notifyd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

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;


-- 
Samba Shared Repository