diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-08-18 06:57:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:11 -0500 |
| commit | ce84ab9a83441845202e99f8ffd4512839926024 (patch) | |
| tree | f77e855f39947f4078d6ab160d212db0758aba08 /source4/librpc/ndr | |
| parent | fb19fe7a512db0da16b9dfe226f51d99b86df0a6 (diff) | |
| download | samba-ce84ab9a83441845202e99f8ffd4512839926024.tar.gz samba-ce84ab9a83441845202e99f8ffd4512839926024.tar.bz2 samba-ce84ab9a83441845202e99f8ffd4512839926024.zip | |
r24532: rename struct dcerpc_syntax_id into struct ndr_syntax_id
and move it into misc.idl
The goal is to get rid a all dcerpc specific stuff in the
generated ndr layer.
metze
(This used to be commit 2ed014cfb894cccab1654e3f7d5876393e2b52d7)
Diffstat (limited to 'source4/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 6 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 3f46788c0d..93da5b02d5 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -284,12 +284,12 @@ typedef NTSTATUS (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flags, void * typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *); typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, const void *); -extern const struct dcerpc_syntax_id ndr_transfer_syntax; -extern const struct dcerpc_syntax_id ndr64_transfer_syntax; - #include "librpc/gen_ndr/misc.h" #include "librpc/ndr/libndr_proto.h" +extern const struct ndr_syntax_id ndr_transfer_syntax; +extern const struct ndr_syntax_id ndr64_transfer_syntax; + /* FIXME: Use represent_as instead */ struct dom_sid; NTSTATUS ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid); diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 5db5e5d1e3..9fb39beff3 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -34,12 +34,12 @@ #define NDR_BASE_MARSHALL_SIZE 1024 /* this guid indicates NDR encoding in a protocol tower */ -const struct dcerpc_syntax_id ndr_transfer_syntax = { +const struct ndr_syntax_id ndr_transfer_syntax = { { 0x8a885d04, 0x1ceb, 0x11c9, {0x9f, 0xe8}, {0x08,0x00,0x2b,0x10,0x48,0x60} }, 2 }; -const struct dcerpc_syntax_id ndr64_transfer_syntax = { +const struct ndr_syntax_id ndr64_transfer_syntax = { { 0x71710533, 0xbeba, 0x4937, {0x83, 0x19}, {0xb5,0xdb,0xef,0x9c,0xcc,0x36} }, 1 }; |