summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-03-26 15:33:40 -0700
committerJeremy Allison <jra@samba.org>2009-03-26 15:33:40 -0700
commit0788436b579b78088bfa9d77fb4c47f652ad5eb8 (patch)
tree318a8c48636c57650c0210653f52725c252d612c
parent1f83aafac85fad3f996f1dfd92e553b030de50d0 (diff)
parent049534336c8df538ab3c384c0f505cf3bc6a1300 (diff)
downloadsamba-0788436b579b78088bfa9d77fb4c47f652ad5eb8.tar.gz
samba-0788436b579b78088bfa9d77fb4c47f652ad5eb8.tar.bz2
samba-0788436b579b78088bfa9d77fb4c47f652ad5eb8.zip
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
-rwxr-xr-xsource4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index ec426c099b..aab93e59a3 100755
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -36,6 +36,7 @@ parser.add_option_group(sambaopts)
credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
parser.add_option_group(options.VersionOptions(parser))
+parser.add_option("--wspp", action="store_true")
opts, args = parser.parse_args()
@@ -139,10 +140,12 @@ def POSSSUPERIORS(classinfo, oclist):
list2.extend(classinfo[oc]["systemPossSuperiors"])
list2.extend(classinfo[oc]["possSuperiors"])
list2.extend(POSSSUPERIORS(classinfo, SUPCLASSES(classinfo, oc)))
- # the WSPP docs suggest we should do this:
- # list2.extend(POSSSUPERIORS(classinfo, AUXCLASSES(classinfo, [oc])))
- # but testing against w2k3 and w2k8 shows that we need to do this instead
- list2.extend(SUBCLASSES(classinfo, list2))
+ if opts.wspp:
+ # the WSPP docs suggest we should do this:
+ list2.extend(POSSSUPERIORS(classinfo, AUXCLASSES(classinfo, [oc])))
+ else:
+ # but testing against w2k3 and w2k8 shows that we need to do this instead
+ list2.extend(SUBCLASSES(classinfo, list2))
classinfo[oc]["POSSSUPERIORS"] = list2
list.extend(list2)
return list