diff options
| author | pst <pst@FreeBSD.org> | 1994-10-19 00:03:45 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1994-10-19 00:03:45 +0000 |
| commit | 3bbaa5903cdfa6d903256d9ad37d1d8c20c79437 (patch) | |
| tree | 18581614639f8a987cdf2526bd645ecfdd38abd3 /libexec | |
| parent | 1552617ffdcabd5ebae23058e72580c06f45e182 (diff) | |
| download | FreeBSD-src-3bbaa5903cdfa6d903256d9ad37d1d8c20c79437.zip FreeBSD-src-3bbaa5903cdfa6d903256d9ad37d1d8c20c79437.tar.gz | |
Include most of the logdaemon v4.4 S/key changes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/Makefile | 4 | ||||
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 2 | ||||
| -rw-r--r-- | libexec/ftpd/skey-stuff.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 396deee..e1e5be2 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -6,8 +6,8 @@ SRCS= ftpd.c ftpcmd.c logwtmp.c popen.c skey-stuff.c CFLAGS+=-DSETPROCTITLE -DSKEY -LDADD= -lcrypt -lskey -DPADD= ${LIBCRYPT} ${LIBSKEY} +LDADD= -lcrypt -lskey -lmd +DPADD= ${LIBCRYPT} ${LIBSKEY} ${LIBMD} CLEANFILES+=ftpcmd.c y.tab.h diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 6ec3d25..5c090e3 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -951,7 +951,7 @@ yylex() upper(cbuf); p = lookup(cmdtab, cbuf); cbuf[cpos] = c; - if (p != 0) { + if (guest != 0 && p != 0) { if (p->implemented == 0) { nack(p->name); longjmp(errcatch,0); diff --git a/libexec/ftpd/skey-stuff.c b/libexec/ftpd/skey-stuff.c index fdec650..5c34b9b 100644 --- a/libexec/ftpd/skey-stuff.c +++ b/libexec/ftpd/skey-stuff.c @@ -18,6 +18,7 @@ int pwok; /* Display s/key challenge where appropriate. */ if (pwd == 0 || skeychallenge(&skey, pwd->pw_name, buf) != 0) - sprintf(buf, "Password required for %s.", name); + sprintf(buf, "%s required for %s.", + pwok ? "Password" : "S/Key password", name); return (buf); } |
