summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-01-30 04:40:12 +0000
committerTim Potter <tpot@samba.org>2003-01-30 04:40:12 +0000
commitcf292aead6bdcced9deac62c50b25e83779d9741 (patch)
tree00d22b66abaeb15c42603a4988fdd5dd0c372343 /source3/include
parent142837e5d3bd9d3d853fc1c2eb181fea87a38d3a (diff)
downloadsamba-cf292aead6bdcced9deac62c50b25e83779d9741.tar.gz
samba-cf292aead6bdcced9deac62c50b25e83779d9741.tar.bz2
samba-cf292aead6bdcced9deac62c50b25e83779d9741.zip
Sync of Heimdal kerberos stuff with HEAD. If this breaks I'm blaming
the dog again. (This used to be commit 6f89ee2c9dc7f03e3dbe7aa734bf67c6a434d135)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 08e801427c..23d6d1c457 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1214,22 +1214,8 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_
krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc);
#endif
-#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
-krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context,
- krb5_auth_context auth_context,
- krb5_keyblock *keyblock);
-#endif
-
-/* Samba wrapper functions for krb5 functionality. */
+/* Samba wrapper function for krb5 functionality. */
void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr);
-int create_kerberos_key_from_string(krb5_context context,
- krb5_principal host_princ,
- krb5_data *password,
- krb5_keyblock *key);
-
-void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt);
-krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
-krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
#endif /* HAVE_KRB5 */