dsdb/samdb: add resolve_oids module

[gd/samba/.git] / librpc / rpc / binding.c

diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index ba992399cdaf700509b37ce5d0d041077d9d2e58..d773b8b59134ee6692eb05f9722355059e7a3531 100644 (file)
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -45,7 +45,7 @@ static const struct {
        { "ncadg_ip_udp", NCACN_IP_UDP, 3, 
                { EPM_PROTOCOL_NCADG, EPM_PROTOCOL_UDP, EPM_PROTOCOL_IP } },
        { "ncalrpc", NCALRPC, 2, 
-               { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_PIPE } },
+               { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_NAMED_PIPE } },
        { "ncacn_unix_stream", NCACN_UNIX_STREAM, 2, 
                { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_UNIX_DS } },
        { "ncadg_unix_dgram", NCADG_UNIX_DGRAM, 2, 
@@ -84,7 +84,8 @@ static const struct {
        {"padcheck", DCERPC_DEBUG_PAD_CHECK},
        {"bigendian", DCERPC_PUSH_BIGENDIAN},
        {"smb2", DCERPC_SMB2},
-       {"hdrsign", DCERPC_HEADER_SIGNING}
+       {"hdrsign", DCERPC_HEADER_SIGNING},
+       {"ndr64", DCERPC_NDR64}
 };
 
 const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor)
@@ -130,8 +131,8 @@ const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor)
                case EPM_PROTOCOL_IP:
                        return talloc_asprintf(mem_ctx, "IP:%s", epm_floor->rhs.ip.ipaddr);
 
-               case EPM_PROTOCOL_PIPE:
-                       return talloc_asprintf(mem_ctx, "PIPE:%s", epm_floor->rhs.pipe.path);
+               case EPM_PROTOCOL_NAMED_PIPE:
+                       return talloc_asprintf(mem_ctx, "NAMED-PIPE:%s", epm_floor->rhs.named_pipe.path);
 
                case EPM_PROTOCOL_SMB:
                        return talloc_asprintf(mem_ctx, "SMB:%s", epm_floor->rhs.smb.unc);
@@ -440,9 +441,9 @@ const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *epm
                if (strlen(epm_floor->rhs.smb.unc) == 0) return NULL;
                return talloc_strdup(mem_ctx, epm_floor->rhs.smb.unc);
 
-       case EPM_PROTOCOL_PIPE:
-               if (strlen(epm_floor->rhs.pipe.path) == 0) return NULL;
-               return talloc_strdup(mem_ctx, epm_floor->rhs.pipe.path);
+       case EPM_PROTOCOL_NAMED_PIPE:
+               if (strlen(epm_floor->rhs.named_pipe.path) == 0) return NULL;
+               return talloc_strdup(mem_ctx, epm_floor->rhs.named_pipe.path);
 
        case EPM_PROTOCOL_NETBIOS:
                if (strlen(epm_floor->rhs.netbios.name) == 0) return NULL;
@@ -510,9 +511,9 @@ static NTSTATUS dcerpc_floor_set_rhs_data(TALLOC_CTX *mem_ctx,
                NT_STATUS_HAVE_NO_MEMORY(epm_floor->rhs.smb.unc);
                return NT_STATUS_OK;
 
-       case EPM_PROTOCOL_PIPE:
-               epm_floor->rhs.pipe.path = talloc_strdup(mem_ctx, data);
-               NT_STATUS_HAVE_NO_MEMORY(epm_floor->rhs.pipe.path);
+       case EPM_PROTOCOL_NAMED_PIPE:
+               epm_floor->rhs.named_pipe.path = talloc_strdup(mem_ctx, data);
+               NT_STATUS_HAVE_NO_MEMORY(epm_floor->rhs.named_pipe.path);
                return NT_STATUS_OK;
 
        case EPM_PROTOCOL_NETBIOS: