2 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 620a635f6..f998c301c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,8 @@
  - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd.
  - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]
    Move the jot helper function to portable-specific part of test-exec.sh.
+ - (dtucker) [regress/test-exec.sh] Move the portable-specific functions
+   together and add a couple of missing lines from openbsd.
 
 20130516
  - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 910ed4f70..69e5042ba 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -196,8 +196,20 @@ have_prog()
 jot() {
         awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
 }
+
+# Check whether preprocessor symbols are defined in config.h.
+config_defined ()
+{
+        str=$1
+        while test "x$2" != "x" ; do
+                str="$str|$2"
+                shift
+        done
+        egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1
+}
 # End of portable specific functions
 
+# helper
 cleanup ()
 {
         if [ -f $PIDFILE ]; then
@@ -278,17 +290,6 @@ fatal ()
         exit $RESULT
 }
 
-# Check whether preprocessor symbols are defined in config.h.
-config_defined ()
-{
-        str=$1
-        while test "x$2" != "x" ; do
-                str="$str|$2"
-                shift
-        done
-        egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1
-}
-
 RESULT=0
 PIDFILE=$OBJ/pidfile
 
@@ -336,6 +337,7 @@ Host *
         ChallengeResponseAuthentication no
         HostbasedAuthentication no
         PasswordAuthentication  no
+        RhostsRSAAuthentication no
         BatchMode               yes
         StrictHostKeyChecking   yes
         LogLevel                DEBUG3