s3-winbind: Added a common rpc_enum_dom_groups function.

[samba.git] / source3 / include / secrets.h

diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 610a14b52be628f0ff08db940ab2f1492a4d49d2..624b1465bb8174a15b0e1fe80f9e77e195d049db 100644 (file)
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -5,7 +5,7 @@
  * 
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
+ * Free Software Foundation; either version 3 of the License, or (at your
  * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
@@ -14,8 +14,7 @@
  * more details.
  * 
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 675
- * Mass Ave, Cambridge, MA 02139, USA.  
+ * this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef _SECRETS_H
@@ -26,6 +25,7 @@
 */
 #define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC"
 #define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD"
+#define SECRETS_MACHINE_PASSWORD_PREV "SECRETS/MACHINE_PASSWORD.PREV"
 #define SECRETS_MACHINE_LAST_CHANGE_TIME "SECRETS/MACHINE_LAST_CHANGE_TIME"
 #define SECRETS_MACHINE_SEC_CHANNEL_TYPE "SECRETS/MACHINE_SEC_CHANNEL_TYPE"
 #define SECRETS_MACHINE_TRUST_ACCOUNT_NAME "SECRETS/SECRETS_MACHINE_TRUST_ACCOUNT_NAME"
@@ -46,6 +46,8 @@
 
 #define SECRETS_LDAP_BIND_PW "SECRETS/LDAP_BIND_PW"
 
+#define SECRETS_LOCAL_SCHANNEL_KEY "SECRETS/LOCAL_SCHANNEL_KEY"
+
 /* Authenticated user info is stored in secrets.tdb under these keys */
 
 #define SECRETS_AUTH_USER      "SECRETS/AUTH_USER"
@@ -59,25 +61,13 @@ struct machine_acct_pass {
        time_t mod_time;
 };
 
-/*
- * storage structure for trusted domain
- */
-typedef struct trusted_dom_pass {
-       size_t uni_name_len;
-       smb_ucs2_t uni_name[32]; /* unicode domain name */
-       size_t pass_len;
-       fstring pass;           /* trust relationship's password */
-       time_t mod_time;
-       DOM_SID domain_sid;     /* remote domain's sid */
-} TRUSTED_DOM_PASS;
-
 /*
  * trusted domain entry/entries returned by secrets_get_trusted_domains
  * (used in _lsa_enum_trust_dom call)
  */
 struct trustdom_info {
        char *name;
-       DOM_SID sid;
+       struct dom_sid sid;
 };
 
 /*
@@ -98,6 +88,4 @@ struct afs_keyfile {
 
 #define SECRETS_AFS_KEYFILE "SECRETS/AFS_KEYFILE"
 
-#define SECRETS_SCHANNEL_STATE "SECRETS/SCHANNEL"
-
 #endif /* _SECRETS_H */