diff options
author | Alexander Bokovoy <ab@samba.org> | 2009-08-08 08:07:24 +0300 |
---|---|---|
committer | Alexander Bokovoy <ab@samba.org> | 2009-08-08 08:07:24 +0300 |
commit | 8eac1896299d820fec0fd92b2b8b6a058ae39642 (patch) | |
tree | f97b0a2c21eb4f91aa51cb2af4381287c3525727 /librpc | |
parent | 217e3086c74eb0b46fab512b5887d9a5a5b7ee9a (diff) | |
parent | d296c774c5981baa863c697782dba1b6280d632e (diff) | |
download | samba-8eac1896299d820fec0fd92b2b8b6a058ae39642.tar.gz samba-8eac1896299d820fec0fd92b2b8b6a058ae39642.tar.bz2 samba-8eac1896299d820fec0fd92b2b8b6a058ae39642.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'librpc')
-rw-r--r-- | librpc/gen_ndr/epmapper.h | 8 | ||||
-rw-r--r-- | librpc/gen_ndr/ndr_epmapper.c | 26 | ||||
-rw-r--r-- | librpc/gen_ndr/ndr_epmapper.h | 2 | ||||
-rw-r--r-- | librpc/idl/epmapper.idl | 8 | ||||
-rw-r--r-- | librpc/rpc/binding.c | 18 |
5 files changed, 31 insertions, 31 deletions
diff --git a/librpc/gen_ndr/epmapper.h b/librpc/gen_ndr/epmapper.h index ff80fbb4fd..2030e1e54f 100644 --- a/librpc/gen_ndr/epmapper.h +++ b/librpc/gen_ndr/epmapper.h @@ -26,7 +26,7 @@ enum epm_protocol EPM_PROTOCOL_UUID=0x0d, EPM_PROTOCOL_IPX=0x0e, EPM_PROTOCOL_SMB=0x0f, - EPM_PROTOCOL_PIPE=0x10, + EPM_PROTOCOL_NAMED_PIPE=0x10, EPM_PROTOCOL_NETBIOS=0x11, EPM_PROTOCOL_NETBEUI=0x12, EPM_PROTOCOL_SPX=0x13, @@ -55,7 +55,7 @@ enum epm_protocol #define EPM_PROTOCOL_UUID ( 0x0d ) #define EPM_PROTOCOL_IPX ( 0x0e ) #define EPM_PROTOCOL_SMB ( 0x0f ) -#define EPM_PROTOCOL_PIPE ( 0x10 ) +#define EPM_PROTOCOL_NAMED_PIPE ( 0x10 ) #define EPM_PROTOCOL_NETBIOS ( 0x11 ) #define EPM_PROTOCOL_NETBEUI ( 0x12 ) #define EPM_PROTOCOL_SPX ( 0x13 ) @@ -116,7 +116,7 @@ struct epm_rhs_smb { const char * unc;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ }; -struct epm_rhs_pipe { +struct epm_rhs_named_pipe { const char * path;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ }; @@ -189,7 +189,7 @@ union epm_rhs { struct epm_rhs_uuid uuid;/* [case(EPM_PROTOCOL_UUID)] */ struct epm_rhs_ipx ipx;/* [case(EPM_PROTOCOL_IPX)] */ struct epm_rhs_smb smb;/* [case(EPM_PROTOCOL_SMB)] */ - struct epm_rhs_pipe pipe;/* [case(EPM_PROTOCOL_PIPE)] */ + struct epm_rhs_named_pipe named_pipe;/* [case(EPM_PROTOCOL_NAMED_PIPE)] */ struct epm_rhs_netbios netbios;/* [case(EPM_PROTOCOL_NETBIOS)] */ struct epm_rhs_netbeui netbeui;/* [case(EPM_PROTOCOL_NETBEUI)] */ struct epm_rhs_spx spx;/* [case(EPM_PROTOCOL_SPX)] */ diff --git a/librpc/gen_ndr/ndr_epmapper.c b/librpc/gen_ndr/ndr_epmapper.c index e39356fbc4..7bcd8ddc13 100644 --- a/librpc/gen_ndr/ndr_epmapper.c +++ b/librpc/gen_ndr/ndr_epmapper.c @@ -35,7 +35,7 @@ _PUBLIC_ void ndr_print_epm_protocol(struct ndr_print *ndr, const char *name, en case EPM_PROTOCOL_UUID: val = "EPM_PROTOCOL_UUID"; break; case EPM_PROTOCOL_IPX: val = "EPM_PROTOCOL_IPX"; break; case EPM_PROTOCOL_SMB: val = "EPM_PROTOCOL_SMB"; break; - case EPM_PROTOCOL_PIPE: val = "EPM_PROTOCOL_PIPE"; break; + case EPM_PROTOCOL_NAMED_PIPE: val = "EPM_PROTOCOL_NAMED_PIPE"; break; case EPM_PROTOCOL_NETBIOS: val = "EPM_PROTOCOL_NETBIOS"; break; case EPM_PROTOCOL_NETBEUI: val = "EPM_PROTOCOL_NETBEUI"; break; case EPM_PROTOCOL_SPX: val = "EPM_PROTOCOL_SPX"; break; @@ -391,7 +391,7 @@ _PUBLIC_ void ndr_print_epm_rhs_smb(struct ndr_print *ndr, const char *name, con ndr->depth--; } -static enum ndr_err_code ndr_push_epm_rhs_pipe(struct ndr_push *ndr, int ndr_flags, const struct epm_rhs_pipe *r) +static enum ndr_err_code ndr_push_epm_rhs_named_pipe(struct ndr_push *ndr, int ndr_flags, const struct epm_rhs_named_pipe *r) { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); @@ -407,7 +407,7 @@ static enum ndr_err_code ndr_push_epm_rhs_pipe(struct ndr_push *ndr, int ndr_fla return NDR_ERR_SUCCESS; } -static enum ndr_err_code ndr_pull_epm_rhs_pipe(struct ndr_pull *ndr, int ndr_flags, struct epm_rhs_pipe *r) +static enum ndr_err_code ndr_pull_epm_rhs_named_pipe(struct ndr_pull *ndr, int ndr_flags, struct epm_rhs_named_pipe *r) { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); @@ -423,9 +423,9 @@ static enum ndr_err_code ndr_pull_epm_rhs_pipe(struct ndr_pull *ndr, int ndr_fla return NDR_ERR_SUCCESS; } -_PUBLIC_ void ndr_print_epm_rhs_pipe(struct ndr_print *ndr, const char *name, const struct epm_rhs_pipe *r) +_PUBLIC_ void ndr_print_epm_rhs_named_pipe(struct ndr_print *ndr, const char *name, const struct epm_rhs_named_pipe *r) { - ndr_print_struct(ndr, name, "epm_rhs_pipe"); + ndr_print_struct(ndr, name, "epm_rhs_named_pipe"); ndr->depth++; ndr_print_string(ndr, "path", r->path); ndr->depth--; @@ -916,8 +916,8 @@ static enum ndr_err_code ndr_push_epm_rhs(struct ndr_push *ndr, int ndr_flags, c NDR_CHECK(ndr_push_epm_rhs_smb(ndr, NDR_SCALARS, &r->smb)); break; } - case EPM_PROTOCOL_PIPE: { - NDR_CHECK(ndr_push_epm_rhs_pipe(ndr, NDR_SCALARS, &r->pipe)); + case EPM_PROTOCOL_NAMED_PIPE: { + NDR_CHECK(ndr_push_epm_rhs_named_pipe(ndr, NDR_SCALARS, &r->named_pipe)); break; } case EPM_PROTOCOL_NETBIOS: { @@ -1022,7 +1022,7 @@ static enum ndr_err_code ndr_push_epm_rhs(struct ndr_push *ndr, int ndr_flags, c case EPM_PROTOCOL_SMB: break; - case EPM_PROTOCOL_PIPE: + case EPM_PROTOCOL_NAMED_PIPE: break; case EPM_PROTOCOL_NETBIOS: @@ -1131,8 +1131,8 @@ static enum ndr_err_code ndr_pull_epm_rhs(struct ndr_pull *ndr, int ndr_flags, u NDR_CHECK(ndr_pull_epm_rhs_smb(ndr, NDR_SCALARS, &r->smb)); break; } - case EPM_PROTOCOL_PIPE: { - NDR_CHECK(ndr_pull_epm_rhs_pipe(ndr, NDR_SCALARS, &r->pipe)); + case EPM_PROTOCOL_NAMED_PIPE: { + NDR_CHECK(ndr_pull_epm_rhs_named_pipe(ndr, NDR_SCALARS, &r->named_pipe)); break; } case EPM_PROTOCOL_NETBIOS: { @@ -1236,7 +1236,7 @@ static enum ndr_err_code ndr_pull_epm_rhs(struct ndr_pull *ndr, int ndr_flags, u case EPM_PROTOCOL_SMB: break; - case EPM_PROTOCOL_PIPE: + case EPM_PROTOCOL_NAMED_PIPE: break; case EPM_PROTOCOL_NETBIOS: @@ -1345,8 +1345,8 @@ _PUBLIC_ void ndr_print_epm_rhs(struct ndr_print *ndr, const char *name, const u ndr_print_epm_rhs_smb(ndr, "smb", &r->smb); break; - case EPM_PROTOCOL_PIPE: - ndr_print_epm_rhs_pipe(ndr, "pipe", &r->pipe); + case EPM_PROTOCOL_NAMED_PIPE: + ndr_print_epm_rhs_named_pipe(ndr, "named_pipe", &r->named_pipe); break; case EPM_PROTOCOL_NETBIOS: diff --git a/librpc/gen_ndr/ndr_epmapper.h b/librpc/gen_ndr/ndr_epmapper.h index 797c68d93e..8053d07838 100644 --- a/librpc/gen_ndr/ndr_epmapper.h +++ b/librpc/gen_ndr/ndr_epmapper.h @@ -40,7 +40,7 @@ void ndr_print_epm_rhs_ncacn(struct ndr_print *ndr, const char *name, const stru void ndr_print_epm_rhs_uuid(struct ndr_print *ndr, const char *name, const struct epm_rhs_uuid *r); void ndr_print_epm_rhs_ipx(struct ndr_print *ndr, const char *name, const struct epm_rhs_ipx *r); void ndr_print_epm_rhs_smb(struct ndr_print *ndr, const char *name, const struct epm_rhs_smb *r); -void ndr_print_epm_rhs_pipe(struct ndr_print *ndr, const char *name, const struct epm_rhs_pipe *r); +void ndr_print_epm_rhs_named_pipe(struct ndr_print *ndr, const char *name, const struct epm_rhs_named_pipe *r); void ndr_print_epm_rhs_netbios(struct ndr_print *ndr, const char *name, const struct epm_rhs_netbios *r); void ndr_print_epm_rhs_netbeui(struct ndr_print *ndr, const char *name, const struct epm_rhs_netbeui *r); void ndr_print_epm_rhs_spx(struct ndr_print *ndr, const char *name, const struct epm_rhs_spx *r); diff --git a/librpc/idl/epmapper.idl b/librpc/idl/epmapper.idl index 0a110a1780..3d9113892b 100644 --- a/librpc/idl/epmapper.idl +++ b/librpc/idl/epmapper.idl @@ -52,7 +52,7 @@ interface epmapper EPM_PROTOCOL_UUID = 0x0d, EPM_PROTOCOL_IPX = 0x0e, EPM_PROTOCOL_SMB = 0x0f, - EPM_PROTOCOL_PIPE = 0x10, + EPM_PROTOCOL_NAMED_PIPE = 0x10, EPM_PROTOCOL_NETBIOS = 0x11, EPM_PROTOCOL_NETBEUI = 0x12, EPM_PROTOCOL_SPX = 0x13, @@ -113,8 +113,8 @@ interface epmapper } epm_rhs_smb; typedef struct { - astring path; - } epm_rhs_pipe; + astring path; + } epm_rhs_named_pipe; typedef struct { astring name; @@ -178,7 +178,7 @@ interface epmapper [case(EPM_PROTOCOL_UUID)] epm_rhs_uuid uuid; [case(EPM_PROTOCOL_IPX)] epm_rhs_ipx ipx; [case(EPM_PROTOCOL_SMB)] epm_rhs_smb smb; - [case(EPM_PROTOCOL_PIPE)] epm_rhs_pipe pipe; + [case(EPM_PROTOCOL_NAMED_PIPE)] epm_rhs_named_pipe named_pipe; [case(EPM_PROTOCOL_NETBIOS)] epm_rhs_netbios netbios; [case(EPM_PROTOCOL_NETBEUI)] epm_rhs_netbeui netbeui; [case(EPM_PROTOCOL_SPX)] epm_rhs_spx spx; diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c index ba992399cd..652927b2c5 100644 --- 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, @@ -130,8 +130,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 +440,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 +510,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: |