summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornsayer <nsayer@FreeBSD.org>2001-05-07 20:38:39 +0000
committernsayer <nsayer@FreeBSD.org>2001-05-07 20:38:39 +0000
commitce2648b0d2ae4682634f37e718bdc59869d8d572 (patch)
treeb76a13333281459d6f19967452db096129c933e6
parentfa8314227c51816057f11e1672444bbae7baed35 (diff)
downloadFreeBSD-src-ce2648b0d2ae4682634f37e718bdc59869d8d572.zip
FreeBSD-src-ce2648b0d2ae4682634f37e718bdc59869d8d572.tar.gz
Add PAM support to SRA authentication. Cribbed mostly from ftpd. This
doesn't solve the problem of root being allowed to log in, but that sort of thing is something PAM should be doing anyway.
-rw-r--r--etc/pam.conf4
-rw-r--r--secure/libexec/telnetd/Makefile2
-rw-r--r--secure/usr.bin/telnet/Makefile2
3 files changed, 6 insertions, 2 deletions
diff --git a/etc/pam.conf b/etc/pam.conf
index 56ad8f3..12e6fff 100644
--- a/etc/pam.conf
+++ b/etc/pam.conf
@@ -86,6 +86,10 @@ sshd session required pam_permit.so
# "csshd" is for challenge-based authentication with sshd (TIS auth, etc.)
csshd auth required pam_skey.so
+# SRA telnet. Non-SRA telnet uses 'login'.
+telnetd auth required pam_unix.so try_first_pass
+telnetd account required pam_unix.so
+
# Don't break startx
xserver auth required pam_permit.so
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 7dffb39..47b1841 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -15,7 +15,7 @@ SRCS= global.c slc.c state.c sys_term.c telnetd.c \
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBMP} \
${LIBCRYPT}
-LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp
+LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp -lpam
.include <bsd.prog.mk>
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 3e6aae2..e3a33d9 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -12,7 +12,7 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP}
DPADD+= ${LIBIPSEC}
LDADD= -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp
-LDADD+= -lipsec
+LDADD+= -lipsec -lpam
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud