Commit 9c870f96 authored by Damien Miller's avatar Damien Miller

- (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache

   file using FILE: method, fixes problems on Mac OSX.
   Patch from simon@sxw.org.uk; ok dtucker@
parent c99a19b4
20040416
- (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since
FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com
- (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache
file using FILE: method, fixes problems on Mac OSX.
Patch from simon@sxw.org.uk; ok dtucker@
20040412
- (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
......@@ -970,4 +973,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3312 2004/04/16 07:58:28 dtucker Exp $
$Id: ChangeLog,v 1.3313 2004/04/16 12:47:55 djm Exp $
......@@ -72,6 +72,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);
......@@ -177,6 +178,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();
......
......@@ -66,6 +66,7 @@ struct Authctxt {
krb5_ccache krb5_fwd_ccache;
krb5_principal krb5_user;
char *krb5_ticket_file;
char *krb5_ccname;
#endif
void *methoddata;
};
......
......@@ -1093,9 +1093,9 @@ do_setup_env(Session *s, const char *shell)
}
#endif
#ifdef KRB5
if (s->authctxt->krb5_ticket_file)
if (s->authctxt->krb5_ccname)
child_set_env(&env, &envsize, "KRB5CCNAME",
s->authctxt->krb5_ticket_file);
s->authctxt->krb5_ccname);
#endif
#ifdef USE_PAM
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment