sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

s4-python: rename conflicting variable with the import option

Browse Source
This commit is contained in:
Matthieu Patou
2011-11-28 19:31:57 +01:00
parent 372dd3b7d0
commit 9e3ee2bf6a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/netcmd/drs.py
View File

@ -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