r3157: Add ncacn_http

diff --git a/source/librpc/rpc/dcerpc.h b/source/librpc/rpc/dcerpc.h
index 85f4da68206e42af46d340c89ad043c9de442f0c..1a4b2fa34eb7a324591d40898830ea8e9a6daf0d 100644 (file)
--- a/source/librpc/rpc/dcerpc.h
+++ b/source/librpc/rpc/dcerpc.h
@@ -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.

diff --git a/source/librpc/rpc/dcerpc_util.c b/source/librpc/rpc/dcerpc_util.c
index 9125f9e017259e97f63363f36ee1c65a87fc9ced..f13d969e89bf38fe4733e067dfdca64f91f859bc 100644 (file)
--- a/source/librpc/rpc/dcerpc_util.c
+++ b/source/librpc/rpc/dcerpc_util.c
@@ -245,6 +245,8 @@ static const struct {
                { 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, 

diff --git a/source/torture/local/binding_string.c b/source/torture/local/binding_string.c
index 5e346b4831dc8aace8498e4c03cea3b76a7fda82..289e8a3894bdda5c7a26c03d75328b2a85155fbd 100644 (file)
--- a/source/torture/local/binding_string.c
+++ b/source/torture/local/binding_string.c
@@ -98,6 +98,12 @@ static const char *test_strings[] = {
        "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]",