svn commit: samba r24533 - in branches/SAMBA_3_2/source: include
librpc/idl librpc/ndr
metze at samba.org
metze at samba.org
Sat Aug 18 08:18:40 GMT 2007
Author: metze
Date: 2007-08-18 08:18:38 +0000 (Sat, 18 Aug 2007)
New Revision: 24533
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24533
Log:
merge from SAMBA_4_0:
rename dcerpc_syntax_id -> ndr_syntax_id
metze
Modified:
branches/SAMBA_3_2/source/include/dcerpc.h
branches/SAMBA_3_2/source/librpc/idl/misc.idl
branches/SAMBA_3_2/source/librpc/ndr/libndr.h
branches/SAMBA_3_2/source/librpc/ndr/misc.h
branches/SAMBA_3_2/source/librpc/ndr/ndr.c
Changeset:
Modified: branches/SAMBA_3_2/source/include/dcerpc.h
===================================================================
--- branches/SAMBA_3_2/source/include/dcerpc.h 2007-08-18 06:57:49 UTC (rev 24532)
+++ branches/SAMBA_3_2/source/include/dcerpc.h 2007-08-18 08:18:38 UTC (rev 24533)
@@ -24,7 +24,7 @@
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;
Modified: branches/SAMBA_3_2/source/librpc/idl/misc.idl
===================================================================
--- branches/SAMBA_3_2/source/librpc/idl/misc.idl 2007-08-18 06:57:49 UTC (rev 24532)
+++ branches/SAMBA_3_2/source/librpc/idl/misc.idl 2007-08-18 08:18:38 UTC (rev 24533)
@@ -17,6 +17,11 @@
} GUID;
typedef [public] struct {
+ GUID uuid;
+ uint32 if_version;
+ } ndr_syntax_id;
+
+ typedef [public] struct {
uint32 handle_type;
GUID uuid;
} policy_handle;
Modified: branches/SAMBA_3_2/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/ndr/libndr.h 2007-08-18 06:57:49 UTC (rev 24532)
+++ branches/SAMBA_3_2/source/librpc/ndr/libndr.h 2007-08-18 08:18:38 UTC (rev 24533)
@@ -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 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"
Modified: branches/SAMBA_3_2/source/librpc/ndr/misc.h
===================================================================
--- branches/SAMBA_3_2/source/librpc/ndr/misc.h 2007-08-18 06:57:49 UTC (rev 24532)
+++ branches/SAMBA_3_2/source/librpc/ndr/misc.h 2007-08-18 08:18:38 UTC (rev 24533)
@@ -11,6 +11,11 @@
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;
Modified: branches/SAMBA_3_2/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_3_2/source/librpc/ndr/ndr.c 2007-08-18 06:57:49 UTC (rev 24532)
+++ branches/SAMBA_3_2/source/librpc/ndr/ndr.c 2007-08-18 08:18:38 UTC (rev 24533)
@@ -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
};
More information about the samba-cvs
mailing list