diff options
| author | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
| commit | 4283ae489b6e227beba196e8a315a9727f03cc07 (patch) | |
| tree | 7308561653b9e52eab8fc13181c0ad41ae2da208 /source4/dsdb/samdb/ldb_modules/tests/samba3sam.py | |
| parent | f9bb8fbe832409893b17f2113d7b35b9ffe91540 (diff) | |
| parent | d031472227b44d040698e6dff52dc79028fde854 (diff) | |
| download | samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.gz samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.bz2 samba-4283ae489b6e227beba196e8a315a9727f03cc07.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/tests/samba3sam.py')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/tests/samba3sam.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py index fa1af2ad61..d1a8e71842 100644 --- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py +++ b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py @@ -27,7 +27,7 @@ import ldb from ldb import SCOPE_DEFAULT, SCOPE_BASE, SCOPE_SUBTREE from samba import Ldb, substitute_var from samba.tests import LdbTestCase, TestCaseInTempDir, cmdline_loadparm -import samba.dcerpc.dom_sid +import samba.dcerpc.security import samba.security import samba.ndr @@ -116,7 +116,7 @@ class MapBaseTestCase(TestCaseInTempDir): super(MapBaseTestCase, self).tearDown() def assertSidEquals(self, text, ndr_sid): - sid_obj1 = samba.ndr.ndr_unpack(samba.dcerpc.dom_sid.dom_sid, + sid_obj1 = samba.ndr.ndr_unpack(samba.dcerpc.security.dom_sid, str(ndr_sid[0])) sid_obj2 = samba.security.Sid(text) # For now, this is the only way we can compare these since the |