diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-10-16 05:31:47 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-10-16 05:31:47 +0000 |
| commit | ef711b047d0bcb61526908d2f4bca6b88d93efd5 (patch) | |
| tree | 0c5e56f63b2e15f691d7e34dbefc651646068f85 /src/appl/gssftp/ftp/main.c | |
| parent | 32759edb7b847b3306da7bcc880aa56a72921ebb (diff) | |
| download | krb5-ef711b047d0bcb61526908d2f4bca6b88d93efd5.zip krb5-ef711b047d0bcb61526908d2f4bca6b88d93efd5.tar.gz krb5-ef711b047d0bcb61526908d2f4bca6b88d93efd5.tar.bz2 | |
* main.c: Change KERBEROS to KRB5_KRB4_COMPAT where appropriate
* secure.c: Use <secure.h> rather than "secure.h" so that the
correct secure.h gets included (the one in the $(srcdir) of the
directory we're compiling secure.c into). From danw@mit.edu.
* ftp.c: Change KERBEROS to KRB5_KRB4_COMPAT where appropriate.
Re-order the clauses so that that GSSAPI gets tried before
KERBEROS_V4.
* Makefile.in: Update LOCALINCLUDE and the link line to DTRT with
krb4 compatibility.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10235 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/gssftp/ftp/main.c')
| -rw-r--r-- | src/appl/gssftp/ftp/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c index 4a6d88f..a73f4fb 100644 --- a/src/appl/gssftp/ftp/main.c +++ b/src/appl/gssftp/ftp/main.c @@ -67,11 +67,11 @@ uid_t getuid(); sigtype intr(), lostpeer(); extern char *home; char *getlogin(); -#ifdef KERBEROS +#ifdef KRB5_KRB4_COMPAT #include <krb.h> struct servent staticsp; extern char realm[]; -#endif /* KERBEROS */ +#endif /* KRB5_KRB4_COMPAT */ main(argc, argv) char *argv[]; @@ -86,12 +86,12 @@ main(argc, argv) fprintf(stderr, "ftp: ftp/tcp: unknown service\n"); exit(1); } -#ifdef KERBEROS +#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 /* KERBEROS */ +#endif /* KRB5_KRB4_COMPAT */ doglob = 1; interactive = 1; autologin = 1; @@ -105,7 +105,7 @@ main(argc, argv) debug++; break; -#ifdef KERBEROS +#ifdef KRB5_KRB4_COMPAT case 'k': if (*++cp != '\0') strncpy(realm, ++cp, REALM_SZ); |