summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-08-18 08:18:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:54 -0500
commit5da47f8518fa38e6db44b42b2fce7da89abb5721 (patch)
tree2150565f6e4d6495c808f99144b530641ef70f12
parentc56874d1129c6e5759acc5b125b5e8edd44a997c (diff)
downloadsamba-5da47f8518fa38e6db44b42b2fce7da89abb5721.tar.gz
samba-5da47f8518fa38e6db44b42b2fce7da89abb5721.tar.bz2
samba-5da47f8518fa38e6db44b42b2fce7da89abb5721.zip
r24533: merge from SAMBA_4_0:
rename dcerpc_syntax_id -> ndr_syntax_id metze (This used to be commit 7facd9bf3ffd0718bc9f9161274d18a0014f3744)
-rw-r--r--source3/include/dcerpc.h2
-rw-r--r--source3/librpc/idl/misc.idl5
-rw-r--r--source3/librpc/ndr/libndr.h9
-rw-r--r--source3/librpc/ndr/misc.h5
-rw-r--r--source3/librpc/ndr/ndr.c4
5 files changed, 15 insertions, 10 deletions
diff --git a/source3/include/dcerpc.h b/source3/include/dcerpc.h
index d765262894..a98971ddd4 100644
--- a/source3/include/dcerpc.h
+++ b/source3/include/dcerpc.h
@@ -24,7 +24,7 @@ struct dcerpc_authservice_list {
struct dcerpc_interface_table {
const char *name;
- struct dcerpc_syntax_id syntax_id;
+ struct ndr_syntax_id syntax_id;
const char *helpstring;
uint32_t num_calls;
const struct dcerpc_interface_call *calls;
diff --git a/source3/librpc/idl/misc.idl b/source3/librpc/idl/misc.idl
index 353457dd02..ae098d09ac 100644
--- a/source3/librpc/idl/misc.idl
+++ b/source3/librpc/idl/misc.idl
@@ -17,6 +17,11 @@ interface misc
} GUID;
typedef [public] struct {
+ GUID uuid;
+ uint32 if_version;
+ } ndr_syntax_id;
+
+ typedef [public] struct {
uint32 handle_type;
GUID uuid;
} policy_handle;
diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
index ead83a6347..fa9c1b02b6 100644
--- a/source3/librpc/ndr/libndr.h
+++ b/source3/librpc/ndr/libndr.h
@@ -25,11 +25,6 @@
#include "librpc/ndr/misc.h"
#include "librpc/ndr/security.h"
-struct dcerpc_syntax_id {
- struct GUID uuid;
- uint32_t if_version;
-}/* [public] */;
-
/*
this provides definitions for the libcli/rpc/ MSRPC library
*/
@@ -289,8 +284,8 @@ 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;
+extern const struct ndr_syntax_id ndr_transfer_syntax;
+extern const struct ndr_syntax_id ndr64_transfer_syntax;
#include "dcerpc.h"
diff --git a/source3/librpc/ndr/misc.h b/source3/librpc/ndr/misc.h
index d929379870..71975d7858 100644
--- a/source3/librpc/ndr/misc.h
+++ b/source3/librpc/ndr/misc.h
@@ -11,6 +11,11 @@ struct GUID {
uint8_t node[6];
}/* [noprint,gensize,public,noejs] */;
+struct ndr_syntax_id {
+ struct GUID uuid;
+ uint32_t if_version;
+}/* [public] */;
+
struct policy_handle {
uint32_t handle_type;
struct GUID uuid;
diff --git a/source3/librpc/ndr/ndr.c b/source3/librpc/ndr/ndr.c
index 7c3e980f2c..e2b660dc2c 100644
--- a/source3/librpc/ndr/ndr.c
+++ b/source3/librpc/ndr/ndr.c
@@ -31,12 +31,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
};