Changeset 745 for trunk/server/source4/auth/credentials/pycredentials.c

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/auth/credentials/pycredentials.c (modified) (8 diffs)

trunk/server/source4/auth/credentials/pycredentials.c

@@ -17 +17 @@
 */
 
+
 #include "includes.h"
-#include <Python.h>
 #include "pycredentials.h"
 #include "param/param.h"
@@ -25 +25 @@
 #include "libcli/util/pyerrors.h"
 #include "param/pyparam.h"
-
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
+#include <tevent.h>
 
 static PyObject *PyString_FromStringOrNULL(const char *str)
@@ -197 +194 @@
 }
 
+
+
+
+
+
+
+
+
+
+
 static PyObject *py_creds_guess(py_talloc_Object *self, PyObject *args)
 {
         PyObject *py_lp_ctx = Py_None;
         struct loadparm_context *lp_ctx;
+
+
+
+
+
         if (!PyArg_ParseTuple(args, "|O", &py_lp_ctx))
                 return NULL;
 
-        lp_ctx = lp_from_py_object(py_lp_ctx);
-        if (lp_ctx == NULL) 
-                return NULL;
-
-        cli_credentials_guess(PyCredentials_AsCliCredentials(self), lp_ctx);
+        mem_ctx = talloc_new(NULL);
+        if (mem_ctx == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+
+        lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
+        if (lp_ctx == NULL) {
+                talloc_free(mem_ctx);
+                return NULL;
+        }
+
+        cli_credentials_guess(creds, lp_ctx);
+
+        talloc_free(mem_ctx);
 
         Py_RETURN_NONE;
@@ -218 +240 @@
         struct loadparm_context *lp_ctx;
         NTSTATUS status;
+
+
+
+
+
         if (!PyArg_ParseTuple(args, "|O", &py_lp_ctx))
                 return NULL;
 
-        lp_ctx = lp_from_py_object(py_lp_ctx);
-        if (lp_ctx == NULL) 
-                return NULL;
-
-        status = cli_credentials_set_machine_account(PyCredentials_AsCliCredentials(self), lp_ctx);
+        mem_ctx = talloc_new(NULL);
+        if (mem_ctx == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+
+        lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
+        if (lp_ctx == NULL) {
+                talloc_free(mem_ctx);
+                return NULL;
+        }
+
+        status = cli_credentials_set_machine_account(creds, lp_ctx);
+        talloc_free(mem_ctx);
+
         PyErr_NTSTATUS_IS_ERR_RAISE(status);
 
         Py_RETURN_NONE;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 static PyMethodDef py_creds_methods[] = {
@@ -285 +408 @@
         { "set_kerberos_state", (PyCFunction)py_creds_set_kerberos_state, METH_VARARGS,
                 NULL },
+
+
         { "guess", (PyCFunction)py_creds_guess, METH_VARARGS, NULL },
         { "set_machine_account", (PyCFunction)py_creds_set_machine_account, METH_VARARGS, NULL },
+
+
+
         { NULL }
 };
@@ -293 +421 @@
         .tp_name = "Credentials",
         .tp_basicsize = sizeof(py_talloc_Object),
-        .tp_dealloc = py_talloc_dealloc,
         .tp_new = py_creds_new,
         .tp_flags = Py_TPFLAGS_DEFAULT,
@@ -299 +426 @@
 };
 
+
+
+
+
+
+
+
 void initcredentials(void)
 {
         PyObject *m;
+
+
+
+
+
 
         if (PyType_Ready(&PyCredentials) < 0)
+
+
+
                 return;
 
@@ -314 +456 @@
         PyModule_AddObject(m, "MUST_USE_KERBEROS", PyInt_FromLong(CRED_MUST_USE_KERBEROS));
 
+
+
+
+
         Py_INCREF(&PyCredentials);
         PyModule_AddObject(m, "Credentials", (PyObject *)&PyCredentials);
-}
+        Py_INCREF(&PyCredentialCacheContainer);
+        PyModule_AddObject(m, "CredentialCacheContainer", (PyObject *)&PyCredentialCacheContainer);
+}