[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-755-g0495343

[Andrew Tridgell]

The branch, master has been updated
       via  049534336c8df538ab3c384c0f505cf3bc6a1300 (commit)
       via  d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 (commit)
      from  e235b4628b473f30275a534f5172c8926d3f205d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 049534336c8df538ab3c384c0f505cf3bc6a1300
Merge: d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020 e235b4628b473f30275a534f5172c8926d3f205d
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Mar 27 09:32:43 2009 +1100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit d88ced1dccd8f6eb6a1931d3ccae2c7cb0667020
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Mar 27 09:31:51 2009 +1100

    added a --wspp option
    
    Adding --wspp to possibleInferiors.py forces it to use the WSPP
    documented algorithm, which doesn't match windows behaviour

-----------------------------------------------------------------------

Summary of changes:
 .../samdb/ldb_modules/tests/possibleinferiors.py   |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index ec426c0..aab93e5 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


-- 
Samba Shared Repository