From: dtucker <dtucker>
Date: Wed, 21 Mar 2007 10:45:48 +0000 (+0000)
Subject:  - (dtucker) [regress/agent-getpeereid.sh] Do peereid test if we have
X-Git-Tag: V_4_7_P1~94
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/aee1c9719a6385524726c3023e4110f8655a0780

 - (dtucker) [regress/agent-getpeereid.sh] Do peereid test if we have
   HAVE_GETPEERUCRED too.  Also from Jan Pechanec.
---

diff --git a/ChangeLog b/ChangeLog
index 2431f893..8483fe6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
  - (dtucker) [configure.ac openbsd-compat/bsd-getpeereid.c] Bug #1287: Use
    getpeerucred to implement getpeereid (currently only Solaris 10 and up).
    Patch by Jan.Pechanec at Sun.
+ - (dtucker) [regress/agent-getpeereid.sh] Do peereid test if we have
+   HAVE_GETPEERUCRED too.  Also from Jan Pechanec.
 
 20070313
  - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index e5fcedda..d7132424 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -7,7 +7,9 @@ UNPRIV=nobody
 ASOCK=${OBJ}/agent
 SSH_AUTH_SOCK=/nonexistant
 
-if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1
+if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1 && \
+	grep "#undef.*HAVE_GETPEERUCRED" ${BUILDDIR}/config.h >/dev/null && \
+	grep "#undef.*HAVE_SO_PEERCRED" ${BUILDDIR}/config.h >/dev/null
 then
 	echo "skipped (not supported on this platform)"
 	exit 0