svn commit: samba r25497 - in branches/4.0-python: . source/librpc source/pidl/lib/Parse/Pidl/Samba4 source/scripting/swig

jelmer at samba.org jelmer at samba.org
Wed Oct 3 22:07:48 GMT 2007


Author: jelmer
Date: 2007-10-03 22:07:46 +0000 (Wed, 03 Oct 2007)
New Revision: 25497

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25497

Log:
Fix swig build, handle NTSTATUS errors correctly in generated swig code for DCE/RPC interfaces.
Modified:
   branches/4.0-python/
   branches/4.0-python/.bzrignore
   branches/4.0-python/source/librpc/config.mk
   branches/4.0-python/source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm
   branches/4.0-python/source/scripting/swig/samba.i


Changeset:

Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/4.0-python/.bzrignore
===================================================================
--- branches/4.0-python/.bzrignore	2007-10-03 22:05:41 UTC (rev 25496)
+++ branches/4.0-python/.bzrignore	2007-10-03 22:07:46 UTC (rev 25497)
@@ -212,3 +212,5 @@
 source/lib/tdb/swig/tdb.py
 source/lib/tdb/swig/tdb_wrap.c
 source/scripting/python/talloc.h
+source/lib/ldb/swig/ldb_wrap.c
+source/scripting/swig/dcerpc.py

Modified: branches/4.0-python/source/librpc/config.mk
===================================================================
--- branches/4.0-python/source/librpc/config.mk	2007-10-03 22:05:41 UTC (rev 25496)
+++ branches/4.0-python/source/librpc/config.mk	2007-10-03 22:07:46 UTC (rev 25497)
@@ -583,3 +583,7 @@
 OBJ_FILES = gen_ndr/ndr_irpc_ejs.o
 SUBSYSTEM = smbcalls
 PRIVATE_DEPENDENCIES = dcerpc NDR_IRPC EJSRPC
+
+[PYTHON::swig_echo]
+SWIG_FILE = gen_ndr/echo.i
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG RPC_NDR_ECHO

Modified: branches/4.0-python/source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm
===================================================================
--- branches/4.0-python/source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm	2007-10-03 22:05:41 UTC (rev 25496)
+++ branches/4.0-python/source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm	2007-10-03 22:07:46 UTC (rev 25497)
@@ -149,11 +149,13 @@
 	pidl "#include \"$gen_header\"";
 	pidl "%}";
 	pidl "\%import \"samba.i\"";
+	pidl "\%include \"typemaps.i\"";
+	pidl "\%feature(\"autodoc\", 1);";
 	pidl "";
 	pidl "\%inline {";
-	pidl "void ntstatus_exception(NTSTATUS status)"; 
+	pidl "static void ntstatus_exception(NTSTATUS status)"; 
 	pidl "{";
-	pidl "\t/* FIXME */";
+	pidl "\tPyErr_SetString(PyExc_RuntimeError, nt_errstr(status));";
 	pidl "}";
 	pidl "}";
 	pidl "";

Modified: branches/4.0-python/source/scripting/swig/samba.i
===================================================================
--- branches/4.0-python/source/scripting/swig/samba.i	2007-10-03 22:05:41 UTC (rev 25496)
+++ branches/4.0-python/source/scripting/swig/samba.i	2007-10-03 22:07:46 UTC (rev 25497)
@@ -62,7 +62,6 @@
 
 %typemap(in) struct cli_credentials * {
 	$1 = cli_credentials_init(arg1);
-	cli_credentials_set_conf($1);
 	if ($input == Py_None) {
 		cli_credentials_set_anonymous($1);
 	} else {



More information about the samba-cvs mailing list