From e5d801b2d6aab34943ecb74550a852aa69c82f38 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 20 Apr 2004 09:46:41 +0000 Subject: Resolve conflicts. --- crypto/openssh/auth-krb5.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'crypto/openssh/auth-krb5.c') diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c index 7270326..42b8026 100644 --- a/crypto/openssh/auth-krb5.c +++ b/crypto/openssh/auth-krb5.c @@ -55,7 +55,9 @@ krb5_init(void *context) problem = krb5_init_context(&authctxt->krb5_ctx); if (problem) return (problem); +#ifdef KRB5_INIT_ETS krb5_init_ets(authctxt->krb5_ctx); +#endif } return (0); } @@ -71,6 +73,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password) #endif krb5_error_code problem; krb5_ccache ccache = NULL; + int len; if (!authctxt->valid) return (0); @@ -176,6 +179,11 @@ auth_krb5_password(Authctxt *authctxt, const char *password) authctxt->krb5_ticket_file = (char *)krb5_cc_get_name(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache); + len = strlen(authctxt->krb5_ticket_file) + 6; + authctxt->krb5_ccname = xmalloc(len); + snprintf(authctxt->krb5_ccname, len, "FILE:%s", + authctxt->krb5_ticket_file); + out: restore_uid(); -- cgit v1.1