[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-273-g132efc7

Jelmer Vernooij jelmer at samba.org
Tue Apr 22 20:35:14 GMT 2008


The branch, v4-0-test has been updated
       via  132efc779ede27898765320a13bdde0b5256102b (commit)
       via  10a1a53d8beb56b7e12149c50e2685a1578413b9 (commit)
       via  1e38de45640430be002053b8bd52b615184134ba (commit)
       via  1304362b3754960f68fb56e0915c3d80cace6e60 (commit)
      from  47e8ef4f6aa91ed0b069a1890cb1f853b4e9b879 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 132efc779ede27898765320a13bdde0b5256102b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Apr 22 22:33:34 2008 +0200

    Fix event context initialization for Python bindings.

commit 10a1a53d8beb56b7e12149c50e2685a1578413b9
Merge: 1e38de45640430be002053b8bd52b615184134ba 47e8ef4f6aa91ed0b069a1890cb1f853b4e9b879
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Apr 22 22:19:46 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

commit 1e38de45640430be002053b8bd52b615184134ba
Merge: 1304362b3754960f68fb56e0915c3d80cace6e60 b7c96e0cc270bd3b1c9bd117a22df3f657b6acd5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Apr 22 10:21:22 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

commit 1304362b3754960f68fb56e0915c3d80cace6e60
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Apr 22 01:34:11 2008 +0200

    Add port number for ncacn_http epmapper.

-----------------------------------------------------------------------

Summary of changes:
 source/librpc/idl/epmapper.idl              |    2 +-
 source/pidl/lib/Parse/Pidl/Samba4/Python.pm |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/librpc/idl/epmapper.idl b/source/librpc/idl/epmapper.idl
index ea04878..89cea57 100644
--- a/source/librpc/idl/epmapper.idl
+++ b/source/librpc/idl/epmapper.idl
@@ -15,7 +15,7 @@ import "misc.idl";
  uuid("e1af8308-5d1f-11c9-91a4-08002b14a0fa"), 
  version(3.0), 
  endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
-		  "ncalrpc:[EPMAPPER]"),
+		  "ncalrpc:[EPMAPPER]", "ncacn_http:[593]"),
  helpstring("EndPoint Mapper"),
  pointer_default(ptr)
 ]
diff --git a/source/pidl/lib/Parse/Pidl/Samba4/Python.pm b/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
index e344589..884ee1d 100644
--- a/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -599,6 +599,7 @@ sub Interface($$$)
 		$self->pidl("struct loadparm_context *lp_ctx = NULL;");
 		$self->pidl("PyObject *py_lp_ctx = Py_None, *py_credentials = Py_None;");
 		$self->pidl("TALLOC_CTX *mem_ctx = NULL;");
+		$self->pidl("struct event_context *event_ctx;");
 		$self->pidl("NTSTATUS status;");
 		$self->pidl("");
 		$self->pidl("const char *kwnames[] = {");
@@ -634,9 +635,11 @@ sub Interface($$$)
 
 		$self->pidl("ret = PyObject_New($interface->{NAME}_InterfaceObject, &$interface->{NAME}_InterfaceType);");
 		$self->pidl("");
+		$self->pidl("event_ctx = event_context_init(mem_ctx);");
+		$self->pidl("");
 
 		$self->pidl("status = dcerpc_pipe_connect(NULL, &ret->pipe, binding_string, ");
-		$self->pidl("             &ndr_table_$interface->{NAME}, credentials, NULL, lp_ctx);");
+		$self->pidl("             &ndr_table_$interface->{NAME}, credentials, event_ctx, lp_ctx);");
 		$self->handle_ntstatus("status", "NULL", "mem_ctx");
 
 		$self->pidl("ret->pipe->conn->flags |= DCERPC_NDR_REF_ALLOC;");
@@ -1020,6 +1023,7 @@ sub Parse($$$$$)
 #include \"librpc/rpc/dcerpc.h\"
 #include \"scripting/python/pytalloc.h\"
 #include \"scripting/python/pyrpc.h\"
+#include \"lib/events/events.h\"
 #include \"$hdr\"
 #include \"$ndr_hdr\"
 #include \"$py_hdr\"


-- 
Samba Shared Repository


More information about the samba-cvs mailing list