Compile fix for new arguments to cli_full_connection()

[kai/samba.git] / source3 / python / py_common.c

diff --git a/source3/python/py_common.c b/source3/python/py_common.c
index bc3153c26cce53b1d30bfd134affd75527a52521..471a53da8448c61853472726c23c40d04fe9bba9 100644 (file)
--- a/source3/python/py_common.c
+++ b/source3/python/py_common.c
@@ -21,11 +21,13 @@
 #include "includes.h"
 #include "Python.h"
 
+#include "python/py_common_proto.h"
+
 /* Return a tuple of (error code, error string) from a WERROR */
 
 PyObject *py_werror_tuple(WERROR werror)
 {
-       return Py_BuildValue("is", W_ERROR_V(werror), 
+       return Py_BuildValue("[is]", W_ERROR_V(werror), 
                             dos_errstr(werror));
 }
 
@@ -33,7 +35,7 @@ PyObject *py_werror_tuple(WERROR werror)
 
 PyObject *py_ntstatus_tuple(NTSTATUS ntstatus)
 {
-       return Py_BuildValue("is", NT_STATUS_V(ntstatus), 
+       return Py_BuildValue("[is]", NT_STATUS_V(ntstatus), 
                             nt_errstr(ntstatus));
 }
 
@@ -43,6 +45,9 @@ static BOOL initialised;
 
 void py_samba_init(void)
 {
+       extern pstring global_myname;
+       char *p;
+
        if (initialised)
                return;
 
@@ -55,6 +60,11 @@ void py_samba_init(void)
 
        load_interfaces();
        
+       fstrcpy(global_myname, myhostname());
+       p = strchr(global_myname, '.');
+       if (p)
+               *p = 0;
+
        initialised = True;
 }
 
@@ -93,8 +103,8 @@ PyObject *py_setup_logging(PyObject *self, PyObject *args, PyObject *kw)
        char *logfilename = NULL;
        static char *kwlist[] = {"interactive", "logfilename", NULL};
 
-       if (!PyArg_ParseTupleAndKeywords(args, kw, "|is", kwlist,
-                                        &interactive, &logfilename))
+       if (!PyArg_ParseTupleAndKeywords(
+                   args, kw, "|is", kwlist, &interactive, &logfilename))
                return NULL;
        
        if (interactive && logfilename) {
@@ -115,3 +125,87 @@ PyObject *py_setup_logging(PyObject *self, PyObject *args, PyObject *kw)
        Py_INCREF(Py_None);
        return Py_None;
 }
+
+/* Return a cli_state to a RPC pipe on the given server.  Use the
+   credentials passed if not NULL.  If an error occurs errstr is set to a
+   string describing the error and NULL is returned.  If set, errstr must
+   be freed by calling free(). */
+
+struct cli_state *open_pipe_creds(char *server, PyObject *creds, 
+                                 char *pipe_name, char **errstr)
+{
+       char *username = "", *password = "", *domain = "";
+       struct cli_state *cli;
+       NTSTATUS result;
+       
+       /* Extract credentials from the python dictionary */
+
+       if (creds && PyDict_Size(creds) > 0) {
+               PyObject *username_obj, *password_obj, *domain_obj;
+
+               /* Check credentials passed are valid.  This means the
+                  username, domain and password keys must exist and be
+                  string objects. */
+
+               username_obj = PyDict_GetItemString(creds, "username");
+               domain_obj = PyDict_GetItemString(creds, "domain");
+               password_obj = PyDict_GetItemString(creds, "password");
+
+               if (!username_obj || !domain_obj || !password_obj) {
+               creds_error:
+                       *errstr = strdup("invalid credentials");
+                       return NULL;
+               }
+
+               if (!PyString_Check(username_obj) || 
+                   !PyString_Check(domain_obj) || 
+                   !PyString_Check(password_obj))
+                       goto creds_error;
+
+               username = PyString_AsString(username_obj);
+               domain = PyString_AsString(domain_obj);
+               password = PyString_AsString(password_obj);
+
+               if (!username || !domain || !password)
+                       goto creds_error;
+       }
+
+       /* Now try to connect */
+
+       result = cli_full_connection(
+               &cli, NULL, server, NULL, 0, "IPC$", "IPC",
+               username, domain, password);
+       
+       if (!NT_STATUS_IS_OK(result)) {
+               *errstr = strdup("error connecting to IPC$ pipe");
+               return NULL;
+       }
+
+       if (!cli_nt_session_open(cli, pipe_name)) {
+               cli_shutdown(cli);
+               free(cli);
+               asprintf(errstr, "error opening %s", pipe_name);
+               return NULL;
+       }
+
+       *errstr = NULL;
+
+       return cli;
+}
+
+/* Return true if a dictionary contains a "level" key with an integer
+   value.  Set the value if so. */
+
+BOOL get_level_value(PyObject *dict, uint32 *level)
+{
+       PyObject *obj;
+
+       if (!(obj = PyDict_GetItemString(dict, "level")) ||
+           !PyInt_Check(obj))
+               return False;
+
+       if (level)
+               *level = PyInt_AsLong(obj);
+
+       return True;
+}