svn commit: samba r1765 - trunk/source/include

[mimir at samba.org]

Author: mimir
Date: 2004-08-12 07:09:09 +0000 (Thu, 12 Aug 2004)
New Revision: 1765
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1765&nolog=1
Log:
Trust password flags have been spilt into two kinds of flags:
auth type for the trust (NT or ADS) and the machine's role (domain
member, trusted domain controller, etc.)


rafal


Modified:
   trunk/source/include/secrets.h

Changeset:
Modified: trunk/source/include/secrets.h
===================================================================
--- trunk/source/include/secrets.h	2004-08-12 07:05:50 UTC (rev 1764)
+++ trunk/source/include/secrets.h	2004-08-12 07:09:09 UTC (rev 1765)
@@ -49,13 +49,20 @@
 #define SECRETS_AUTH_DOMAIN      "SECRETS/AUTH_DOMAIN"
 #define SECRETS_AUTH_PASSWORD  "SECRETS/AUTH_PASSWORD"
 
-/* Trust password type flags */
-#define PASS_MACHINE_TRUST_NT       0x0001
-#define PASS_SERVER_TRUST_NT        0x0002
-#define PASS_DOMAIN_TRUST_NT        0x0004
-#define PASS_MACHINE_TRUST_ADS      0x0008
-#define PASS_DOMAIN_TRUST_ADS       0x0010
+/* Trust password flags */
+#define PASS_TRUST_NT               0x0001
+#define PASS_TRUST_ADS              0x0002
+#define PASS_TRUST_MACHINE          0x0004
+#define PASS_TRUST_SERVER           0x0008
+#define PASS_TRUST_DOMAIN           0x000c
 
+/* Trust password type varieties */
+#define PASS_MACHINE_TRUST_NT       (PASS_TRUST_NT  | PASS_TRUST_MACHINE)
+#define PASS_SERVER_TRUST_NT        (PASS_TRUST_NT  | PASS_TRUST_SERVER)
+#define PASS_DOMAIN_TRUST_NT        (PASS_TRUST_NT  | PASS_TRUST_DOMAIN)
+#define PASS_MACHINE_TRUST_ADS      (PASS_TRUST_ADS | PASS_TRUST_MACHINE)
+#define PASS_DOMAIN_TRUST_ADS       (PASS_TRUST_ADS | PASS_TRUST_DOMAIN)
+
 /* structure for storing machine account password
    (ie. when samba server is member of a domain */
 struct machine_acct_pass {