diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-11-08 08:01:19 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-11-08 08:02:25 +0100 |
| commit | 9579036dc5ce74820d12dc3a1ec2f1cd4a93e246 (patch) | |
| tree | 6fc8f7ee30e16d26edf9ff515e77c25c22ef3e64 | |
| parent | ff5c58da55ae359496480e66f209d9ef3e2a05cb (diff) | |
| download | samba-9579036dc5ce74820d12dc3a1ec2f1cd4a93e246.tar.gz samba-9579036dc5ce74820d12dc3a1ec2f1cd4a93e246.tar.bz2 samba-9579036dc5ce74820d12dc3a1ec2f1cd4a93e246.zip | |
s4: fix samba4.samba3sam.python test
metze
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/tests/samba3sam.py | 4 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py index 1fc531902d..7162edcb3d 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.security +import samba.dcerpc.dom_sid 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.security.dom_sid, + sid_obj1 = samba.ndr.ndr_unpack(samba.dcerpc.dom_sid.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 diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index f9412a6851..239acbe03a 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -737,12 +737,17 @@ PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI PYTALLOC param swig_credentials python_dc python_drsuapi_OBJ_FILES = $(gen_ndrsrcdir)/py_drsuapi.o +[PYTHON::python_dcerpc_dom_sid] +LIBRARY_REALNAME = samba/dcerpc/dom_sid.$(SHLIBEXT) +PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc_misc python_dcerpc + +python_dcerpc_dom_sid_OBJ_FILES = $(gen_ndrsrcdir)/py_dom_sid.o + [PYTHON::python_dcerpc_security] LIBRARY_REALNAME = samba/dcerpc/security.$(SHLIBEXT) -PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc_misc python_dcerpc +PRIVATE_DEPENDENCIES = PYTALLOC python_dcerpc_misc python_dcerpc_dom_sid python_dcerpc -python_dcerpc_security_OBJ_FILES = $(gen_ndrsrcdir)/py_security.o \ - $(gen_ndrsrcdir)/py_dom_sid.o +python_dcerpc_security_OBJ_FILES = $(gen_ndrsrcdir)/py_security.o $(IDL_HEADER_FILES) $(IDL_NDR_PARSE_H_FILES) $(IDL_NDR_PARSE_C_FILES) \ $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \ |