summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-27 09:31:51 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-27 09:31:51 +1100
commitd88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 (patch)
tree008352ffe60dfa85b7afc3a5ae3e896be76625a5 /source4/dsdb/samdb/ldb_modules
parent7eb7f423d048e869a19d560ab0d1ba3b51b62fa9 (diff)
downloadsamba-d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020.tar.gz
samba-d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020.tar.bz2
samba-d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020.zip
added a --wspp option
Adding --wspp to possibleInferiors.py forces it to use the WSPP documented algorithm, which doesn't match windows behaviour
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
-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