[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  4c17850 samba-tool: fix log message of 'samba-tool user syncpasswords'
       via  afa15e6 samba-tool: let 'samba-tool user syncpasswords' report deletions immediately
      from  770edb6 s3:smbcacls add prompt for password

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


- Log -----------------------------------------------------------------
commit 4c17850ae7b6c85e99e5d4d5bc5d8e89a9ba6d47
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 25 13:25:10 2017 +0200

    samba-tool: fix log message of 'samba-tool user syncpasswords'
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12768
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri May  5 01:37:45 CEST 2017 on sn-devel-144

commit afa15e6128473d3e4006f7cdc3762ab4c1cba05a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 25 13:25:57 2017 +0200

    samba-tool: let 'samba-tool user syncpasswords' report deletions immediately
    
    We need to use the show-recycled control in addition to the
    notification control in order to get notifications about deletions.
    
    There's no real problem as the next modification will report the deletion.
    But it might be delayed a few minutes.
    
    Note that show-recycled is a superset of show-deleted, so we only need one.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12767
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 python/samba/netcmd/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index fbb98a1..f1e17dd 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -1617,7 +1617,7 @@ samba-tool user syncpasswords --terminate \\
             return
 
         def run_sync_command(dn, ldif):
-            log_msg("Call Popen[%s] for %s\n" % (dn, self.sync_command))
+            log_msg("Call Popen[%s] for %s\n" % (self.sync_command, dn))
             sync_command_p = Popen(self.sync_command,
                                    stdin=PIPE,
                                    stdout=PIPE,
@@ -1861,7 +1861,7 @@ samba-tool user syncpasswords --terminate \\
 
         def sync_loop(wait):
             notify_attrs = ["name", "uSNCreated", "uSNChanged", "objectClass"]
-            notify_controls = ["notification:1"]
+            notify_controls = ["notification:1", "show_recycled:1"]
             notify_handle = self.samdb.search_iterator(expression="objectClass=*",
                                                        scope=ldb.SCOPE_SUBTREE,
                                                        attrs=notify_attrs,


-- 
Samba Shared Repository