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

[sfrench/samba-autobuild/.git] / source4 / lib / ldb / tests / python / sec_descriptor.py

diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py
old mode 100644 (file)
new mode 100755 (executable)
index 71c17d1..155b65f
--- a/source4/lib/ldb/tests/python/sec_descriptor.py
+++ b/source4/lib/ldb/tests/python/sec_descriptor.py
@@ -24,11 +24,11 @@ from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import security
 
 from samba.auth import system_session
 from samba.dcerpc import security
 
 from samba.auth import system_session

-from samba import Ldb, DS_BEHAVIOR_WIN2008
+from samba import Ldb, DS_DOMAIN_FUNCTION_2008

 from subunit import SubunitTestRunner
 import unittest
 
 from subunit import SubunitTestRunner
 import unittest
 

-parser = optparse.OptionParser("ldap [options] <host>")
+parser = optparse.OptionParser("sec_descriptor [options] <host>")

 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))


@@ -377,7 +377,7 @@ changetype: add
 member: """ + user_dn
             self.ldb_admin.modify_ldif(ldif)
         self.results = {
 member: """ + user_dn
             self.ldb_admin.modify_ldif(ldif)
         self.results = {

-            # msDS-Behavior-Version < DS_BEHAVIOR_WIN2008
+            # msDS-Behavior-Version < DS_DOMAIN_FUNCTION_2008

             "ds_behavior_win2003" : {
                 "100" : "O:EAG:DU",
                 "101" : "O:DAG:DU",
             "ds_behavior_win2003" : {
                 "100" : "O:EAG:DU",
                 "101" : "O:DAG:DU",


@@ -484,7 +484,7 @@ member: """ + user_dn
         res = self.ldb_admin.search(base=self.base_dn, expression="distinguishedName=%s" % self.base_dn, \
                 attrs=['msDS-Behavior-Version'])
         res = int(res[0]['msDS-Behavior-Version'][0])
         res = self.ldb_admin.search(base=self.base_dn, expression="distinguishedName=%s" % self.base_dn, \
                 attrs=['msDS-Behavior-Version'])
         res = int(res[0]['msDS-Behavior-Version'][0])

-        if res < DS_BEHAVIOR_WIN2008:
+        if res < DS_DOMAIN_FUNCTION_2008:

             self.DS_BEHAVIOR = "ds_behavior_win2003"
         else:
             self.DS_BEHAVIOR = "ds_behavior_win2008"
             self.DS_BEHAVIOR = "ds_behavior_win2003"
         else:
             self.DS_BEHAVIOR = "ds_behavior_win2008"