summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>2009-09-20 17:43:46 -0700
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>2009-09-20 17:43:46 -0700
commit025590e7a4758e86e7942642971b92fc6bab7a8e (patch)
treee48bb903f2aabf1707825c84cc3d9ff517eed125 /source4/lib/ldb
parent6283f2caaa42c7238bdc9c2e8bc1246207645019 (diff)
parent11bfbc516077d1cead94d0bc70ef24267b9014e7 (diff)
downloadsamba-025590e7a4758e86e7942642971b92fc6bab7a8e.tar.gz
samba-025590e7a4758e86e7942642971b92fc6bab7a8e.tar.bz2
samba-025590e7a4758e86e7942642971b92fc6bab7a8e.zip
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/lib/ldb')
-rwxr-xr-x[-rw-r--r--]source4/lib/ldb/tests/python/sec_descriptor.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py
index 71c17d17e6..155b65f4ab 100644..100755
--- 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 import Ldb, DS_BEHAVIOR_WIN2008
+from samba import Ldb, DS_DOMAIN_FUNCTION_2008
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))
@@ -377,7 +377,7 @@ changetype: add
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",
@@ -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])
- if res < DS_BEHAVIOR_WIN2008:
+ if res < DS_DOMAIN_FUNCTION_2008:
self.DS_BEHAVIOR = "ds_behavior_win2003"
else:
self.DS_BEHAVIOR = "ds_behavior_win2008"