Update for OpenSSH 2.3.0.
This commit is contained in:
parent
099584266b
commit
94193b581b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=69593
@ -22,6 +22,12 @@ ftpd auth requisite pam_cleartext_pass_ok.so
|
|||||||
#ftpd auth sufficient pam_kerberosIV.so try_first_pass
|
#ftpd auth sufficient pam_kerberosIV.so try_first_pass
|
||||||
ftpd auth required pam_unix.so try_first_pass
|
ftpd auth required pam_unix.so try_first_pass
|
||||||
|
|
||||||
|
# OpenSSH with PAM support requires similar modules. The session one is
|
||||||
|
# a bit strange, though...
|
||||||
|
sshd auth sufficient pam_skey.so
|
||||||
|
sshd auth required pam_unix.so try_first_pass
|
||||||
|
sshd session required pam_permit.so
|
||||||
|
|
||||||
# Don't break startx
|
# Don't break startx
|
||||||
xserver auth required pam_permit.so
|
xserver auth required pam_permit.so
|
||||||
|
|
||||||
|
@ -8,7 +8,8 @@ SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
|
|||||||
cipher.c compat.c compress.c crc32.c deattack.c \
|
cipher.c compat.c compress.c crc32.c deattack.c \
|
||||||
hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
|
hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
|
||||||
rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
|
rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \
|
||||||
key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c
|
key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
|
||||||
|
cli.c rijndael.c
|
||||||
|
|
||||||
NOPIC= yes
|
NOPIC= yes
|
||||||
|
|
||||||
@ -36,5 +37,5 @@ CFLAGS+= -DKRB5
|
|||||||
CFLAGS+= -DSKEY
|
CFLAGS+= -DSKEY
|
||||||
DPADD+= ${LIBOPIE}
|
DPADD+= ${LIBOPIE}
|
||||||
LDADD+= -lopie
|
LDADD+= -lopie
|
||||||
SRCS+= auth-skey.c
|
SRCS+= auth-skey.c auth2-skey.c
|
||||||
.include <bsd.lib.mk>
|
.include <bsd.lib.mk>
|
||||||
|
@ -11,9 +11,10 @@ MAN8= sshd.8
|
|||||||
|
|
||||||
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
|
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
|
||||||
pty.c log-server.c login.c servconf.c serverloop.c \
|
pty.c log-server.c login.c servconf.c serverloop.c \
|
||||||
auth.c auth1.c auth2.c auth-options.c session.c login_access.c
|
auth.c auth1.c auth2.c auth-options.c session.c login_access.c dh.c \
|
||||||
|
auth-pam.c
|
||||||
|
|
||||||
CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DLOGIN_ACCESS -I${LOGINSRC}
|
CFLAGS+= -DLIBWRAP -DHAVE_LOGIN_CAP -DLOGIN_ACCESS -I${LOGINSRC} -DUSE_PAM
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
@ -47,5 +48,6 @@ DPADD+= ${LIBOPIE} ${LIBMD}
|
|||||||
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
|
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap \
|
||||||
DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP}
|
-lpam
|
||||||
|
DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
|
||||||
|
Loading…
Reference in New Issue
Block a user