[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / include / rpc_netlogon.h

diff --git a/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index acd3322784301d9b001cf6c4451af57f31043d1a..a82b977a5bbadfd8014a52eebf15307b7f303e4e 100644 (file)
--- a/source/include/rpc_netlogon.h
+++ b/source/include/rpc_netlogon.h
@@ -45,6 +45,11 @@
 #define NET_DSR_GETDCNAMEEX2   0x22
 #define NET_SAMLOGON_EX                0x27
 
+/* Secure Channel types.  used in NetrServerAuthenticate negotiation */
+#define SEC_CHAN_WKSTA   2
+#define SEC_CHAN_DOMAIN  4
+#define SEC_CHAN_BDC     6
+
 /* Returned delta types */
 #define SAM_DELTA_DOMAIN_INFO    0x01
 #define SAM_DELTA_GROUP_INFO     0x02
@@ -63,6 +68,11 @@
 #define SAM_DELTA_DELETE_USER    0x15
 #define SAM_DELTA_MODIFIED_COUNT 0x16
 
+/* SAM database types */
+#define SAM_DATABASE_DOMAIN    0x00 /* Domain users and groups */
+#define SAM_DATABASE_BUILTIN   0x01 /* BUILTIN users and groups */
+#define SAM_DATABASE_PRIVS     0x02 /* Privileges */
+
 /* flags use when sending a NETLOGON_CONTROL request */
 
 #define NETLOGON_CONTROL_SYNC                  0x2
@@ -98,7 +108,7 @@
 #define SE_GROUP_OWNER                         0x00000008
 #define SE_GROUP_USE_FOR_DENY_ONLY     0x00000010
 #define SE_GROUP_LOGON_ID              0xC0000000
-#define SE_GROUP_RESOURCE              0x20000000
+#define SE_GROUP_RESOURCE              0x20000000      /* Domain Local Group */
 
 /* Flags for controlling the behaviour of a particular logon */
 
@@ -1147,7 +1157,7 @@ typedef struct net_q_dsr_getdcnameex {
 } NET_Q_DSR_GETDCNAMEEX;
 
 /* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX;
+typedef struct net_r_dsr_getdcnameex NET_R_DSR_GETDCNAMEEX;
 
 /* NET_Q_DSR_GETDCNAMEEX2 */
 typedef struct net_q_dsr_getdcnameex2 {
@@ -1165,8 +1175,8 @@ typedef struct net_q_dsr_getdcnameex2 {
        uint32 flags;
 } NET_Q_DSR_GETDCNAMEEX2;
 
-/* NET_R_DSR_GETDCNAMEEX */
-typedef struct NET_R_DSR_GETDCNAME NET_R_DSR_GETDCNAMEEX2;
+/* NET_R_DSR_GETDCNAMEEX2 */
+typedef struct net_r_dsr_getdcnameex2 NET_R_DSR_GETDCNAMEEX2;
 
 /* NET_Q_DSR_GESITENAME */
 typedef struct net_q_dsr_getsitename {