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

Andrew Bartlett
(This used to be commit 5e29e1c68c1b1a957419320cef55395ba0fe6b6f)

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 745a7652c21e921d1a53a493984ac2f8ba45cb52..5d40753448431b2a0292f5476fbdd095bce15c0e 100644 (file)
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -31,4 +31,13 @@ interface misc
                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;
+
+
 }

diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index fe41549327eb8b20e4da426a62f45a2e2d4aef39..e3c72480fcba1b04b5bfc06a02a5076251386a7c 100644 (file)
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -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 */

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 7f7b9c5caaba26c3fe8d4139306a8d101f68cb16..48fd1e69dd4ae249813f1d5d66d0c5e1a5235e78 100644 (file)
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -291,12 +291,7 @@ interface netlogon
        /*****************/
        /* 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;