sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

s4: Better way to call "dom_sid_to_rid" from ldap.py

Browse Source
This commit is contained in:
Matthias Dieter Wallnöfer
2009-08-13 11:37:38 +02:00
parent e2b12c6f6a
commit 44dfb2902e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/lib/ldb/tests/python/ldap.py
View File

@ -18,10 +18,8 @@ from ldb import ERR_NO_SUCH_OBJECT, ERR_ATTRIBUTE_OR_VALUE_EXISTS
from ldb import ERR_ENTRY_ALREADY_EXISTS, ERR_UNWILLING_TO_PERFORM from ldb import ERR_ENTRY_ALREADY_EXISTS, ERR_UNWILLING_TO_PERFORM
from ldb import ERR_NOT_ALLOWED_ON_NON_LEAF, ERR_OTHER, ERR_INVALID_DN_SYNTAX from ldb import ERR_NOT_ALLOWED_ON_NON_LEAF, ERR_OTHER, ERR_INVALID_DN_SYNTAX
from ldb import Message, Dn from ldb import Message, Dn
from samba import Ldb from samba import Ldb, param, dom_sid_to_rid
from subunit import SubunitTestRunner from subunit import SubunitTestRunner
from samba import param
from samba import glue
import unittest import unittest
parser = optparse.OptionParser("ldap [options] <host>") parser = optparse.OptionParser("ldap [options] <host>")
@ -173,7 +171,7 @@ class BasicTests(unittest.TestCase):
self.assertTrue(len(res1) == 1) self.assertTrue(len(res1) == 1)
primary_group_token = int(res1[0]["primaryGroupToken"][0]) primary_group_token = int(res1[0]["primaryGroupToken"][0])
rid = glue.dom_sid_to_rid(ldb.schema_format_value("objectSID", res1[0]["objectSID"][0])) rid = dom_sid_to_rid(ldb.schema_format_value("objectSID", res1[0]["objectSID"][0]))
self.assertEquals(primary_group_token, rid) self.assertEquals(primary_group_token, rid)
# Has to wait until we support read-only generated attributes correctly # Has to wait until we support read-only generated attributes correctly

10
source4/scripting/python/samba/__init__.py
View File

@ -242,6 +242,16 @@ def valid_netbios_name(name):
return False return False
return True return True
def dom_sid_to_rid(sid_str):
"""Converts a domain SID to the relative RID.
:param sid_str: The domain SID formatted as string
"""
return glue.dom_sid_to_rid(sid_str)
version = glue.version version = glue.version
DS_BEHAVIOR_WIN2000 = glue.DS_BEHAVIOR_WIN2000 DS_BEHAVIOR_WIN2000 = glue.DS_BEHAVIOR_WIN2000