Add check for _innetgr(3) since NCR systems have that instead of

innetgr(3).

diff --git a/compat.h b/compat.h
index 6f4a1f459136b0291a2ecc030aa407e8b11721d1..445a5b0e2a971902c7116d1cfbc76f441a084e8e 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -155,6 +155,13 @@
 # endif /* __hpux */
 #endif /* HAVE_SETEUID */
 
+/*
+ * NCR's SVr4 has _innetgr(3) instead of innetgr(3) for some reason.
+ */
+#ifdef HAVE__INNETGR
+# define innetgr(n, h, u, d)   (_innetgr(n, h, u, d))
+#endif /* HAVE__INNETGR */
+
 /*
  * On POSIX systems, O_NOCTTY is the default so some OS's may lack this define.
  */

diff --git a/config.h.in b/config.h.in
index 8f4efe709ff294ba0d5d9e485ef2086758c9137e..4fc6e26cb54d80577aa315260f8caabe9340f16b 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -188,6 +188,9 @@
 /* Define if you have innetgr(3).  */
 #undef HAVE_INNETGR
 
+/* Define if you have _innetgr(3).  */
+#undef HAVE__INNETGR
+
 /* Define if you have initgroups(3).  */
 #undef HAVE_INITGROUPS
 

diff --git a/configure.in b/configure.in
index 6755a9843c600400a1406be5e27dc3e5711eb91e..419b2d8655c3b87be7614429096bd542f108bd47 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AC_CONFIG_HEADER(config.h pathnames.h)
 dnl
 dnl This won't work before AC_INIT()
 dnl
-echo "Configuring Sudo version 1.6.3"
+echo "Configuring Sudo version 1.6.4"
 dnl
 dnl Variables that get substituted in the Makefile and man pages
 dnl
@@ -1542,7 +1542,7 @@ if test -z "$BROKEN_GETCWD"; then
 fi
 AC_CHECK_FUNC(lockf, AC_DEFINE(HAVE_LOCKF), AC_CHECK_FUNCS(flock))
 AC_CHECK_FUNC(waitpid, AC_DEFINE(HAVE_WAITPID), AC_CHECK_FUNCS(wait3))
-AC_CHECK_FUNC(innetgr, AC_DEFINE(HAVE_INNETGR) AC_CHECK_FUNCS(getdomainname))
+AC_CHECK_FUNC(innetgr, AC_DEFINE(HAVE_INNETGR) AC_CHECK_FUNCS(getdomainname), [AC_CHECK_FUNC(_innetgr, AC_DEFINE(HAVE__INNETGR) AC_CHECK_FUNCS(getdomainname))])
 AC_CHECK_FUNC(lsearch, AC_DEFINE(HAVE_LSEARCH), AC_CHECK_LIB(compat, lsearch, AC_CHECK_HEADER(search.h, AC_DEFINE(HAVE_LSEARCH) [LIBS="${LIBS} -lcompat"], LIBOBJS="$LIBOBJS lsearch.o"), LIBOBJS="$LIBOBJS lsearch.o"))
 AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV), AC_FUNC_CHECK(putenv, AC_DEFINE(HAVE_PUTENV), LIBOBJS="$LIBOBJS putenv.o"))
 AC_CHECK_FUNC(utime, AC_DEFINE(HAVE_UTIME)