diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2009-01-10 01:06:45 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2009-01-10 01:06:45 +0000 |
| commit | 9002edc53df996fd9ab740e6652b8eadf31b8cb3 (patch) | |
| tree | 3bbbabb5325b0d52d5cb4d638691ebc077378d42 /src/appl/gssftp/ftp/main.c | |
| parent | def85286436a4bf95ffce574e83783a76001f7cf (diff) | |
| download | krb5-9002edc53df996fd9ab740e6652b8eadf31b8cb3.zip krb5-9002edc53df996fd9ab740e6652b8eadf31b8cb3.tar.gz krb5-9002edc53df996fd9ab740e6652b8eadf31b8cb3.tar.bz2 | |
Merged with current trunk, no new function added. Everything builds
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21722 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/gssftp/ftp/main.c')
| -rw-r--r-- | src/appl/gssftp/ftp/main.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c index 2e8c2cb..6ec5ee1 100644 --- a/src/appl/gssftp/ftp/main.c +++ b/src/appl/gssftp/ftp/main.c @@ -55,11 +55,8 @@ static char sccsid[] = "@(#)main.c 5.18 (Berkeley) 3/1/91"; #include <signal.h> #include "ftp_var.h" #ifndef _WIN32 -#ifndef KRB5_KRB4_COMPAT -/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */ #include <sys/socket.h> #include <netdb.h> -#endif #include <sys/ioctl.h> #include <sys/types.h> #include <pwd.h> @@ -90,11 +87,6 @@ uid_t getuid(); sigtype intr (int), lostpeer (int); extern char *home; char *getlogin(); -#ifdef KRB5_KRB4_COMPAT -#include <krb.h> -struct servent staticsp; -extern char realm[]; -#endif /* KRB5_KRB4_COMPAT */ static void cmdscanner (int); static char *slurpstring (void); @@ -126,12 +118,6 @@ main(argc, argv) fprintf(stderr, "ftp: ftp/tcp: unknown service\n"); exit(1); } -#ifdef KRB5_KRB4_COMPAT -/* GDM need to static sp so that the information is not lost - when kerberos calls getservbyname */ - memcpy(&staticsp,sp,sizeof(struct servent)); - sp = &staticsp; -#endif /* KRB5_KRB4_COMPAT */ doglob = 1; interactive = 1; autoauth = 1; @@ -148,19 +134,6 @@ main(argc, argv) debug++; break; -#ifdef KRB5_KRB4_COMPAT - case 'k': - if (*++cp != '\0') - strncpy(realm, ++cp, REALM_SZ); - else if (argc > 1) { - argc--, argv++; - strncpy(realm, *argv, REALM_SZ); - } - else - fprintf(stderr, "ftp: -k expects arguments\n"); - goto nextopt; -#endif - case 'v': verbose++; break; |