diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-10-24 13:22:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:02:27 -0500 |
| commit | 86cd076c0b23e9ba93ac8dc82d8466fea42fc05e (patch) | |
| tree | 3076a649daba81d9ce6a66bac847db78beb299cb | |
| parent | f1dd80e74e570fbf2e8dbefd70fb99abab1b5b2d (diff) | |
| download | samba-86cd076c0b23e9ba93ac8dc82d8466fea42fc05e.tar.gz samba-86cd076c0b23e9ba93ac8dc82d8466fea42fc05e.tar.bz2 samba-86cd076c0b23e9ba93ac8dc82d8466fea42fc05e.zip | |
r3157: Add ncacn_http
(This used to be commit a0c4138edf919ee0c4b236f201c09fc4deb2cc09)
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 3 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 2 | ||||
| -rw-r--r-- | source4/torture/local/binding_string.c | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 85f4da6820..1a4b2fa34e 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/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/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 9125f9e017..f13d969e89 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/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/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c index 5e346b4831..289e8a3894 100644 --- a/source4/torture/local/binding_string.c +++ b/source4/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]", |