svn commit: samba r8855 - in branches/SAMBA_4_0/source/librpc/idl: .

abartlet at samba.org abartlet at samba.org
Sat Jul 30 00:14:49 GMT 2005


Author: abartlet
Date: 2005-07-30 00:14:48 +0000 (Sat, 30 Jul 2005)
New Revision: 8855

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8855

Log:
Share this enum (describing the SamSync databases) between nbt and netlogon.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/librpc/idl/misc.idl
   branches/SAMBA_4_0/source/librpc/idl/nbt.idl
   branches/SAMBA_4_0/source/librpc/idl/netlogon.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/misc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/misc.idl	2005-07-29 23:39:11 UTC (rev 8854)
+++ branches/SAMBA_4_0/source/librpc/idl/misc.idl	2005-07-30 00:14:48 UTC (rev 8855)
@@ -31,4 +31,13 @@
 		SEC_CHAN_DOMAIN  = 4,
 		SEC_CHAN_BDC     = 6
 	} netr_SchannelType;
+
+	/* SAM database types */
+	typedef [public,v1_enum] enum {
+		SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
+		SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
+		SAM_DATABASE_PRIVS   = 2 /* Privileges */
+	} netr_SamDatabaseID;
+
+
 }

Modified: branches/SAMBA_4_0/source/librpc/idl/nbt.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/nbt.idl	2005-07-29 23:39:11 UTC (rev 8854)
+++ branches/SAMBA_4_0/source/librpc/idl/nbt.idl	2005-07-30 00:14:48 UTC (rev 8855)
@@ -405,11 +405,13 @@
 		uint16               lm20_token;
 	} nbt_netlogon_response_from_pdc2;
 
+	declare enum netr_SamDatabaseID;
+
 	/* announce change to UAS or SAM */
 	typedef struct {
-		uint32           db_index;
-		hyper            serial;
-		NTTIME           timestamp;
+		netr_SamDatabaseID   db_index;
+		hyper                serial;
+		NTTIME               timestamp;
 	} nbt_db_change;
 
 	/* used to announce SAM changes */

Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl	2005-07-29 23:39:11 UTC (rev 8854)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl	2005-07-30 00:14:48 UTC (rev 8855)
@@ -291,12 +291,7 @@
 	/*****************/
 	/* Function 0x07 */
 
-	/* SAM database types */
-	typedef [v1_enum] enum {
-		SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
-		SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
-		SAM_DATABASE_PRIVS   = 2 /* Privileges */
-	} netr_SamDatabaseID;
+	declare enum netr_SamDatabaseID;
 
 	typedef struct {
 		unistr *account_name;



More information about the samba-cvs mailing list