- (dtucker) [regress/test-exec.sh] Move the portable-specific functions

together and add a couple of missing lines from openbsd.
This commit is contained in:
Darren Tucker 2013-05-17 19:28:51 +10:00
parent 5f1a89a3b6
commit 6f66981ed3
2 changed files with 15 additions and 11 deletions

View File

@ -80,6 +80,8 @@
- (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd. - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd.
- (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh] - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]
Move the jot helper function to portable-specific part of 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 20130516
- (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be

View File

@ -196,8 +196,20 @@ have_prog()
jot() { jot() {
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }" 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 # End of portable specific functions
# helper
cleanup () cleanup ()
{ {
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then
@ -278,17 +290,6 @@ fatal ()
exit $RESULT 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 RESULT=0
PIDFILE=$OBJ/pidfile PIDFILE=$OBJ/pidfile
@ -336,6 +337,7 @@ Host *
ChallengeResponseAuthentication no ChallengeResponseAuthentication no
HostbasedAuthentication no HostbasedAuthentication no
PasswordAuthentication no PasswordAuthentication no
RhostsRSAAuthentication no
BatchMode yes BatchMode yes
StrictHostKeyChecking yes StrictHostKeyChecking yes
LogLevel DEBUG3 LogLevel DEBUG3