From d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 27 Mar 2009 09:31:51 +1100 Subject: added a --wspp option Adding --wspp to possibleInferiors.py forces it to use the WSPP documented algorithm, which doesn't match windows behaviour --- source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source4/dsdb/samdb') 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 -- cgit