From 8d994f432d34a7e81335c3be05aa40f1e227636c Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sun, 14 Apr 2002 00:58:16 +0000 Subject: Moved open_pipe_creds() function to common file. (This used to be commit 14e4d889a236dd9c2ba6db68b3133e44195b8a47) --- source3/python/py_common.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'source3/python/py_common.h') 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 */ -- cgit From cc8dce0debe4dc81bdb94fc4593eda22e5b8200a Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Sun, 14 Apr 2002 09:03:05 +0000 Subject: Moved function prototypes to py_common_proto.h (This used to be commit f006bcf8e50e44b955678356039a6d6a7e16ab20) --- source3/python/py_common.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'source3/python/py_common.h') diff --git a/source3/python/py_common.h b/source3/python/py_common.h index 45ad5c422d..6661d87fe0 100644 --- a/source3/python/py_common.h +++ b/source3/python/py_common.h @@ -21,16 +21,6 @@ #ifndef _PY_COMMON_H #define _PY_COMMON_H -/* Function prototypes */ - -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 *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. */ @@ -38,8 +28,6 @@ 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); +#include "python/py_common_proto.h" #endif /* _PY_COMMON_H */ -- cgit From 520b40e4235f26cf2bc670128ff277141084e53c Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 14 May 2002 02:37:47 +0000 Subject: General cleanup of compiler warnings etc. (This used to be commit 18aeadc591b69bbbd874b7285ecaed50ff587e68) --- source3/python/py_common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/python/py_common.h') diff --git a/source3/python/py_common.h b/source3/python/py_common.h index 6661d87fe0..f13224a020 100644 --- a/source3/python/py_common.h +++ b/source3/python/py_common.h @@ -21,6 +21,8 @@ #ifndef _PY_COMMON_H #define _PY_COMMON_H +#include "includes.h" + /* Return a cli_state struct opened on the SPOOLSS pipe. If credentials are passed use them. */ -- cgit From ce03ce2e5629930e582f9fd17445e52ce1b08907 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 16 May 2002 02:24:22 +0000 Subject: Refactored open_pipe_creds() function to remove unused parameter. (This used to be commit 36ed06cb5078429445f3bbb0f69baa2e0f8356a4) --- source3/python/py_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/python/py_common.h') diff --git a/source3/python/py_common.h b/source3/python/py_common.h index f13224a020..1f5188971d 100644 --- a/source3/python/py_common.h +++ b/source3/python/py_common.h @@ -23,7 +23,7 @@ #include "includes.h" -/* Return a cli_state struct opened on the SPOOLSS pipe. If credentials +/* Return a cli_state struct opened on the specified pipe. If credentials are passed use them. */ typedef struct cli_state *(cli_pipe_fn)( -- cgit