merge 5.7p1

1 files changed, 4 insertions, 5 deletions

diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index 5d7f73291..faf654c04 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -7,10 +7,9 @@ UNPRIV=nobody
 ASOCK=${OBJ}/agent
 SSH_AUTH_SOCK=/nonexistent
 
-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
+if config_defined HAVE_GETPEEREID HAVE_GETPEERUCRED HAVE_SO_PEERCRED ; then
+        :
+else
         echo "skipped (not supported on this platform)"
         exit 0
 fi
@@ -34,7 +33,7 @@ else
                 fail "ssh-add failed with $r != 1"
         fi
 
-        < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1
+        < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l 2>/dev/null
         r=$?
         if [ $r -lt 2 ]; then
                 fail "ssh-add did not fail for ${UNPRIV}: $r < 2"