Merge branch 'master' of ssh://git.samba.org/data/git/samba

[ira/wip.git] / source4 / librpc / idl / misc.idl

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 45f4e256020f7b94978edea15fdcdc93fdd020e7..791b86466ce7f1482f7d4701cda285d0c257a185 100644 (file)
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   miscellaneous IDL structures
 */
@@ -10,7 +8,7 @@
 ]
 interface misc
 {
-       typedef [public,noprint,gensize] struct {
+       typedef [public,noprint,gensize,noejs] struct {
                uint32 time_low;
                uint16 time_mid;
                uint16 time_hi_and_version;
@@ -18,6 +16,11 @@ interface misc
                uint8  node[6];
        } GUID;
 
+       typedef [public] struct {
+               GUID uuid;
+               uint32 if_version;
+       } ndr_syntax_id;
+
        typedef [public] struct {
                uint32 handle_type;
                GUID   uuid;
@@ -27,8 +30,31 @@ interface misc
        /* Only SEC_CHAN_WKSTA can forward requests to other domains. */
 
        typedef [public] enum {
-               SEC_CHAN_WKSTA   = 2,
-               SEC_CHAN_DOMAIN  = 4,
-               SEC_CHAN_BDC     = 6
+               SEC_CHAN_NULL        = 0,
+               SEC_CHAN_WKSTA       = 2,
+               SEC_CHAN_DNS_DOMAIN  = 3,
+               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;
+
+       typedef [public,v1_enum] enum {
+               SAMR_REJECT_OTHER      = 0,
+               SAMR_REJECT_TOO_SHORT  = 1,
+               SAMR_REJECT_IN_HISTORY = 2,
+               SAMR_REJECT_COMPLEXITY = 5
+       } samr_RejectReason;
+
+       /* id used to identify a endpoint, possibly in a cluster */
+       typedef [public] struct {
+               hyper id;
+               uint32 id2;
+               uint32 node;
+       } server_id;
 }