r14054: merge from samba3, fillout more userAccountControl bits.

Guenther
(This used to be commit 98207368044505c05b8d3f0538c19536488e229d)

diff --git a/source4/include/ads.h b/source4/include/ads.h
index 46377fecd099e680a05bb823cb3d105a8731ac26..cb6570c0e859469bfba959086f147dd319f81604 100644 (file)
--- a/source4/include/ads.h
+++ b/source4/include/ads.h
@@ -77,9 +77,9 @@
 #define UF_NOT_DELEGATED                       0x00100000
 #define UF_USE_DES_KEY_ONLY                    0x00200000
 #define UF_DONT_REQUIRE_PREAUTH                        0x00400000
-#define UF_UNUSED_5                            0x00800000
+#define UF_PASSWORD_EXPIRED                    0x00800000
 
-#define UF_UNUSED_6                            0x01000000
+#define UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION 0x01000000
 #define UF_NO_AUTH_DATA_REQUIRED                0x02000000
 #define UF_UNUSED_8                            0x04000000
 #define UF_UNUSED_9                            0x08000000