svn commit: samba r3157 - in branches/SAMBA_4_0/source: librpc/rpc torture/local

[jelmer at samba.org]

Author: jelmer
Date: 2004-10-24 13:22:58 +0000 (Sun, 24 Oct 2004)
New Revision: 3157

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3157&nolog=1

Log:
Add ncacn_http

Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/torture/local/binding_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2004-10-24 13:00:51 UTC (rev 3156)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2004-10-24 13:22:58 UTC (rev 3157)
@@ -22,7 +22,8 @@
 
 enum dcerpc_transport_t {
 	NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, 
-	NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, NCADG_UNIX_DGRAM };
+	NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, NCADG_UNIX_DGRAM,
+	NCACN_HTTP };
 
 /*
   this defines a generic security context for signed/sealed dcerpc pipes.

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2004-10-24 13:00:51 UTC (rev 3156)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2004-10-24 13:22:58 UTC (rev 3157)
@@ -245,6 +245,8 @@
 		{ EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NETBIOS }},
 	{ "ncacn_ip_tcp", NCACN_IP_TCP, 3, 
 		{ EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP, EPM_PROTOCOL_IP } }, 
+	{ "ncacn_http", NCACN_HTTP, 3, 
+		{ EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP, EPM_PROTOCOL_IP } }, 
 	{ "ncadg_ip_udp", NCACN_IP_UDP, 3, 
 		{ EPM_PROTOCOL_NCADG, EPM_PROTOCOL_UDP, EPM_PROTOCOL_IP } },
 	{ "ncalrpc", NCALRPC, 2, 

Modified: branches/SAMBA_4_0/source/torture/local/binding_string.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/binding_string.c	2004-10-24 13:00:51 UTC (rev 3156)
+++ branches/SAMBA_4_0/source/torture/local/binding_string.c	2004-10-24 13:22:58 UTC (rev 3157)
@@ -98,6 +98,12 @@
 	"ncacn_np:[rpcecho]",
 	"ncacn_np:127.0.0.1[rpcecho]",
 	"ncacn_ip_tcp:127.0.0.1",
+	"ncacn_ip_tcp:127.0.0.1[20]",
+	"ncacn_ip_tcp:127.0.0.1[20,sign]",
+	"ncacn_ip_tcp:127.0.0.1[20,Security=Foobar,sign]",
+	"ncacn_http:127.0.0.1",
+	"ncacn_http:127.0.0.1[78]",
+	"ncacn_http:127.0.0.1[78,ProxyServer=myproxy:3128]",
 	"ncacn_np:localhost[rpcecho]",
 	"ncacn_np:[/pipe/rpcecho]",
 	"ncacn_np:localhost[/pipe/rpcecho,sign,seal]",