summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-04-10 00:35:00 +0000
committerTim Potter <tpot@samba.org>2002-04-10 00:35:00 +0000
commit9195f34e4a777cbc3d81858cb36e97ccff54b1a2 (patch)
tree377c1678364bd67d35cdd5bd36c9c529df1645da
parent45d3315e3233ad8b9f04cf31537f495438d9348e (diff)
downloadsamba-9195f34e4a777cbc3d81858cb36e97ccff54b1a2.tar.gz
samba-9195f34e4a777cbc3d81858cb36e97ccff54b1a2.tar.xz
samba-9195f34e4a777cbc3d81858cb36e97ccff54b1a2.zip
Moved definition of winbind username/password secrets into secrets.h
(This used to be commit b618b5943d53f33e6f03d8d47cf87efc5e1ad3e5)
-rw-r--r--source3/include/secrets.h10
-rw-r--r--source3/nsswitch/winbindd.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index db0e13bacdb..69ab4f6c8dc 100644
--- 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 5b63d236ba1..4d35c27c213 100644
--- 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 */