summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c170522b..9759182dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120100117
2 - (tim) [configure.ac] OpenServer 5 needs BROKEN_GETADDRINFO too.
3
120100116 420100116
2 - (dtucker) [openbsd-compat/pwcache.c] Pull in includes.h and thus defines.h 5 - (dtucker) [openbsd-compat/pwcache.c] Pull in includes.h and thus defines.h
3 so we correctly detect whether or not we have a native user_from_uid. 6 so we correctly detect whether or not we have a native user_from_uid.
diff --git a/configure.ac b/configure.ac
index a105de71d..2ea3ed706 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.436 2010/01/16 20:23:25 tim Exp $ 1# $Id: configure.ac,v 1.437 2010/01/17 20:48:22 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.436 $) 18AC_REVISION($Revision: 1.437 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -786,6 +786,7 @@ mips-sony-bsd|mips-sony-newsos4)
786 AC_DEFINE(DISABLE_SHADOW) 786 AC_DEFINE(DISABLE_SHADOW)
787 AC_DEFINE(DISABLE_FD_PASSING) 787 AC_DEFINE(DISABLE_FD_PASSING)
788 AC_DEFINE(SETEUID_BREAKS_SETUID) 788 AC_DEFINE(SETEUID_BREAKS_SETUID)
789 AC_DEFINE(BROKEN_GETADDRINFO)
789 AC_DEFINE(BROKEN_SETREUID) 790 AC_DEFINE(BROKEN_SETREUID)
790 AC_DEFINE(BROKEN_SETREGID) 791 AC_DEFINE(BROKEN_SETREGID)
791 AC_DEFINE(WITH_ABBREV_NO_TTY) 792 AC_DEFINE(WITH_ABBREV_NO_TTY)