Author: tpot Date: 2004-09-05 02:06:11 +0000 (Sun, 05 Sep 2004) New Revision: 2228
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2228&nolog=1 Log: Finally commit bits of old workareas together to get dcerpc python bindings happening. This commit lets python call dcerpc_pipe_connect() and open the samr pipe. Added: branches/SAMBA_4_0/source/scripting/swig/dcerpc.i branches/SAMBA_4_0/source/scripting/swig/samr.i Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl branches/SAMBA_4_0/source/scripting/swig/ branches/SAMBA_4_0/source/scripting/swig/samba.i Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pl =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pl 2004-09-04 23:04:31 UTC (rev 2227) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pl 2004-09-05 02:06:11 UTC (rev 2228) @@ -745,15 +745,10 @@ # Swig extensions +swig: scripting/swig/_tdb.so scripting/swig/_dcerpc.so + PYTHON_TDB_OBJ = lib/tdb/common/tdb.o lib/tdb/common/spinlock.o -swig: scripting/swig/_tdb.so - -swig_clean: - -rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc \\ - scripting/swig/tdb.py scripting/swig/tdb_wrap.c \\ - scripting/swig/tdb_wrap.o - scripting/swig/tdb.py: scripting/swig/tdb.i swig -python scripting/swig/tdb.i @@ -761,6 +756,37 @@ \$(SHLD) \$(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \\ \$(PYTHON_TDB_OBJ) +PYTHON_DCERPC_OBJ = \$(SUBSYSTEM_LIBRPC_RAW_OBJS) \\ + \$(SUBSYSTEM_LIBNDR_RAW_OBJS) \\ + \$(SUBSYSTEM_LIBBASIC_OBJS) \\ + \$(SUBSYSTEM_CONFIG_OBJS) \\ + \$(SUBSYSTEM_LIBTDB_OBJS) \\ + \$(SUBSYSTEM_SCHANNELDB_OBJS) \\ + \$(SUBSYSTEM_GENSEC_OBJS) \\ + \$(SUBSYSTEM_LIBCLI_UTILS_OBJS) \\ + \$(SUBSYSTEM_LIBCLI_RAW_OBJS) \\ + \$(SUBSYSTEM_LIBCLI_AUTH_OBJS) \\ + \$(SUBSYSTEM_LIBCLI_NMB_OBJS) \\ + \$(SUBSYSTEM_AUTH_OBJS) \\ + \$(SUBSYSTEM_SAMDB_OBJS) \\ + \$(SUBSYSTEM_LIBLDB_OBJS) \\ + \$(SUBSYSTEM_CHARSET_OBJS) \\ + \$(SUBSYSTEM_LIBSMB_OBJS) \\ + \$(SUBSYSTEM_DCERPC_COMMON_OBJS) + +PYTHON_DCERPC_LIBS = -lldap + +scripting/swig/dcerpc.py: scripting/swig/dcerpc.i scripting/swig/samr.i scripting/swig/samba.i + swig -python scripting/swig/dcerpc.i + +scripting/swig/_dcerpc.so: scripting/swig/dcerpc.py scripting/swig/dcerpc_wrap.o \$(PYTHON_DCERPC_OBJ) + \$(SHLD) \$(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o \$(PYTHON_DCERPC_OBJ) \$(PYTHON_DCERPC_LIBS) + +swig_clean: + -rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc \\ + scripting/swig/tdb.py scripting/swig/tdb_wrap.c \\ + scripting/swig/tdb_wrap.o + everything: all etags: Property changes on: branches/SAMBA_4_0/source/scripting/swig ___________________________________________________________________ Name: svn:ignore + *.pyc _*.so *_wrap.c Added: branches/SAMBA_4_0/source/scripting/swig/dcerpc.i =================================================================== --- branches/SAMBA_4_0/source/scripting/swig/dcerpc.i 2004-09-04 23:04:31 UTC (rev 2227) +++ branches/SAMBA_4_0/source/scripting/swig/dcerpc.i 2004-09-05 02:06:11 UTC (rev 2228) @@ -0,0 +1,68 @@ +/* + Unix SMB/CIFS implementation. + + Swig interface to librpc functions. + + Copyright (C) Tim Potter 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +%module dcerpc + +%{ + +/* This symbol is used in both includes.h and Python.h which causes an + annoying compiler warning. */ + +#ifdef HAVE_FSTAT +#undef HAVE_FSTAT +#endif + +#include "includes.h" + +#undef strcpy + +%} + +%include "samba.i" + +%init %{ +/* setup_logging("python", DEBUG_STDOUT); */ + lp_load(dyn_CONFIGFILE, True, False, False); + load_interfaces(); +%} + +%typemap(in, numinputs=0) struct dcerpc_pipe **OUT (struct dcerpc_pipe *temp) { + $1 = &temp; +} + +%typemap(argout) struct dcerpc_pipe ** { + PyObject *o = PyTuple_New(2); + PyTuple_SetItem(o, 0, resultobj); + PyTuple_SetItem(o, 1, SWIG_NewPointerObj(*$1, SWIGTYPE_p_dcerpc_pipe, 0)); + resultobj = o; +} + +%types(struct dcerpc_pipe *); + +NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT, + const char *binding, + const char *pipe_uuid, + uint32 pipe_version, + const char *domain, + const char *username, + const char *password); +%include "samr.i" Modified: branches/SAMBA_4_0/source/scripting/swig/samba.i =================================================================== --- branches/SAMBA_4_0/source/scripting/swig/samba.i 2004-09-04 23:04:31 UTC (rev 2227) +++ branches/SAMBA_4_0/source/scripting/swig/samba.i 2004-09-05 02:06:11 UTC (rev 2228) @@ -31,3 +31,9 @@ } $1 = (uint32_t)PyInt_AsLong($input); } + +/* For the moment treat NTSTATUS as an integer */ + +%typemap(out) NTSTATUS { + $result = PyInt_FromLong(NT_STATUS_V($1)); +} Added: branches/SAMBA_4_0/source/scripting/swig/samr.i =================================================================== --- branches/SAMBA_4_0/source/scripting/swig/samr.i 2004-09-04 23:04:31 UTC (rev 2227) +++ branches/SAMBA_4_0/source/scripting/swig/samr.i 2004-09-05 02:06:11 UTC (rev 2228) @@ -0,0 +1,25 @@ +/* + Unix SMB/CIFS implementation. + + Swig interface to librpc functions. + + Copyright (C) Tim Potter 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#define DCERPC_SAMR_UUID "12345778-1234-abcd-ef00-0123456789ac" +const int DCERPC_SAMR_VERSION = 1.0; +#define DCERPC_SAMR_NAME "samr"
