diff options
| author | markm <markm@FreeBSD.org> | 1996-08-09 09:02:31 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1996-08-09 09:02:31 +0000 |
| commit | a81e90df6d17789e93c7470d7662e17d29e64d6e (patch) | |
| tree | 957fb9f78eb7fef3da050bca5e36cdf27b4437c9 /libexec | |
| parent | e28846e4e97d0e1a11ec41714537df5c6d64a78b (diff) | |
| download | FreeBSD-src-a81e90df6d17789e93c7470d7662e17d29e64d6e.zip FreeBSD-src-a81e90df6d17789e93c7470d7662e17d29e64d6e.tar.gz | |
Tidy up the Kerberised bits. While I'm here, fix some -Wall complaints.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/Makefile | 5 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 17 | ||||
| -rw-r--r-- | libexec/ftpd/popen.c | 3 |
3 files changed, 19 insertions, 6 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 50f51cf..75df272 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 +# $Id$ PROG= ftpd MAN8= ftpd.8 @@ -11,11 +12,13 @@ DPADD= ${LIBSKEY} ${LIBMD} ${LIBCRYPT} ${LIBUTIL} CLEANFILES+=ftpcmd.c y.tab.h -.if defined(KERBEROS) +.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_EBONES) +.PATH: ${.CURDIR}/../../usr.bin/login SRCS+= klogin.c LDADD+= -lkrb -ldes DPADD+= ${LIBKRB} ${LIBDES} CFLAGS+=-DKERBEROS +DISTRIBUTION= krb .endif .include <bsd.prog.mk> diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 9ea4e47..13a286c 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -30,18 +30,22 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ftpd.c,v 1.20 1996/08/06 08:43:43 phk Exp $ + * $Id$ */ +#if 0 #ifndef lint static char copyright[] = "@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#endif +#if 0 #ifndef lint static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif /* not lint */ +#endif /* * FTP server. @@ -144,8 +148,13 @@ char *ident = NULL; static char ttyline[20]; char *tty = ttyline; /* for klogin */ +#ifdef KERBEROS +int klogin __P((struct passwd *, char *, char *, char *)); +#endif + #if defined(KERBEROS) int notickets = 1; +int noticketsdontcomplain = 1; char *krbtkfile_env = NULL; #endif @@ -562,7 +571,7 @@ user(name) "ANONYMOUS FTP LOGIN REFUSED FROM %s", remotehost); return; } - if (pw = sgetpwnam(name)) { + if ((pw = sgetpwnam(name))) { if ((shell = pw->pw_shell) == NULL || *shell == 0) shell = _PATH_BSHELL; while ((cp = getusershell()) != NULL) @@ -1453,7 +1462,7 @@ yyerror(s) { char *cp; - if (cp = strchr(cbuf,'\n')) + if ((cp = strchr(cbuf,'\n'))) *cp = '\0'; reply(500, "'%s': command not understood.", cbuf); } @@ -1783,7 +1792,7 @@ send_file_list(whichf) transflag = 0; goto out; } - while (dirname = *dirlist++) { + while ((dirname = *dirlist++)) { if (stat(dirname, &st) < 0) { /* * If user typed "ls -l", etc, and the client diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index b26732e..90a39cb 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -34,10 +34,11 @@ * SUCH DAMAGE. * */ - +#if 0 #ifndef lint static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #endif /* not lint */ +#endif #include <sys/types.h> #include <sys/wait.h> |
