summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-06-18 12:45:57 +0200
committerGünther Deschner <gd@samba.org>2008-06-24 23:34:05 +0200
commit0ac8c5d49a8b0d5535eebf80871003f6c19af5eb (patch)
treef4cf6308a39147b7de4d0e405471ddec30fff136 /source3/include/includes.h
parent7c451b9b89de4fd3243e081551504d2efc6ade2f (diff)
downloadsamba-0ac8c5d49a8b0d5535eebf80871003f6c19af5eb.tar.gz
samba-0ac8c5d49a8b0d5535eebf80871003f6c19af5eb.tar.bz2
samba-0ac8c5d49a8b0d5535eebf80871003f6c19af5eb.zip
kerberos: make smb_krb5_kt_add_entry public, allow to pass keys without salting them.
Guenther (This used to be commit 7c4da23be1105dc224033b21eb486e7fcdc7d9c5)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7513dfb6e0..61ca937138 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1143,7 +1143,7 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val);
/* Samba wrapper function for krb5 functionality. */
bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);
-int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype);
+int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool no_salt);
bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
@@ -1221,6 +1221,13 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context,
const char *keytab_name,
bool write_access,
krb5_keytab *keytab);
+int smb_krb5_kt_add_entry(krb5_context context,
+ krb5_keytab keytab,
+ krb5_kvno kvno,
+ const char *princ_s,
+ krb5_enctype *enctypes,
+ krb5_data password,
+ bool no_salt);
#endif /* HAVE_KRB5 */