[SCM] Samba Shared Repository - branch master updated

[Garming Sam]

The branch, master has been updated
       via  88f9f50 Add missing parameters to drs_Replicate in rodc.py
      from  3a7fd8b vfs: fix a typo

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


- Log -----------------------------------------------------------------
commit 88f9f50024b624319267ffa3684044d4e20e85c7
Author: Michael Brown <michael at netdirect.ca>
Date:   Thu Nov 21 10:48:33 2013 -0500

    Add missing parameters to drs_Replicate in rodc.py
    
    * rodc.py: destination_dsa_guid parameter was neglected
      in drs_Replicate call
    * rodc.py: cancel the local_samdb transaction on error
    
    Change-Id: I962315a26ec48dc8774bb41db760387a3469c919
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Thu Oct 23 03:05:00 CEST 2014 on sn-devel-104

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

Summary of changes:
 python/samba/netcmd/rodc.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py
index 2dc6112..4404b7b 100644
--- a/python/samba/netcmd/rodc.py
+++ b/python/samba/netcmd/rodc.py
@@ -91,11 +91,13 @@ class cmd_rodc_preload(Command):
         destination_dsa_guid = misc.GUID(local_samdb.get_ntds_GUID())
 
         local_samdb.transaction_start()
-        repl = drs_Replicate("ncacn_ip_tcp:%s[seal,print]" % server, lp, creds, local_samdb)
+        repl = drs_Replicate("ncacn_ip_tcp:%s[seal,print]" % server, lp, creds,
+                             local_samdb, destination_dsa_guid)
         try:
             repl.replicate(dn, source_dsa_invocation_id, destination_dsa_guid,
                            exop=drsuapi.DRSUAPI_EXOP_REPL_SECRET, rodc=True)
         except Exception, e:
+            local_samdb.transaction_cancel()
             raise CommandError("Error replicating DN %s" % dn, e)
         local_samdb.transaction_commit()
 


-- 
Samba Shared Repository