← Back to branch summary

~ubuntu-branches/ubuntu/maverick/krb5/maverick

« back to all changes in this revision

Viewing changes to src/appl/gssftp/ftp/cmds.c

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hartman
  • Date: 2009-05-07 16:16:34 UTC
  • mfrom: (13.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090507161634-xqyk0s9na0le4flj
Tags: 1.7dfsg~beta1-4
http://bugs.debian.org/527353
When  decrypting the TGS response fails with the subkey, try with the
session key to work around Heimdal bug, Closes: #527353 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/appl/gssftp/ftp/cmds.c
66
66
#include <ctype.h>
67
67
#include <time.h>
68
68
 
69
 
#ifndef MAXPATHLEN
70
 
# define MAXPATHLEN 4096
71
 
#endif
 
69
#include <k5-platform.h>
 
70
 
72
71
 
73
72
#ifdef HAVE_GETCWD
74
73
#define getwd(x) getcwd(x,MAXPATHLEN)
186
185
                form = FORM_N;
187
186
                mode = MODE_S;
188
187
                stru = STRU_F;
189
 
                (void) strcpy(bytename, "8"), bytesize = 8;
 
188
                (void) strlcpy(bytename, "8", sizeof(bytename)), bytesize = 8;
190
189
                if (autoauth) {
191
190
                        if (do_auth() && autoencrypt) {
192
191
                                clevel = PROT_P;
1172
1171
        if (!proxy) {
1173
1172
                pswitch(1);
1174
1173
                if (connected) putchar('\n');
1175
 
                cstatus(argc,argv);
 
1174
                cstatus();
1176
1175
                if (connected) putchar('\n');
1177
1176
                pswitch(0);
1178
1177
        }
1619
1618
                namep = strrchr(shellprog,'/');
1620
1619
                if (namep == NULL)
1621
1620
                        namep = shellprog;
1622
 
                (void) strcpy(shellnam,"-");
1623
 
                (void) strncat(shellnam, ++namep, sizeof(shellnam) - 1 - strlen(shellnam));
1624
 
                shellnam[sizeof(shellnam) - 1] = '\0';
 
1621
                (void) snprintf(shellnam, sizeof(shellnam), "-%s", ++namep);
1625
1622
                if (strcmp(namep, "sh") != 0)
1626
1623
                        shellnam[0] = '+';
1627
1624
                if (debug) {