Changeset 745 for trunk/server/source4/librpc/ndr

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/librpc/ndr/ndr_string.c (deleted)
• source4/librpc/ndr/py_misc.c (modified) (1 diff)
• source4/librpc/ndr/py_security.c (modified) (3 diffs)
• source4/librpc/ndr/py_xattr.c (copied) (copied from vendor/current/source4/librpc/ndr/py_xattr.c )

trunk/server/source4/librpc/ndr/py_misc.c

@@ -62 +62 @@
 static int py_GUID_init(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-        char *str = NULL;
+        PyObject *str = NULL;
         NTSTATUS status;
         struct GUID *guid = py_talloc_get_ptr(self);
         const char *kwnames[] = { "str", NULL };
 
-        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", discard_const_p(char *, kwnames), &str))
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O", discard_const_p(char *, kwnames), &str))
                 return -1;
 
         if (str != NULL) {
-                status = GUID_from_string(str, guid);
+                DATA_BLOB guid_val;
+
+                if (!PyString_Check(str)) {
+                        PyErr_SetString(PyExc_TypeError, "Expected a string argument to GUID()");
+                        return -1;
+                }
+                guid_val.data = (uint8_t *)PyString_AsString(str);
+                guid_val.length = PyString_Size(str);
+                status = GUID_from_data_blob(&guid_val, guid);
                 if (!NT_STATUS_IS_OK(status)) {
                         PyErr_SetNTSTATUS(status);

trunk/server/source4/librpc/ndr/py_security.c

@@ -42 +42 @@
 }
 
+static PyObject *py_dom_sid_split(PyObject *py_self, PyObject *args)
+{
+        struct dom_sid *self = py_talloc_get_ptr(py_self);
+        struct dom_sid *domain_sid;
+        TALLOC_CTX *mem_ctx;
+        uint32_t rid;
+        NTSTATUS status;
+        PyObject *py_domain_sid;
+
+        mem_ctx = talloc_new(NULL);
+        if (mem_ctx == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+
+        status = dom_sid_split_rid(mem_ctx, self, &domain_sid, &rid);
+        if (!NT_STATUS_IS_OK(status)) {
+                PyErr_SetString(PyExc_RuntimeError, "dom_sid_split_rid failed");
+                talloc_free(mem_ctx);
+                return NULL;
+        }
+
+        py_domain_sid = py_talloc_steal(&dom_sid_Type, domain_sid);
+        talloc_free(mem_ctx);
+        return Py_BuildValue("(OI)", py_domain_sid, rid);
+}
+
 static int py_dom_sid_cmp(PyObject *py_self, PyObject *py_other)
 {
@@ -87 +114 @@
 }
 
+static PyMethodDef py_dom_sid_extra_methods[] = {
+        { "split", (PyCFunction)py_dom_sid_split, METH_NOARGS,
+                "S.split() -> (domain_sid, rid)\n"
+                "Split a domain sid" },
+        { NULL }
+};
+
+
 static void py_dom_sid_patch(PyTypeObject *type)
 {
@@ -93 +128 @@
         type->tp_repr = py_dom_sid_repr;
         type->tp_compare = py_dom_sid_cmp;
+        PyType_AddMethods(type, py_dom_sid_extra_methods);
 }