diff options
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/ndr/libndr.h | 6 | ||||
| -rw-r--r-- | librpc/ndr/ndr.c | 15 | ||||
| -rw-r--r-- | librpc/rpc/binding.c | 6 |
3 files changed, 14 insertions, 13 deletions
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 36adae91c0..dafce6451a 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -353,9 +353,9 @@ typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, cons #include "../libcli/util/error.h" #include "librpc/gen_ndr/misc.h" -extern const struct ndr_syntax_id ndr_transfer_syntax; -extern const struct ndr_syntax_id ndr64_transfer_syntax; -extern const struct ndr_syntax_id null_ndr_syntax_id; +extern const struct ndr_syntax_id ndr_transfer_syntax_ndr; +extern const struct ndr_syntax_id ndr_transfer_syntax_ndr64; +extern const struct ndr_syntax_id ndr_syntax_id_null; struct ndr_interface_call_pipe { const char *name; diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 7cb6e214ba..2279d1c1c3 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -1,20 +1,21 @@ -/* +/* Unix SMB/CIFS implementation. libndr interface Copyright (C) Andrew Tridgell 2003 - + Copyright (C) Jelmer Vernooij 2005-2008 + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -33,17 +34,17 @@ #define NDR_BASE_MARSHALL_SIZE 1024 /* this guid indicates NDR encoding in a protocol tower */ -const struct ndr_syntax_id ndr_transfer_syntax = { +const struct ndr_syntax_id ndr_transfer_syntax_ndr = { { 0x8a885d04, 0x1ceb, 0x11c9, {0x9f, 0xe8}, {0x08,0x00,0x2b,0x10,0x48,0x60} }, 2 }; -const struct ndr_syntax_id ndr64_transfer_syntax = { +const struct ndr_syntax_id ndr_transfer_syntax_ndr64 = { { 0x71710533, 0xbeba, 0x4937, {0x83, 0x19}, {0xb5,0xdb,0xef,0x9c,0xcc,0x36} }, 1 }; -const struct ndr_syntax_id null_ndr_syntax_id = { +const struct ndr_syntax_id ndr_syntax_id_null = { { 0, 0, 0, { 0, 0 }, { 0, 0, 0, 0, 0, 0 } }, 0 }; diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c index 381e3aedb5..f7fbbbc548 100644 --- a/librpc/rpc/binding.c +++ b/librpc/rpc/binding.c @@ -105,11 +105,11 @@ const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor) /* lhs is used: UUID */ char *uuidstr; - if (GUID_equal(&syntax.uuid, &ndr_transfer_syntax.uuid)) { + if (GUID_equal(&syntax.uuid, &ndr_transfer_syntax_ndr.uuid)) { return "NDR"; } - if (GUID_equal(&syntax.uuid, &ndr64_transfer_syntax.uuid)) { + if (GUID_equal(&syntax.uuid, &ndr_transfer_syntax_ndr64.uuid)) { return "NDR64"; } @@ -838,7 +838,7 @@ _PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx, tower->floors[1].lhs.protocol = EPM_PROTOCOL_UUID; tower->floors[1].lhs.lhs_data = dcerpc_floor_pack_lhs_data(tower->floors, - &ndr_transfer_syntax); + &ndr_transfer_syntax_ndr); tower->floors[1].rhs.uuid.unknown = data_blob_talloc_zero(tower->floors, 2); |