From 5d46480425cbef22333c766f6a507a4ab2ac313a Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 17 Feb 2004 09:33:52 +0000 Subject: [PATCH] - (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from stadal@suse.cz and simon@sxw.org.uk --- ChangeLog | 2 ++ gss-serv-krb5.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fc8c60a..93aa4381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ [sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp-int.c] [sftp-int.h sftp.c] switch to license.template for code written by me (belated, I know...) + - (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from + stadal@suse.cz and simon@sxw.org.uk 20040212 - (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh] diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index e358bcbd..7373beb6 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c @@ -108,6 +108,7 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) krb5_error_code problem; krb5_principal princ; OM_uint32 maj_status, min_status; + int len; if (client->creds == NULL) { debug("No credentials stored"); @@ -178,11 +179,13 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); client->store.envvar = "KRB5CCNAME"; - client->store.envval = xstrdup(client->store.filename); + len = strlen(client->store.filename) + 6; + client->store.envval = xmalloc(len); + snprintf(client->store.envval, len, "FILE:%s", client->store.filename); #ifdef USE_PAM if (options.use_pam) - do_pam_putenv(client->store.envvar,client->store.envval); + do_pam_putenv(client->store.envvar, client->store.envval); #endif krb5_cc_close(krb_context, ccache); -- 2.45.2