Enable GSSAPI support. [1]
Also remove some duplicates from ssh's SRCS. Submitted by: [1] Björn Grönvall <bg@sics.se>
This commit is contained in:
parent
ce4bcde831
commit
9f80be8e3d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=124242
@ -21,7 +21,9 @@ SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
|
|||||||
|
|
||||||
CFLAGS+= -I${SSHDIR}
|
CFLAGS+= -I${SSHDIR}
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
|
||||||
|
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
||||||
|
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
NOLINT= true
|
NOLINT= true
|
||||||
|
@ -7,13 +7,13 @@ LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
|
|||||||
MAN= ssh.1 ssh_config.5
|
MAN= ssh.1 ssh_config.5
|
||||||
MLINKS= ssh.1 slogin.1
|
MLINKS= ssh.1 slogin.1
|
||||||
|
|
||||||
SRCS= ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
|
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
|
||||||
sshconnect.c sshconnect1.c sshconnect2.c
|
sshconnect.c sshconnect1.c sshconnect2.c
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
|
||||||
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -lroken -lcrypt
|
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
||||||
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} ${LIBCRYPT}
|
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(X11BASE)
|
.if defined(X11BASE)
|
||||||
|
@ -17,9 +17,9 @@ MAN= sshd.8 sshd_config.5
|
|||||||
CFLAGS+=-I${SSHDIR}
|
CFLAGS+=-I${SSHDIR}
|
||||||
|
|
||||||
.if !defined(NO_KERBEROS)
|
.if !defined(NO_KERBEROS)
|
||||||
CFLAGS+= -DKRB5 -DHEIMDAL
|
CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL
|
||||||
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
|
||||||
LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
DPADD+= ${LIBOPIE} ${LIBMD}
|
DPADD+= ${LIBOPIE} ${LIBMD}
|
||||||
|
Loading…
Reference in New Issue
Block a user