diff options
| author | Michael Brown <michael@netdirect.ca> | 2013-11-21 10:48:33 -0500 |
|---|---|---|
| committer | Garming Sam <garming@samba.org> | 2014-10-23 03:05:00 +0200 |
| commit | 88f9f50024b624319267ffa3684044d4e20e85c7 (patch) | |
| tree | 399ed0966bddbabdbe9977a38edbc7fa25f0045a /python | |
| parent | 3a7fd8b0e928106f18a123b896b2510c71451418 (diff) | |
| download | samba-88f9f50024b624319267ffa3684044d4e20e85c7.tar.gz | |
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@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Thu Oct 23 03:05:00 CEST 2014 on sn-devel-104
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/netcmd/rodc.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py index 2dc6112a302..4404b7b282a 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() |