From 59d928d3b47e8298f4a8b4b3fb37fb8c8ce1b098 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 May 2013 15:32:29 +1000
Subject:    - dtucker@cvs.openbsd.org 2013/05/17 04:29:14     
 [regress/sftp.sh regress/putty-ciphers.sh regress/cipher-speed.sh     
 regress/test-exec.sh regress/sftp-batch.sh regress/dynamic-forward.sh     
 regress/putty-transfer.sh regress/conch-ciphers.sh regress/sftp-cmds.sh     
 regress/scp.sh regress/ssh-com-sftp.sh regress/rekey.sh     
 regress/putty-kex.sh regress/stderr-data.sh regress/stderr-after-eof.sh     
 regress/sftp-badcmds.sh regress/reexec.sh regress/ssh-com-client.sh     
 regress/sftp-chroot.sh regress/forwarding.sh regress/transfer.sh     
 regress/multiplex.sh]      Move the setting of DATA and COPY into
 test-exec.sh

---
 regress/reexec.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'regress/reexec.sh')

diff --git a/regress/reexec.sh b/regress/reexec.sh
index 9464eb699..5fff62a66 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -1,12 +1,10 @@
-#	$OpenBSD: reexec.sh,v 1.5 2004/10/08 02:01:50 djm Exp $
+#	$OpenBSD: reexec.sh,v 1.6 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="reexec tests"
 
-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
-SSHD_ORIG=$SSHD${EXEEXT}
-SSHD_COPY=$OBJ/sshd${EXEEXT}
+SSHD_ORIG=$SSHD
+SSHD_COPY=$OBJ/sshd
 
 # Start a sshd and then delete it
 start_sshd_copy ()
-- 
cgit v1.2.3


From 05b5e518c9969d63471f2ccfd85b1de6e724d30b Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 May 2013 20:41:07 +1000
Subject:    - dtucker@cvs.openbsd.org 2013/05/17 10:23:52     
 [regress/login-timeout.sh regress/reexec.sh regress/test-exec.sh]      Use
 SUDO when cat'ing pid files and running the sshd log wrapper so that      it
 works with a restrictive umask and the pid files are not world readable.     
 Changes from -portable.  (id sync only)

---
 ChangeLog                | 5 +++++
 regress/login-timeout.sh | 2 +-
 regress/reexec.sh        | 2 +-
 regress/test-exec.sh     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'regress/reexec.sh')

diff --git a/ChangeLog b/ChangeLog
index 72df13609..bf1c3b953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,11 @@
      [regress/try-ciphers.sh]
      use expr for math to keep diffs vs portable down
      (id sync only)
+   - dtucker@cvs.openbsd.org 2013/05/17 10:23:52
+     [regress/login-timeout.sh regress/reexec.sh regress/test-exec.sh]
+     Use SUDO when cat'ing pid files and running the sshd log wrapper so that
+     it works with a restrictive umask and the pid files are not world readable.
+     Changes from -portable.  (id sync only)
  - (dtucker) [regress/bsd.regress.mk] Remove unused file.  We've never used it
    in portable and it's long gone in openbsd.
  - (dtucker) [regress/integrity.sh].  Force fixed Diffie-Hellman key exchange
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
index 55fbb324d..d73923b9c 100644
--- a/regress/login-timeout.sh
+++ b/regress/login-timeout.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: login-timeout.sh,v 1.4 2005/02/27 23:13:36 djm Exp $
+#	$OpenBSD: login-timeout.sh,v 1.5 2013/05/17 10:23:52 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="connect after login grace timeout"
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 5fff62a66..433573f06 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: reexec.sh,v 1.6 2013/05/17 04:29:14 dtucker Exp $
+#	$OpenBSD: reexec.sh,v 1.7 2013/05/17 10:23:52 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="reexec tests"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index d336e6193..c9a9b64ee 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.42 2013/05/17 04:29:14 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.43 2013/05/17 10:23:52 dtucker Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
-- 
cgit v1.2.3