svn commit: samba r10611 - in branches/tmp/samba4-winsrepl: .
source/librpc/idl
metze at samba.org
metze at samba.org
Thu Sep 29 14:03:19 GMT 2005
Author: metze
Date: 2005-09-29 14:03:18 +0000 (Thu, 29 Sep 2005)
New Revision: 10611
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10611
Log:
r13079 at SERNOX (orig r10610): metze | 2005-09-29 16:02:57 +0200
forgot one file in the last commit:
make wrepl_nbt_name a scalar type that is another
wire representation of struct nbt_name
give wrepl_name->flags a meaning
metze
Modified:
branches/tmp/samba4-winsrepl/
branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl
Changeset:
Property changes on: branches/tmp/samba4-winsrepl
___________________________________________________________________
Name: svk:merge
- 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10608
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10610
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
Modified: branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl
===================================================================
--- branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl 2005-09-29 14:02:57 UTC (rev 10610)
+++ branches/tmp/samba4-winsrepl/source/librpc/idl/winsrepl.idl 2005-09-29 14:03:18 UTC (rev 10611)
@@ -13,7 +13,8 @@
uuid("0-1-2-3-4"),
version(0.0),
pointer_default(unique),
- pointer_default_top(unique)
+ pointer_default_top(unique),
+ depends(nbt)
]
interface wrepl
{
@@ -34,11 +35,42 @@
[case(2)] wrepl_address_list addresses;
} wrepl_addresses;
+ typedef [enum8bit] enum {
+ WREPL_TYPE_UNIQUE = 0x0,
+ WREPL_TYPE_GROUP = 0x1,
+ WREPL_TYPE_SGROUP = 0x2,
+ WREPL_TYPE_MHOMED = 0x3
+ } wrepl_name_type;
+
+ typedef [enum8bit] enum {
+ WREPL_STATE_ACTIVE = 0x0,
+ WREPL_STATE_RELEASED = 0x1,
+ WREPL_STATE_TOMBSTONE = 0x2,
+ WREPL_STATE_RESERVED = 0x3
+ } wrepl_name_state;
+
+ typedef [bitmap32bit] bitmap {
+ WREPL_FLAGS_RECORD_TYPE = 0x00000003,
+ WREPL_FLAGS_RECORD_STATE = 0x0000000C,
+ WREPL_FLAGS_0x00000010 = 0x00000010,
+ WREPL_FLAGS_NODE_TYPE = 0x00000060,
+ WREPL_FLAGS_IS_STATIC = 0x00000080
+ } wrepl_flags;
+
+ typedef [v1_enum] enum {
+ WREPL_GROUP_FLAG_NO_GROUP = 0x00000000,
+ WREPL_GROUP_FLAG_IS_GROUP = 0x00000001
+ } wrepl_group_flag;
+
+#define WREPL_IS_GROUP(flags) (\
+ ((((flags) & WREPL_FLAGS_RECORD_TYPE) == WREPL_TYPE_GROUP)|| \
+ (((flags) & WREPL_FLAGS_RECORD_TYPE) == WREPL_TYPE_SGROUP))\
+ ? WREPL_GROUP_FLAG_IS_GROUP : WREPL_GROUP_FLAG_NO_GROUP)
+
typedef struct {
- uint32 name_len;
- uint8 name[name_len];
- uint32 flags;
- [flag(NDR_LITTLE_ENDIAN)] uint32 group_flag;
+ wrepl_nbt_name name;
+ wrepl_flags flags;
+ [flag(NDR_LITTLE_ENDIAN),value(WREPL_IS_GROUP(flags))] wrepl_group_flag is_group;
udlongr id;
[switch_is(flags & 2)] wrepl_addresses addresses;
ipv4address unknown;
More information about the samba-cvs
mailing list