sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

samba-tool ldapcmp: Add support for checking DNSDOMAIN and DNSFOREST by default

Browse Source 
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2013-02-14 15:00:01 +11:00 committed by Stefan Metzmacher
parent f508435d23
commit 24c4d818d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/samba/netcmd/ldapcmp.py
View File

@ -882,7 +882,7 @@ class cmd_ldapcmp(Command):
"credopts": options.CredentialsOptionsDouble, "credopts": options.CredentialsOptionsDouble,
} }
takes_args = ["URL1", "URL2", "context1?", "context2?", "context3?"] takes_args = ["URL1", "URL2", "context1?", "context2?", "context3?", "context4?", "context5?"]
takes_options = [ takes_options = [
Option("-w", "--two", dest="two", action="store_true", default=False, Option("-w", "--two", dest="two", action="store_true", default=False,
@ -910,7 +910,7 @@ class cmd_ldapcmp(Command):
] ]
def run(self, URL1, URL2, def run(self, URL1, URL2,
context1=None, context2=None, context3=None, context1=None, context2=None, context3=None, context4=None, context5=None,
two=False, quiet=False, verbose=False, descriptor=False, sort_aces=False, two=False, quiet=False, verbose=False, descriptor=False, sort_aces=False,
view="section", base="", base2="", scope="SUB", filter="", view="section", base="", base2="", scope="SUB", filter="",
credopts=None, sambaopts=None, versionopts=None, skip_missing_dn=False): credopts=None, sambaopts=None, versionopts=None, skip_missing_dn=False):
@ -941,9 +941,9 @@ class cmd_ldapcmp(Command):
contexts = ["DOMAIN"] contexts = ["DOMAIN"]
else: else:
# if no argument given, we compare all contexts # if no argument given, we compare all contexts
contexts = ["DOMAIN", "CONFIGURATION", "SCHEMA"] contexts = ["DOMAIN", "CONFIGURATION", "SCHEMA", "DNSDOMAIN", "DNSFOREST"]
else: else:
for c in [context1, context2, context3]: for c in [context1, context2, context3, context4, context5]:
if c is None: if c is None:
continue continue
if not c.upper() in ["DOMAIN", "CONFIGURATION", "SCHEMA", "DNSDOMAIN", "DNSFOREST"]: if not c.upper() in ["DOMAIN", "CONFIGURATION", "SCHEMA", "DNSDOMAIN", "DNSFOREST"]: