Attachment #1504 for bug #1464

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

Lines 551-557 Link Here

(-)configure.ac (-2 / +1 lines)
551	no_dev_ptmx=1	551	no_dev_ptmx=1
552	check_for_libcrypt_later=1	552	check_for_libcrypt_later=1
553	check_for_openpty_ctty_bug=1	553	check_for_openpty_ctty_bug=1
554	AC_DEFINE(DONT_TRY_OTHER_AF, 1, [Workaround more Linux IPv6 quirks])
555	AC_DEFINE(PAM_TTY_KLUDGE, 1,	554	AC_DEFINE(PAM_TTY_KLUDGE, 1,
556	[Work around problematic Linux PAM modules handling of PAM_TTY])	555	[Work around problematic Linux PAM modules handling of PAM_TTY])
557	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!",	556	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!",
Lines 1034-1040 Link Here
1034	AC_CHECK_HEADERS(libutil.h)	1033	AC_CHECK_HEADERS(libutil.h)
1035	AC_SEARCH_LIBS(login, util bsd, [AC_DEFINE(HAVE_LOGIN, 1,	1034	AC_SEARCH_LIBS(login, util bsd, [AC_DEFINE(HAVE_LOGIN, 1,
1036	[Define if your libraries define login()])])	1035	[Define if your libraries define login()])])
1037	AC_CHECK_FUNCS(logout updwtmp logwtmp)	1036	AC_CHECK_FUNCS(fmt_scaled logout updwtmp logwtmp)
1038		1037
1039	AC_FUNC_STRFTIME	1038	AC_FUNC_STRFTIME
1040		1039




					error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno));
			}
#endif
			if (x11_use_localhost)
				channel_set_reuseaddr(sock);
			if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
				debug2("bind port %d: %.100s", port, strerror(errno));
				close(sock);

				break;
			}
			socks[num_socks++] = sock;
#ifndef DONT_TRY_OTHER_AF
			if (num_socks == NUM_SOCKS)
				break;
#else
			if (x11_use_localhost) {
				if (num_socks == NUM_SOCKS)
					break;
			} else {
				break;
			}
#endif
		}
		freeaddrinfo(aitop);
		if (num_socks > 0)

Return to bug 1464

Lines 3007-3013 Link Here

(-)channels.c (-10 / +2 lines)
3007	error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno));	3007	error("setsockopt IPV6_V6ONLY: %.100s", strerror(errno));
3008	}	3008	}
3009	#endif	3009	#endif
3010	channel_set_reuseaddr(sock);	3010	if (x11_use_localhost)
		3011	channel_set_reuseaddr(sock);
3011	if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {	3012	if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
3012	debug2("bind port %d: %.100s", port, strerror(errno));	3013	debug2("bind port %d: %.100s", port, strerror(errno));
3013	close(sock);	3014	close(sock);
Lines 3019-3035 Link Here
3019	break;	3020	break;
3020	}	3021	}
3021	socks[num_socks++] = sock;	3022	socks[num_socks++] = sock;
3022	#ifndef DONT_TRY_OTHER_AF
3023	if (num_socks == NUM_SOCKS)	3023	if (num_socks == NUM_SOCKS)
3024	break;	3024	break;
3025	#else
3026	if (x11_use_localhost) {
3027	if (num_socks == NUM_SOCKS)
3028	break;
3029	} else {
3030	break;
3031	}
3032	#endif
3033	}	3025	}
3034	freeaddrinfo(aitop);	3026	freeaddrinfo(aitop);
3035	if (num_socks > 0)	3027	if (num_socks > 0)