diff options
author | Andrew Bartlett <abartlet@samba.org> | 2005-09-17 01:11:50 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:13 -0500 |
commit | f3bce652c8c33712ffbb6c0a731f61b05f9d4be0 (patch) | |
tree | b57b78a83e15e65d15ecb0ffa37efa1bab079708 /source4/auth/kerberos/kerberos.h | |
parent | 3a4da8c0dbe1d50ca4de013fdb7c860a5196f4ca (diff) | |
download | samba-f3bce652c8c33712ffbb6c0a731f61b05f9d4be0.tar.gz samba-f3bce652c8c33712ffbb6c0a731f61b05f9d4be0.tar.bz2 samba-f3bce652c8c33712ffbb6c0a731f61b05f9d4be0.zip |
r10286: This patch is ugly and disgusting, but for now it works better than the other
ideas I have had.
When I get a full list of things I want to do to a krb5_context I'll
either add gsskrb5_ wrappers, or a way of speicfying the krb5 context
per gssapi context.
(I want to ensure that the only krb5_context variables created while
executing Samba4 are via our wrapper).
Andrew Bartlett
(This used to be commit 8a22d46e70e9f863831aba0c9913d195f833d625)
Diffstat (limited to 'source4/auth/kerberos/kerberos.h')
-rw-r--r-- | source4/auth/kerberos/kerberos.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index 9535094e2b..bc2a1babe9 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -21,19 +21,8 @@ #if defined(HAVE_KRB5) -#if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined (HAVE_KRB5_SET_WARN_DEST) && defined(HAVE_KRB5_LOG_FACILITY) -#define HAVE_KRB5_LOG_CONTROL -#else -#undef HAVE_KRB5_LOG_CONTROL -#endif +#include "auth/kerberos/krb5_init_context.h" -struct smb_krb5_context { - krb5_context krb5_context; -#ifdef HAVE_KRB5_LOG_CONTROL - krb5_log_facility *logf; -#endif -}; - struct ccache_container { struct smb_krb5_context *smb_krb5_context; krb5_ccache ccache; @@ -118,8 +107,6 @@ char *smb_get_krb5_error_message(krb5_context context, krb5_error_code code, TAL struct cli_credentials *credentials, struct smb_krb5_context *smb_krb5_context, krb5_ccache ccache); -krb5_error_code smb_krb5_init_context(TALLOC_CTX *parent_ctx, - struct smb_krb5_context **smb_krb5_context); krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx, struct cli_credentials *machine_account, struct smb_krb5_context *smb_krb5_context, |