- (djm) Bug #698: Specify FILE: for KRB5CCNAME; patch from

   stadal@suse.cz and simon@sxw.org.uk

diff --git a/ChangeLog b/ChangeLog
index 0fc8c60a60fd75bac13622209a2d29a718cbc4a3..93aa4381cd0a45001ef4d2b8f2142dededbe7db8 100644 (file)
--- 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 e358bcbdcf725364c13a98463382b465077787a9..7373beb6defdd82d450a0edda0a860977fd8cc9c 100644 (file)
--- 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);