Page MenuHomeFreeBSD
Files F140023771

D49801.id153706.diff
No OneTemporary
Actions

D49801.id153706.diff
View Options

Index: secure/lib/libssh/Makefile
===================================================================
--- secure/lib/libssh/Makefile
+++ secure/lib/libssh/Makefile
@@ -16,8 +16,6 @@
krl.c \
bitmap.c
-# gss-genr.c should be in $SRCS but causes linking problems, so it is
-# compiled directly into sshd instead.
SRCS= ${LIBOPENSSH_SRCS} \
authfd.c authfile.c \
canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
@@ -28,7 +26,7 @@
atomicio.c dispatch.c mac.c misc.c utf8.c \
monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-ecdsa-sk.c \
ssh-ed25519-sk.c ssh-rsa.c dh.c \
- msg.c dns.c entropy.c umac.c umac128.c \
+ msg.c dns.c entropy.c gss-genr.c umac.c umac128.c \
ssh-pkcs11.c smult_curve25519_ref.c \
poly1305.c chacha.c cipher-chachapoly.c cipher-chachapoly-libcrypto.c \
ssh-ed25519.c digest-openssl.c digest-libc.c \
@@ -49,6 +47,10 @@
openssl-compat.c port-net.c \
recallocarray.c strtonum.c timingsafe_bcmp.c vis.c xcrypt.c
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
+LIBADD+= gssapi_krb5 gssapi krb5
+.endif
+
.if ${MK_LDNS} == "no"
SRCS+= getrrsetbyname.c
.else
Index: secure/libexec/sshd-session/Makefile
===================================================================
--- secure/libexec/sshd-session/Makefile
+++ secure/libexec/sshd-session/Makefile
@@ -18,9 +18,6 @@
sandbox-solaris.c uidswap.c $(SKSRCS)
PACKAGE= ssh
-# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
-SRCS+= gss-genr.c
-
MAN=
# pam should always happen before ssh here for static linking
Index: secure/usr.bin/ssh/Makefile
===================================================================
--- secure/usr.bin/ssh/Makefile
+++ secure/usr.bin/ssh/Makefile
@@ -12,9 +12,6 @@
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
sshconnect.c sshconnect2.c mux.c $(SKSRCS)
-# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
-SRCS+= gss-genr.c
-
LIBADD= ssh
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
Index: share/mk/src.libnames.mk
===================================================================
--- share/mk/src.libnames.mk
+++ share/mk/src.libnames.mk
@@ -306,6 +306,9 @@
_DP_sqlite3= pthread
_DP_ssl= crypto
_DP_ssh= crypto crypt z
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
+_DP_ssh+= gssapi_krb5 gssapi krb5
+.endif
.if ${MK_LDNS} != "no"
_DP_ssh+= ldns
.endif

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 20, 4:44 AM (2 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27092076
Default Alt Text
D49801.id153706.diff (2 KB)

Event Timeline