diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-15 16:56:15 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-15 16:56:15 +0200 |
| commit | dfedfae1cd1c1af54609fd56dafe8eb026f9382c (patch) | |
| tree | 7a07bcd46bf711f5ed5ed5d2dd5774f22bf5df94 /source4/scripting | |
| parent | cb5873f36d5f67b51afd9327df114ff7c1b529d0 (diff) | |
| parent | 7bb2ebb884c35676a6cf03efe6ecc15b3e232a43 (diff) | |
| download | samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.tar.gz samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.tar.bz2 samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 66327b8bd8dbde140b93f000a81ba13e743f27b0)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/pytalloc.c | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/dcerpc/unix.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c index d8d3efe69c..aa0ae9bf90 100644 --- a/source4/scripting/python/pytalloc.c +++ b/source4/scripting/python/pytalloc.c @@ -39,7 +39,7 @@ PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, PyObject *py_talloc_default_repr(PyObject *py_obj) { py_talloc_Object *obj = (py_talloc_Object *)py_obj; + PyTypeObject *type = (PyTypeObject*)PyObject_Type((PyObject *)obj); - return PyString_FromFormat("<talloc: %s>", - talloc_get_name(obj->talloc_ctx)); + return PyString_FromFormat("<%s>", type->tp_name); } diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/source4/scripting/python/samba/tests/dcerpc/unix.py index bfddfdc7ec..43978ac9dc 100644 --- a/source4/scripting/python/samba/tests/dcerpc/unix.py +++ b/source4/scripting/python/samba/tests/dcerpc/unix.py @@ -27,6 +27,8 @@ class UnixinfoTests(RpcInterfaceTestCase): def test_getpwuid(self): infos = self.conn.GetPWUid(range(512)) self.assertEquals(512, len(infos)) + self.assertEquals("", infos[0].shell) + self.assertEquals("", infos[0].homedir) def test_gidtosid(self): self.conn.GidToSid(1000) |