summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-11-28 19:31:57 +0100
committerMatthieu Patou <mat@matws.net>2011-12-05 18:23:06 +0100
commit9e3ee2bf6acd919bd9efa057b3ebedc86f439259 (patch)
tree675f2fe1d929092e9cd29eefa9bce76a9cdcd38c /source4
parent372dd3b7d0c81f6f85b0633fa3aaabd8f216bdf4 (diff)
downloadsamba-9e3ee2bf6acd919bd9efa057b3ebedc86f439259.tar.gz
samba-9e3ee2bf6acd919bd9efa057b3ebedc86f439259.tar.bz2
samba-9e3ee2bf6acd919bd9efa057b3ebedc86f439259.zip
s4-python: rename conflicting variable with the import option
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/netcmd/drs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py
index 2f0e3066ae..056d3ee5b4 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/source4/scripting/python/samba/netcmd/drs.py
@@ -313,7 +313,7 @@ class cmd_drs_replicate(Command):
if len(msg) == 0:
raise CommandError("Failed to find source NTDS DN %s" % SOURCE_DC)
source_dsa_guid = msg[0]['objectGUID'][0]
- options = int(attr_default(msg, 'options', 0))
+ dsa_options = int(attr_default(msg, 'options', 0))
nc = drsuapi.DsReplicaObjectIdentifier()
nc.dn = NC
@@ -321,7 +321,7 @@ class cmd_drs_replicate(Command):
req1 = drsuapi.DsReplicaSyncRequest1()
req1.naming_context = nc;
req1.options = 0
- if not (options & dsdb.DS_NTDSDSA_OPT_DISABLE_OUTBOUND_REPL):
+ if not (dsa_options & dsdb.DS_NTDSDSA_OPT_DISABLE_OUTBOUND_REPL):
req1.options |= drsuapi.DRSUAPI_DRS_WRIT_REP
if add_ref:
req1.options |= drsuapi.DRSUAPI_DRS_ADD_REF