s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[kamenim/samba.git] / source4 / libnet / py_net.c

diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 6bd4c0ca847660297ff35b4cfe1c05564bae2af9..f5eea223e6e75cd2fb754de347ef434891558e4d 100644 (file)
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -29,8 +29,8 @@
 
 typedef struct {
        PyObject_HEAD
-       struct libnet_context *libnet_ctx;
        TALLOC_CTX *mem_ctx;
+       struct libnet_context *libnet_ctx;
        struct tevent_context *ev;
 } py_net_Object;
 
@@ -40,12 +40,11 @@ static PyObject *py_net_join(py_net_Object *self, PyObject *args, PyObject *kwar
        NTSTATUS status;
        PyObject *result;
        TALLOC_CTX *mem_ctx;
-       PyObject *py_creds;     
-       const char *kwnames[] = { "domain_name", "netbios_name", "join_type", "level", "credentials", NULL };
+       const char *kwnames[] = { "domain_name", "netbios_name", "join_type", "level", NULL };
 
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ssiiO:Join", discard_const_p(char *, kwnames), 
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ssii:Join", discard_const_p(char *, kwnames), 
                                         &r.in.domain_name, &r.in.netbios_name, 
-                                        &r.in.join_type, &r.in.level, &py_creds))
+                                        &r.in.join_type, &r.in.level))
                return NULL;
 
        mem_ctx = talloc_new(self->mem_ctx);
@@ -277,12 +276,12 @@ static PyObject *py_net_vampire(py_net_Object *self, PyObject *args, PyObject *k
        PyObject *ret;
        struct libnet_Vampire r;
 
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|s", discard_const_p(char *, kwnames),
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|z", discard_const_p(char *, kwnames),
                                         &r.in.domain_name, &r.in.targetdir)) {
                return NULL;
        }
 
-       r.in.netbios_name  = lp_netbios_name(self->libnet_ctx->lp_ctx);
+       r.in.netbios_name  = lpcfg_netbios_name(self->libnet_ctx->lp_ctx);
        r.out.error_string = NULL;
 
        mem_ctx = talloc_new(NULL);
@@ -347,7 +346,7 @@ static PyObject *net_obj_new(PyTypeObject *type, PyObject *args, PyObject *kwarg
        ret->ev = s4_event_context_init(NULL);
        ret->mem_ctx = talloc_new(ret->ev);
 
-       lp = lp_from_py_object(ret->mem_ctx, py_lp);
+       lp = lpcfg_from_py_object(ret->mem_ctx, py_lp);
        if (lp == NULL) {
                Py_DECREF(ret);
                return NULL;