summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-04-14 00:58:16 +0000
committerTim Potter <tpot@samba.org>2002-04-14 00:58:16 +0000
commit8d994f432d34a7e81335c3be05aa40f1e227636c (patch)
treea007e5d346fda3c59b2a8920ecbfbc1165923f22
parent35e8d461e9c35b972b9d6b264853be1608acc62a (diff)
downloadsamba-8d994f432d34a7e81335c3be05aa40f1e227636c.tar.gz
samba-8d994f432d34a7e81335c3be05aa40f1e227636c.tar.bz2
samba-8d994f432d34a7e81335c3be05aa40f1e227636c.zip
Moved open_pipe_creds() function to common file.
(This used to be commit 14e4d889a236dd9c2ba6db68b3133e44195b8a47)
-rw-r--r--source3/python/py_common.c78
-rw-r--r--source3/python/py_common.h13
2 files changed, 90 insertions, 1 deletions
diff --git a/source3/python/py_common.c b/source3/python/py_common.c
index bc3153c26c..019bcca07c 100644
--- a/source3/python/py_common.c
+++ b/source3/python/py_common.c
@@ -21,6 +21,8 @@
#include "includes.h"
#include "Python.h"
+#include "python/py_common.h"
+
/* Return a tuple of (error code, error string) from a WERROR */
PyObject *py_werror_tuple(WERROR werror)
@@ -115,3 +117,79 @@ PyObject *py_setup_logging(PyObject *self, PyObject *args, PyObject *kw)
Py_INCREF(Py_None);
return Py_None;
}
+
+struct cli_state *open_pipe_creds(char *system_name, PyObject *creds,
+ cli_pipe_fn *connect_fn,
+ struct cli_state *cli)
+{
+ struct ntuser_creds nt_creds;
+
+ if (!cli) {
+ cli = (struct cli_state *)malloc(sizeof(struct cli_state));
+ if (!cli)
+ return NULL;
+ }
+
+ ZERO_STRUCTP(cli);
+
+ /* Extract credentials from the python dictionary and initialise
+ the ntuser_creds struct from them. */
+
+ ZERO_STRUCT(nt_creds);
+ nt_creds.pwd.null_pwd = True;
+
+ if (creds && PyDict_Size(creds) > 0) {
+ char *username, *password, *domain;
+ 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) {
+ error:
+
+ /* TODO: Either pass in the exception for the
+ module calling open_pipe_creds() or have a
+ global samba python module exception. */
+
+ PyErr_SetString(PyExc_RuntimeError,
+ "invalid credentials");
+ return NULL;
+ }
+
+ if (!PyString_Check(username_obj) ||
+ !PyString_Check(domain_obj) ||
+ !PyString_Check(password_obj))
+ goto error;
+
+ username = PyString_AsString(username_obj);
+ domain = PyString_AsString(domain_obj);
+ password = PyString_AsString(password_obj);
+
+ if (!username || !domain || !password)
+ goto error;
+
+ /* Initialise nt_creds structure with passed creds */
+
+ fstrcpy(nt_creds.user_name, username);
+ fstrcpy(nt_creds.domain, domain);
+
+ if (lp_encrypted_passwords())
+ pwd_make_lm_nt_16(&nt_creds.pwd, password);
+ else
+ pwd_set_cleartext(&nt_creds.pwd, password);
+
+ nt_creds.pwd.null_pwd = False;
+ }
+
+ /* Now try to connect */
+
+ connect_fn(cli, system_name, &nt_creds);
+
+ return cli;
+}
diff --git a/source3/python/py_common.h b/source3/python/py_common.h
index 4a5c92ca8c..45ad5c422d 100644
--- a/source3/python/py_common.h
+++ b/source3/python/py_common.h
@@ -27,8 +27,19 @@ void py_samba_init(void);
PyObject *py_werror_tuple(WERROR werror);
PyObject *py_ntstatus_tuple(NTSTATUS ntstatus);
-PyObject *py_setup_logging(PyObject *self, PyObject *args);
+PyObject *py_setup_logging(PyObject *self, PyObject *args, PyObject *kw);
PyObject *get_debuglevel(PyObject *self, PyObject *args);
PyObject *set_debuglevel(PyObject *self, PyObject *args);
+/* Return a cli_state struct opened on the SPOOLSS pipe. If credentials
+ are passed use them. */
+
+typedef struct cli_state *(cli_pipe_fn)(
+ struct cli_state *cli, char *system_name,
+ struct ntuser_creds *creds);
+
+struct cli_state *open_pipe_creds(char *system_name, PyObject *creds,
+ cli_pipe_fn *connect_fn,
+ struct cli_state *cli);
+
#endif /* _PY_COMMON_H */