Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / source3 / autoconf / librpc / gen_ndr / netlogon.h

diff --git a/source3/librpc/gen_ndr/netlogon.h b/source3/autoconf/librpc/gen_ndr/netlogon.h
similarity index 99%
rename from source3/librpc/gen_ndr/netlogon.h
rename to source3/autoconf/librpc/gen_ndr/netlogon.h
index 8617c9b5ab0e8ee7f9ffbc9243bbb56ce7545991..6e4716cd3017766305219341239eb960cec9c7c9 100644 (file)
--- a/source3/librpc/gen_ndr/netlogon.h
+++ b/source3/autoconf/librpc/gen_ndr/netlogon.h
@@ -159,9 +159,9 @@ struct netr_LMSessionKey {
 #define NETLOGON_GRACE_LOGON ( 0x01000000 )
 
 struct netr_SamBaseInfo {
-       NTTIME last_logon;
-       NTTIME last_logoff;
-       NTTIME acct_expiry;
+       NTTIME logon_time;
+       NTTIME logoff_time;
+       NTTIME kickoff_time;
        NTTIME last_password_change;
        NTTIME allow_password_change;
        NTTIME force_password_change;
@@ -179,11 +179,15 @@ struct netr_SamBaseInfo {
        uint32_t user_flags;
        struct netr_UserSessionKey key;
        struct lsa_StringLarge logon_server;
-       struct lsa_StringLarge domain;
+       struct lsa_StringLarge logon_domain;
        struct dom_sid2 *domain_sid;/* [unique] */
        struct netr_LMSessionKey LMSessKey;
        uint32_t acct_flags;
-       uint32_t unknown[7];
+       uint32_t sub_auth_status;
+       NTTIME last_successful_logon;
+       NTTIME last_failed_logon;
+       uint32_t failed_logon_count;
+       uint32_t reserved;
 };
 
 struct netr_SamInfo2 {
@@ -853,6 +857,7 @@ enum netr_DsRGetDCNameInfo_AddressType
 #define DS_SERVER_NDNC ( 0x00000400 )
 #define DS_SERVER_SELECT_SECRET_DOMAIN_6 ( 0x00000800 )
 #define DS_SERVER_FULL_SECRET_DOMAIN_6 ( 0x00001000 )
+#define DS_SERVER_WEBSERV ( 0x00002000 )
 #define DS_DNS_CONTROLLER ( 0x20000000 )
 #define DS_DNS_DOMAIN ( 0x40000000 )
 #define DS_DNS_FOREST_ROOT ( 0x80000000 )