s4-pynet: added server keyword to Net() initialisation
authorAndrew Tridgell <tridge@samba.org>
Fri, 24 Sep 2010 02:52:19 +0000 (19:52 -0700)
committerAndrew Tridgell <tridge@samba.org>
Sat, 25 Sep 2010 17:38:45 +0000 (10:38 -0700)
this sets up server_address in the libnet context

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

source4/libnet/py_net.c

index c9858a41a552774241b31028b76a900dfa079539..9775e246ed920adc0d399f64c59a934035e01768 100644 (file)
@@ -534,12 +534,14 @@ static void py_net_dealloc(py_net_Object *self)
 static PyObject *net_obj_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 {
        PyObject *py_creds, *py_lp = Py_None;
-       const char *kwnames[] = { "creds", "lp", NULL };
+       const char *kwnames[] = { "creds", "lp", "server", NULL };
        py_net_Object *ret;
        struct loadparm_context *lp;
+       const char *server_address = NULL;
 
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O", 
-                       discard_const_p(char *, kwnames), &py_creds, &py_lp))
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oz",
+                                        discard_const_p(char *, kwnames), &py_creds, &py_lp,
+                                        &server_address))
                return NULL;
 
        ret = PyObject_New(py_net_Object, type);
@@ -565,6 +567,8 @@ static PyObject *net_obj_new(PyTypeObject *type, PyObject *args, PyObject *kwarg
                return NULL;
        }
 
+       ret->libnet_ctx->server_address = server_address;
+
        ret->libnet_ctx->cred = cli_credentials_from_py_object(py_creds);
        if (ret->libnet_ctx->cred == NULL) {
                PyErr_SetString(PyExc_TypeError, "Expected credentials object");