summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ae2cf5119..955fcef2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120090318
2 - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
3 that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
4 Based on patch from vinschen at redhat com.
5
120090308 620090308
2 - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c 7 - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
3 auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} 8 auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
diff --git a/configure.ac b/configure.ac
index 51fee9e6b..835c8fa6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.418 2009/03/07 11:22:35 dtucker Exp $ 1# $Id: configure.ac,v 1.419 2009/03/18 18:25:02 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.418 $) 18AC_REVISION($Revision: 1.419 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -434,8 +434,6 @@ int main(void) { exit(0); }
434 AC_DEFINE(USE_PIPES, 1, [Use PIPES instead of a socketpair()]) 434 AC_DEFINE(USE_PIPES, 1, [Use PIPES instead of a socketpair()])
435 AC_DEFINE(DISABLE_SHADOW, 1, 435 AC_DEFINE(DISABLE_SHADOW, 1,
436 [Define if you want to disable shadow passwords]) 436 [Define if you want to disable shadow passwords])
437 AC_DEFINE(IP_TOS_IS_BROKEN, 1,
438 [Define if your system choked on IP TOS setting])
439 AC_DEFINE(NO_X11_UNIX_SOCKETS, 1, 437 AC_DEFINE(NO_X11_UNIX_SOCKETS, 1,
440 [Define if X11 doesn't support AF_UNIX sockets on that system]) 438 [Define if X11 doesn't support AF_UNIX sockets on that system])
441 AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT, 1, 439 AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT, 1,
@@ -446,7 +444,8 @@ int main(void) { exit(0); }
446 file descriptor passing]) 444 file descriptor passing])
447 ;; 445 ;;
448*-*-dgux*) 446*-*-dgux*)
449 AC_DEFINE(IP_TOS_IS_BROKEN) 447 AC_DEFINE(IP_TOS_IS_BROKEN, 1,
448 [Define if your system choked on IP TOS setting])
450 AC_DEFINE(SETEUID_BREAKS_SETUID) 449 AC_DEFINE(SETEUID_BREAKS_SETUID)
451 AC_DEFINE(BROKEN_SETREUID) 450 AC_DEFINE(BROKEN_SETREUID)
452 AC_DEFINE(BROKEN_SETREGID) 451 AC_DEFINE(BROKEN_SETREGID)