summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--regress/test-exec.sh24
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 @@
80 - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd. 80 - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd.
81 - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh] 81 - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]
82 Move the jot helper function to portable-specific part of test-exec.sh. 82 Move the jot helper function to portable-specific part of test-exec.sh.
83 - (dtucker) [regress/test-exec.sh] Move the portable-specific functions
84 together and add a couple of missing lines from openbsd.
83 85
8420130516 8620130516
85 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 87 - (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()
196jot() { 196jot() {
197 awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }" 197 awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
198} 198}
199
200# Check whether preprocessor symbols are defined in config.h.
201config_defined ()
202{
203 str=$1
204 while test "x$2" != "x" ; do
205 str="$str|$2"
206 shift
207 done
208 egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1
209}
199# End of portable specific functions 210# End of portable specific functions
200 211
212# helper
201cleanup () 213cleanup ()
202{ 214{
203 if [ -f $PIDFILE ]; then 215 if [ -f $PIDFILE ]; then
@@ -278,17 +290,6 @@ fatal ()
278 exit $RESULT 290 exit $RESULT
279} 291}
280 292
281# Check whether preprocessor symbols are defined in config.h.
282config_defined ()
283{
284 str=$1
285 while test "x$2" != "x" ; do
286 str="$str|$2"
287 shift
288 done
289 egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1
290}
291
292RESULT=0 293RESULT=0
293PIDFILE=$OBJ/pidfile 294PIDFILE=$OBJ/pidfile
294 295
@@ -336,6 +337,7 @@ Host *
336 ChallengeResponseAuthentication no 337 ChallengeResponseAuthentication no
337 HostbasedAuthentication no 338 HostbasedAuthentication no
338 PasswordAuthentication no 339 PasswordAuthentication no
340 RhostsRSAAuthentication no
339 BatchMode yes 341 BatchMode yes
340 StrictHostKeyChecking yes 342 StrictHostKeyChecking yes
341 LogLevel DEBUG3 343 LogLevel DEBUG3