3 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 50054ef01..ef4dc7050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+ 20130529
+  - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] bz#2087: Add a null
+    implementation of endgrent for platforms that don't have it (eg Android).
+    Loosely based on a patch from Nathan Osman, ok djm
  20130517
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2013/03/07 00:20:34
diff --git a/configure.ac b/configure.ac
index 7d8adfcbc..13c055849 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.524 2013/05/16 10:47:32 dtucker Exp $
+# $Id: configure.ac,v 1.525 2013/05/29 22:29:09 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.524 $)
+AC_REVISION($Revision: 1.525 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1531,6 +1531,7 @@ AC_CHECK_FUNCS([ \
         clock \
         closefrom \
         dirfd \
+        endgrent \
         fchmod \
         fchown \
         freeaddrinfo \
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 430066376..9ebd83c3a 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-misc.h,v 1.23 2013/03/14 23:34:27 djm Exp $ */
+/* $Id: bsd-misc.h,v 1.24 2013/05/29 22:29:09 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@@ -110,4 +110,8 @@ int	isblank(int);
 pid_t getpgid(pid_t);
 #endif
 
+#ifndef HAVE_ENDGRENT
+# define endgrent() {}
+#endif
+
 #endif /* _BSD_MISC_H */