Moved definition of winbind username/password secrets into secrets.h

(This used to be commit b618b5943d53f33e6f03d8d47cf87efc5e1ad3e5)

diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index db0e13bacdbde57bb340c52c662b0c8545e1d5ca..69ab4f6c8dc35e05a2b27ef08d919919c784158f 100644 (file)
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -30,10 +30,17 @@
 /* this one is for storing trusted domain account password */
 #define SECRETS_DOMTRUST_ACCT_PASS "SECRETS/$DOMTRUST.ACC"
 
-
+/* The domain sid and our sid are stored here even though they aren't
+   really secret. */
 #define SECRETS_DOMAIN_SID    "SECRETS/SID"
 #define SECRETS_SAM_SID       "SAM/SID"
 
+/* Authenticated user info is stored in secrets.tdb under these keys */
+
+#define SECRETS_AUTH_USER      "SECRETS/AUTH_USER"
+#define SECRETS_AUTH_DOMAIN      "SECRETS/AUTH_DOMAIN"
+#define SECRETS_AUTH_PASSWORD  "SECRETS/AUTH_PASSWORD"
+
 /* structure for storing machine account password
    (ie. when samba server is member of a domain */
 struct machine_acct_pass {
@@ -49,5 +56,4 @@ struct trusted_dom_pass {
        DOM_SID domain_sid; /* remote domain's sid */
 };
 
-
 #endif /* _SECRETS_H */

diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 5b63d236ba144d15fbfa2f7bb99cd2d1f968ed79..4d35c27c21339ba6d74a5887053247443101b9ad 100644 (file)
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -203,10 +203,4 @@ typedef struct {
 #define SETENV(name, value, overwrite) ;
 #endif
 
-/* Authenticated user info is stored in secrets.tdb under these keys */
-
-#define SECRETS_AUTH_USER      "SECRETS/AUTH_USER"
-#define SECRETS_AUTH_DOMAIN      "SECRETS/AUTH_DOMAIN"
-#define SECRETS_AUTH_PASSWORD  "SECRETS/AUTH_PASSWORD"
-
 #endif /* _WINBINDD_H */