Attachment #149652 for bug #195231

View | Details | Raw Unified | Return to bug 195231
Collapse All | Expand All

Lines 15-20 Link Here

(-)secure/usr.bin/ssh/Makefile (+4 lines)
15	# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile	15	# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
16	SRCS+= gss-genr.c	16	SRCS+= gss-genr.c
17		17
		18	.if ${MK_INET6_SUPPORT} != "no"
		19	CFLAGS+= -DINET6
		20	.endif
		21
18	DPADD= ${LIBSSH} ${LIBUTIL}	22	DPADD= ${LIBSSH} ${LIBUTIL}
19	LDADD= -lssh -lutil	23	LDADD= -lssh -lutil
20	USEPRIVATELIB= ssh	24	USEPRIVATELIB= ssh

Lines 469-477 Link Here

(-)crypto/openssh/sshconnect.c (-2 / +8 lines)
469	* sequence until the connection succeeds.	469	* sequence until the connection succeeds.
470	*/	470	*/
471	for (ai = aitop; ai; ai = ai->ai_next) {	471	for (ai = aitop; ai; ai = ai->ai_next) {
472	if (ai->ai_family != AF_INET &&	472	switch (ai->ai_family) {
473	ai->ai_family != AF_INET6)	473	case AF_INET:
		474	#ifdef INET6
		475	case AF_INET6:
		476	#endif
		477	break;
		478	default:
474	continue;	479	continue;
		480	}
475	if (getnameinfo(ai->ai_addr, ai->ai_addrlen,	481	if (getnameinfo(ai->ai_addr, ai->ai_addrlen,
476	ntop, sizeof(ntop), strport, sizeof(strport),	482	ntop, sizeof(ntop), strport, sizeof(strport),
477	NI_NUMERICHOST\|NI_NUMERICSERV) != 0) {	483	NI_NUMERICHOST\|NI_NUMERICSERV) != 0) {

Return to bug 195231