s3-spoolss: remove some left-over hand marshalling code and structs.

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

diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index cb4fbd043a7a8ff5a4a105dc17f5e31f184b3893..3c8e2ccf81ac166f5d9926c2f2f3580787e13726 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
@@ -32,6 +31,9 @@
 /* this one is for storing trusted domain account password */
 #define SECRETS_DOMTRUST_ACCT_PASS "SECRETS/$DOMTRUST.ACC"
 
+/* Store the principal name used for Kerberos DES key salt under this key name. */
+#define SECRETS_SALTING_PRINCIPAL "SECRETS/SALTING_PRINCIPAL"
+
 /* The domain sid and our sid are stored here even though they aren't
    really secret. */
 #define SECRETS_DOMAIN_SID    "SECRETS/SID"
@@ -43,6 +45,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"
@@ -72,10 +76,10 @@ typedef struct trusted_dom_pass {
  * trusted domain entry/entries returned by secrets_get_trusted_domains
  * (used in _lsa_enum_trust_dom call)
  */
-typedef struct trustdom {
-       smb_ucs2_t *name;
+struct trustdom_info {
+       char *name;
        DOM_SID sid;
-} TRUSTDOM;
+};
 
 /*
  * Format of an OpenAFS keyfile
@@ -95,4 +99,6 @@ struct afs_keyfile {
 
 #define SECRETS_AFS_KEYFILE "SECRETS/AFS_KEYFILE"
 
+#define SECRETS_SCHANNEL_STATE "SECRETS/SCHANNEL"
+
 #endif /* _SECRETS_H */