thr3ads.net - openssh unix dev - Final(?) changes committed [Aug 2010]

If this information is useful, please help other people find it:
Share via:

Damien Miller

2010-Aug-16 16:08 UTC

Final(?) changes committed

Hi,

In addition to the strptime change that Darren has just committed to
fix Irix, I have committed a change to ssh(1) that affects all platforms:
> - djm at cvs.openbsd.org 2010/08/12 21:49:44
>   [ssh.c]
>   close any extra file descriptors inherited from parent at start and
>   reopen stdin/stdout to /dev/null when forking for ControlPersist.
>   
>   prevents tools that fork and run a captive ssh for communication from
>   failing to exit when the ssh completes while they wait for these fds to
>   close. The inherited fds may persist arbitrarily long if a background
>   mux master has been started by ControlPersist. cvs and scp were effected
>   by this.
The problem that this fixed was tools like cvs(1) and scp(1) hanging
if they were the first connection to a server with ControlPersist active.
They would start a background ssh(1) to act as a mux master, and the
grandparent process (cvs or scp) would hang after the original parent
ssh(1) process had exited, waiting for the mux master process to close
its fds.

This is a low-risk change in my opinion, but I'd appreciate any tests that
you are willing to run. A snapshot with the strptime and ssh(1) change is
available at:

http://www.mindrot.org/openssh_snap/openssh-SNAP-20100817.tar.gz

Thanks,
Damien

Iain Morgan

2010-Aug-16 20:54 UTC

head link

Final(?) changes committed

On Mon, Aug 16, 2010 at 11:08:13 -0500, Damien Miller
wrote:> Hi,
> 
> In addition to the strptime change that Darren has just committed to
> fix Irix, I have committed a change to ssh(1) that affects all platforms:
> 
> > - djm at cvs.openbsd.org 2010/08/12 21:49:44
> >   [ssh.c]
> >   close any extra file descriptors inherited from parent at start and
> >   reopen stdin/stdout to /dev/null when forking for ControlPersist.
> >   
> >   prevents tools that fork and run a captive ssh for communication
from
> >   failing to exit when the ssh completes while they wait for these fds
to
> >   close. The inherited fds may persist arbitrarily long if a
background
> >   mux master has been started by ControlPersist. cvs and scp were
effected
> >   by this.
> 
> The problem that this fixed was tools like cvs(1) and scp(1) hanging
> if they were the first connection to a server with ControlPersist active.
> They would start a background ssh(1) to act as a mux master, and the
> grandparent process (cvs or scp) would hang after the original parent
> ssh(1) process had exited, waiting for the mux master process to close
> its fds.
> 
> This is a low-risk change in my opinion, but I'd appreciate any tests
that
> you are willing to run. A snapshot with the strptime and ssh(1) change is
> available at:
> 
> http://www.mindrot.org/openssh_snap/openssh-SNAP-20100817.tar.gz
> 
> Thanks,
> Damien
> _______________________________________________
The 20100817 snapshot builds and tests OK on the following platforms:


	RHEL 5/x86_64
	SLES 10/x86_64
	SLES 10/Itanium
	Solaris 9/SPARC
	Mac OS X 10.5.8/Intel

As before I had to modify regress/login-timeout.sh on the RHEL 5 system.
It seems to tickle a race condition most of the time. As before,
replacing "$SUDO kill `$SUDO cat $PIDFILE`" with "cleanup"
seems to fix
the issue. (Thus far, I haven't needed to modify regress/reexec.sh, but
in principle it could suffer from the same race condition.)

I should also note some typos in regress/README.regress. The file refers
to TEST_SSH_SSH_CONFOTPS and TEST_SSH_SSHD_CONFOTPS, whereas the scripts
use TEST_SSH_SSH{,D}_CONFOPTS.

-- 
Iain Morgan

Andy Tsouladze

2010-Aug-17 04:18 UTC

head link

Slackware-12 still fails three tests

I have re-run builds of openssh-SNAP-20100817.tar.gz on slackware-12.0 and 
slackware-13.0.  On 13.0, there both build and all tests run fine.


On slackware-12.0, openssh is built successfully, but three tests fail.  I 
had to test them individually (by removing successful ones from 
.../regress/Makefile).  I also put `set -x' as the first line of every 
problematic test file (banner.sh, stderr-data.sh, and stderr-after-eof.sh) 
Any chance this can be addressed before the release?

Below, I include the output from the three failed tests, run separately.

Output from running only banner test
------------------------------------
(cd openbsd-compat && make)
make[1]: Entering directory `/home/src/openssh/openbsd-compat'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/home/src/openssh/openbsd-compat'
BUILDDIR=`pwd`; \
 	[ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
 	[ -f `pwd`/regress/Makefile ]  || \
 	    ln -s `cd . && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
 	TEST_SHELL="sh"; \
 	TEST_SSH_SSH="${BUILDDIR}/ssh"; \
 	TEST_SSH_SSHD="${BUILDDIR}/sshd"; \
 	TEST_SSH_SSHAGENT="${BUILDDIR}/ssh-agent"; \
 	TEST_SSH_SSHADD="${BUILDDIR}/ssh-add"; \
 	TEST_SSH_SSHKEYGEN="${BUILDDIR}/ssh-keygen"; \
 	TEST_SSH_SSHPKCS11HELPER="${BUILDDIR}/ssh-pkcs11-helper"; \
 	TEST_SSH_SSHKEYSCAN="${BUILDDIR}/ssh-keyscan"; \
 	TEST_SSH_SFTP="${BUILDDIR}/sftp"; \
 	TEST_SSH_SFTPSERVER="${BUILDDIR}/sftp-server"; \
 	TEST_SSH_PLINK="plink"; \
 	TEST_SSH_PUTTYGEN="puttygen"; \
 	TEST_SSH_CONCH="conch"; \
 	TEST_SSH_IPV6="yes" ; \
 	cd ./regress || exit $?; \
 	make \
 		.OBJDIR="${BUILDDIR}/regress" \
 		.CURDIR="`pwd`" \
 		BUILDDIR="${BUILDDIR}" \
 		OBJ="${BUILDDIR}/regress/" \
 		PATH="${BUILDDIR}:${PATH}" \
 		TEST_SHELL="${TEST_SHELL}" \
 		TEST_SSH_SSH="${TEST_SSH_SSH}" \
 		TEST_SSH_SSHD="${TEST_SSH_SSHD}" \
 		TEST_SSH_SSHAGENT="${TEST_SSH_SSHAGENT}" \
 		TEST_SSH_SSHADD="${TEST_SSH_SSHADD}" \
 		TEST_SSH_SSHKEYGEN="${TEST_SSH_SSHKEYGEN}" \
 		TEST_SSH_SSHPKCS11HELPER="${TEST_SSH_SSHPKCS11HELPER}" \
 		TEST_SSH_SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}" \
 		TEST_SSH_SFTP="${TEST_SSH_SFTP}" \
 		TEST_SSH_SFTPSERVER="${TEST_SSH_SFTPSERVER}" \
 		TEST_SSH_PLINK="${TEST_SSH_PLINK}" \
 		TEST_SSH_PUTTYGEN="${TEST_SSH_PUTTYGEN}" \
 		TEST_SSH_CONCH="${TEST_SSH_CONCH}" \
 		TEST_SSH_IPV6="yes" \
 		EXEEXT="" \
 		tests && echo all tests passed
make[1]: Entering directory `/home/src/openssh/regress'
ssh-keygen -if /src/openssh/regress/rsa_ssh2.prv | diff -
/src/openssh/regress/rsa_openssh.prv
cat /src/openssh/regress/rsa_openssh.prv > /src/openssh/regress//t2.out
chmod 600 /src/openssh/regress//t2.out
ssh-keygen -yf /src/openssh/regress//t2.out | diff -
/src/openssh/regress/rsa_openssh.pub
ssh-keygen -ef /src/openssh/regress/rsa_openssh.pub
>/src/openssh/regress//rsa_secsh.pub
ssh-keygen -if /src/openssh/regress//rsa_secsh.pub | diff -
/src/openssh/regress/rsa_openssh.pub
rm -f /src/openssh/regress/rsa_secsh.pub
ssh-keygen -lf /src/openssh/regress/rsa_openssh.pub |\
 		awk '{print $2}' | diff - /src/openssh/regress/t4.ok
ssh-keygen -Bf /src/openssh/regress/rsa_openssh.pub |\
 		awk '{print $2}' | diff - /src/openssh/regress/t5.ok
ssh-keygen -if /src/openssh/regress/dsa_ssh2.prv >
/src/openssh/regress//t6.out1
ssh-keygen -if /src/openssh/regress/dsa_ssh2.pub >
/src/openssh/regress//t6.out2
chmod 600 /src/openssh/regress//t6.out1
ssh-keygen -yf /src/openssh/regress//t6.out1 | diff -
/src/openssh/regress//t6.out2
ssh-keygen -lf /src/openssh/regress//t7.out > /dev/null
ssh-keygen -Bf /src/openssh/regress//t7.out > /dev/null
run test banner.sh ...
++ tid=banner
++ echo 'Banner /src/openssh/regress/banner.in'
++ rm -f /src/openssh/regress/banner.out /src/openssh/regress/banner.in
/src/openssh/regress/empty.in
++ touch /src/openssh/regress/empty.in
++ trace 'test missing banner file'
++ echo 'trace: test missing banner file'
++ '[' X = Xyes ']'
++ verbose 'test banner: missing banner file'
++ echo 'verbose: test banner: missing banner file'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: missing banner file'
test banner: missing banner file
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/empty.in /src/openssh/regress/banner.out
cmp: EOF on /src/openssh/regress/empty.in
++ fail 'missing banner file'
++ echo 'FAIL: missing banner file'
++ RESULT=1
++ echo 'missing banner file'
missing banner file
++ for s in 0 10 100 1000 10000 100000
++ '[' 0 = 0 ']'
++ touch /src/openssh/regress/banner.in
++ trace 'test banner size 0'
++ echo 'trace: test banner size 0'
++ '[' X = Xyes ']'
++ verbose 'test banner: size 0'
++ echo 'verbose: test banner: size 0'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: size 0'
test banner: size 0
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
cmp: EOF on /src/openssh/regress/banner.in
++ fail 'banner size 0 mismatch'
++ echo 'FAIL: banner size 0 mismatch'
++ RESULT=1
++ echo 'banner size 0 mismatch'
banner size 0 mismatch
++ for s in 0 10 100 1000 10000 100000
++ '[' 10 = 0 ']'
++ '[' 10 = 10 ']'
++ echo abcdefghi
++ trace 'test banner size 10'
++ echo 'trace: test banner size 10'
++ '[' X = Xyes ']'
++ verbose 'test banner: size 10'
++ echo 'verbose: test banner: size 10'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: size 10'
test banner: size 10
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
/src/openssh/regress/banner.in /src/openssh/regress/banner.out differ: char 1,
line 1
++ fail 'banner size 10 mismatch'
++ echo 'FAIL: banner size 10 mismatch'
++ RESULT=1
++ echo 'banner size 10 mismatch'
banner size 10 mismatch
++ for s in 0 10 100 1000 10000 100000
++ '[' 100 = 0 ']'
++ '[' 100 = 10 ']'
++ cp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ trace 'test banner size 100'
++ echo 'trace: test banner size 100'
++ '[' X = Xyes ']'
++ verbose 'test banner: size 100'
++ echo 'verbose: test banner: size 100'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: size 100'
test banner: size 100
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
/src/openssh/regress/banner.in /src/openssh/regress/banner.out differ: char 1,
line 1
++ fail 'banner size 100 mismatch'
++ echo 'FAIL: banner size 100 mismatch'
++ RESULT=1
++ echo 'banner size 100 mismatch'
banner size 100 mismatch
++ for s in 0 10 100 1000 10000 100000
++ '[' 1000 = 0 ']'
++ '[' 1000 = 10 ']'
++ cp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ trace 'test banner size 1000'
++ echo 'trace: test banner size 1000'
++ '[' X = Xyes ']'
++ verbose 'test banner: size 1000'
++ echo 'verbose: test banner: size 1000'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: size 1000'
test banner: size 1000
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
/src/openssh/regress/banner.in /src/openssh/regress/banner.out differ: char 1,
line 1
++ fail 'banner size 1000 mismatch'
++ echo 'FAIL: banner size 1000 mismatch'
++ RESULT=1
++ echo 'banner size 1000 mismatch'
banner size 1000 mismatch
++ for s in 0 10 100 1000 10000 100000
++ '[' 10000 = 0 ']'
++ '[' 10000 = 10 ']'
++ cp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ trace 'test banner size 10000'
++ echo 'trace: test banner size 10000'
++ '[' X = Xyes ']'
++ verbose 'test banner: size 10000'
++ echo 'verbose: test banner: size 10000'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: size 10000'
test banner: size 10000
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
/src/openssh/regress/banner.in /src/openssh/regress/banner.out differ: char 1,
line 1
++ fail 'banner size 10000 mismatch'
++ echo 'FAIL: banner size 10000 mismatch'
++ RESULT=1
++ echo 'banner size 10000 mismatch'
banner size 10000 mismatch
++ for s in 0 10 100 1000 10000 100000
++ '[' 100000 = 0 ']'
++ '[' 100000 = 10 ']'
++ cp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ for i in 0 1 2 3 4 5 6 7 8
++ cat /src/openssh/regress/banner.out
++ trace 'test banner size 100000'
++ echo 'trace: test banner size 100000'
++ '[' X = Xyes ']'
++ verbose 'test banner: size 100000'
++ echo 'verbose: test banner: size 100000'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: size 100000'
test banner: size 100000
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/banner.in /src/openssh/regress/banner.out
/src/openssh/regress/banner.in /src/openssh/regress/banner.out differ: char 1,
line 1
++ fail 'banner size 100000 mismatch'
++ echo 'FAIL: banner size 100000 mismatch'
++ RESULT=1
++ echo 'banner size 100000 mismatch'
banner size 100000 mismatch
++ trace 'test suppress banner (-q)'
++ echo 'trace: test suppress banner (-q)'
++ '[' X = Xyes ']'
++ verbose 'test banner: suppress banner (-q)'
++ echo 'verbose: test banner: suppress banner (-q)'
++ '[' X '!=' Xyes ']'
++ echo 'test banner: suppress banner (-q)'
test banner: suppress banner (-q)
++ /src/openssh/ssh -q -2 -F /src/openssh/regress/ssh_proxy otherhost true
++ cmp /src/openssh/regress/empty.in /src/openssh/regress/banner.out
cmp: EOF on /src/openssh/regress/empty.in
++ fail 'suppress banner (-q)'
++ echo 'FAIL: suppress banner (-q)'
++ RESULT=1
++ echo 'suppress banner (-q)'
suppress banner (-q)
++ rm -f /src/openssh/regress/banner.out /src/openssh/regress/banner.in
/src/openssh/regress/empty.in
+ cleanup
+ '[' -f /src/openssh/regress/pidfile ']'
+ '[' 1 -eq 0 ']'
+ echo failed banner
failed banner
+ exit 1
make[1]: *** [t-exec] Error 1
make[1]: Leaving directory `/home/src/openssh/regress'
make: *** [tests] Error 2
-----------------------------------------

Output from running only stderr-data test
-----------------------------------------
(cd openbsd-compat && make)
make[1]: Entering directory `/home/src/openssh/openbsd-compat'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/home/src/openssh/openbsd-compat'
BUILDDIR=`pwd`; \
 	[ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
 	[ -f `pwd`/regress/Makefile ]  || \
 	    ln -s `cd . && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
 	TEST_SHELL="sh"; \
 	TEST_SSH_SSH="${BUILDDIR}/ssh"; \
 	TEST_SSH_SSHD="${BUILDDIR}/sshd"; \
 	TEST_SSH_SSHAGENT="${BUILDDIR}/ssh-agent"; \
 	TEST_SSH_SSHADD="${BUILDDIR}/ssh-add"; \
 	TEST_SSH_SSHKEYGEN="${BUILDDIR}/ssh-keygen"; \
 	TEST_SSH_SSHPKCS11HELPER="${BUILDDIR}/ssh-pkcs11-helper"; \
 	TEST_SSH_SSHKEYSCAN="${BUILDDIR}/ssh-keyscan"; \
 	TEST_SSH_SFTP="${BUILDDIR}/sftp"; \
 	TEST_SSH_SFTPSERVER="${BUILDDIR}/sftp-server"; \
 	TEST_SSH_PLINK="plink"; \
 	TEST_SSH_PUTTYGEN="puttygen"; \
 	TEST_SSH_CONCH="conch"; \
 	TEST_SSH_IPV6="yes" ; \
 	cd ./regress || exit $?; \
 	make \
 		.OBJDIR="${BUILDDIR}/regress" \
 		.CURDIR="`pwd`" \
 		BUILDDIR="${BUILDDIR}" \
 		OBJ="${BUILDDIR}/regress/" \
 		PATH="${BUILDDIR}:${PATH}" \
 		TEST_SHELL="${TEST_SHELL}" \
 		TEST_SSH_SSH="${TEST_SSH_SSH}" \
 		TEST_SSH_SSHD="${TEST_SSH_SSHD}" \
 		TEST_SSH_SSHAGENT="${TEST_SSH_SSHAGENT}" \
 		TEST_SSH_SSHADD="${TEST_SSH_SSHADD}" \
 		TEST_SSH_SSHKEYGEN="${TEST_SSH_SSHKEYGEN}" \
 		TEST_SSH_SSHPKCS11HELPER="${TEST_SSH_SSHPKCS11HELPER}" \
 		TEST_SSH_SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}" \
 		TEST_SSH_SFTP="${TEST_SSH_SFTP}" \
 		TEST_SSH_SFTPSERVER="${TEST_SSH_SFTPSERVER}" \
 		TEST_SSH_PLINK="${TEST_SSH_PLINK}" \
 		TEST_SSH_PUTTYGEN="${TEST_SSH_PUTTYGEN}" \
 		TEST_SSH_CONCH="${TEST_SSH_CONCH}" \
 		TEST_SSH_IPV6="yes" \
 		EXEEXT="" \
 		tests && echo all tests passed
make[1]: Entering directory `/home/src/openssh/regress'
ssh-keygen -if /src/openssh/regress/rsa_ssh2.prv | diff -
/src/openssh/regress/rsa_openssh.prv
cat /src/openssh/regress/rsa_openssh.prv > /src/openssh/regress//t2.out
chmod 600 /src/openssh/regress//t2.out
ssh-keygen -yf /src/openssh/regress//t2.out | diff -
/src/openssh/regress/rsa_openssh.pub
ssh-keygen -ef /src/openssh/regress/rsa_openssh.pub
>/src/openssh/regress//rsa_secsh.pub
ssh-keygen -if /src/openssh/regress//rsa_secsh.pub | diff -
/src/openssh/regress/rsa_openssh.pub
rm -f /src/openssh/regress/rsa_secsh.pub
ssh-keygen -lf /src/openssh/regress/rsa_openssh.pub |\
 		awk '{print $2}' | diff - /src/openssh/regress/t4.ok
ssh-keygen -Bf /src/openssh/regress/rsa_openssh.pub |\
 		awk '{print $2}' | diff - /src/openssh/regress/t5.ok
ssh-keygen -if /src/openssh/regress/dsa_ssh2.prv >
/src/openssh/regress//t6.out1
ssh-keygen -if /src/openssh/regress/dsa_ssh2.pub >
/src/openssh/regress//t6.out2
chmod 600 /src/openssh/regress//t6.out1
ssh-keygen -yf /src/openssh/regress//t6.out1 | diff -
/src/openssh/regress//t6.out2
ssh-keygen -lf /src/openssh/regress//t7.out > /dev/null
ssh-keygen -Bf /src/openssh/regress//t7.out > /dev/null
run test stderr-data.sh ...
++ tid='stderr data transfer'
++ DATA=/bin/ls
++ COPY=/src/openssh/regress/copy
++ rm -f /src/openssh/regress/copy
++ for n in ''\'''\''' -n
++ for p in 1 2
++ verbose 'test stderr data transfer: proto 1 ()'
++ echo 'verbose: test stderr data transfer: proto 1 ()'
++ '[' X '!=' Xyes ']'
++ echo 'test stderr data transfer: proto 1 ()'
test stderr data transfer: proto 1 ()
++ /src/openssh/ssh -1 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''exec > /dev/null; sleep 3; cat /bin/ls 1>&2
'\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ /src/openssh/ssh -1 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''echo a; exec > /dev/null; sleep 3; cat /bin/ls
1>&2 '\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ for p in 1 2
++ verbose 'test stderr data transfer: proto 2 ()'
++ echo 'verbose: test stderr data transfer: proto 2 ()'
++ '[' X '!=' Xyes ']'
++ echo 'test stderr data transfer: proto 2 ()'
test stderr data transfer: proto 2 ()
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''exec > /dev/null; sleep 3; cat /bin/ls 1>&2
'\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''echo a; exec > /dev/null; sleep 3; cat /bin/ls
1>&2 '\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ for n in ''\'''\''' -n
++ for p in 1 2
++ verbose 'test stderr data transfer: proto 1 (-n)'
++ echo 'verbose: test stderr data transfer: proto 1 (-n)'
++ '[' X '!=' Xyes ']'
++ echo 'test stderr data transfer: proto 1 (-n)'
test stderr data transfer: proto 1 (-n)
++ /src/openssh/ssh -n -1 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''exec > /dev/null; sleep 3; cat /bin/ls 1>&2
'\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ /src/openssh/ssh -n -1 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''echo a; exec > /dev/null; sleep 3; cat /bin/ls
1>&2 '\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ for p in 1 2
++ verbose 'test stderr data transfer: proto 2 (-n)'
++ echo 'verbose: test stderr data transfer: proto 2 (-n)'
++ '[' X '!=' Xyes ']'
++ echo 'test stderr data transfer: proto 2 (-n)'
test stderr data transfer: proto 2 (-n)
++ /src/openssh/ssh -n -2 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''exec > /dev/null; sleep 3; cat /bin/ls 1>&2
'\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
++ /src/openssh/ssh -n -2 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''echo a; exec > /dev/null; sleep 3; cat /bin/ls
1>&2 '\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ cmp /bin/ls /src/openssh/regress/copy
/bin/ls /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/copy
+ cleanup
+ '[' -f /src/openssh/regress/pidfile ']'
+ '[' 1 -eq 0 ']'
+ echo failed stderr data transfer
failed stderr data transfer
+ exit 1
make[1]: *** [t-exec] Error 1
make[1]: Leaving directory `/home/src/openssh/regress'
make: *** [tests] Error 2
-----------------------------------------

Output from running only stderr-after-eof test
-----------------------------------------
(cd openbsd-compat && make)
make[1]: Entering directory `/home/src/openssh/openbsd-compat'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/home/src/openssh/openbsd-compat'
BUILDDIR=`pwd`; \
 	[ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
 	[ -f `pwd`/regress/Makefile ]  || \
 	    ln -s `cd . && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
 	TEST_SHELL="sh"; \
 	TEST_SSH_SSH="${BUILDDIR}/ssh"; \
 	TEST_SSH_SSHD="${BUILDDIR}/sshd"; \
 	TEST_SSH_SSHAGENT="${BUILDDIR}/ssh-agent"; \
 	TEST_SSH_SSHADD="${BUILDDIR}/ssh-add"; \
 	TEST_SSH_SSHKEYGEN="${BUILDDIR}/ssh-keygen"; \
 	TEST_SSH_SSHPKCS11HELPER="${BUILDDIR}/ssh-pkcs11-helper"; \
 	TEST_SSH_SSHKEYSCAN="${BUILDDIR}/ssh-keyscan"; \
 	TEST_SSH_SFTP="${BUILDDIR}/sftp"; \
 	TEST_SSH_SFTPSERVER="${BUILDDIR}/sftp-server"; \
 	TEST_SSH_PLINK="plink"; \
 	TEST_SSH_PUTTYGEN="puttygen"; \
 	TEST_SSH_CONCH="conch"; \
 	TEST_SSH_IPV6="yes" ; \
 	cd ./regress || exit $?; \
 	make \
 		.OBJDIR="${BUILDDIR}/regress" \
 		.CURDIR="`pwd`" \
 		BUILDDIR="${BUILDDIR}" \
 		OBJ="${BUILDDIR}/regress/" \
 		PATH="${BUILDDIR}:${PATH}" \
 		TEST_SHELL="${TEST_SHELL}" \
 		TEST_SSH_SSH="${TEST_SSH_SSH}" \
 		TEST_SSH_SSHD="${TEST_SSH_SSHD}" \
 		TEST_SSH_SSHAGENT="${TEST_SSH_SSHAGENT}" \
 		TEST_SSH_SSHADD="${TEST_SSH_SSHADD}" \
 		TEST_SSH_SSHKEYGEN="${TEST_SSH_SSHKEYGEN}" \
 		TEST_SSH_SSHPKCS11HELPER="${TEST_SSH_SSHPKCS11HELPER}" \
 		TEST_SSH_SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}" \
 		TEST_SSH_SFTP="${TEST_SSH_SFTP}" \
 		TEST_SSH_SFTPSERVER="${TEST_SSH_SFTPSERVER}" \
 		TEST_SSH_PLINK="${TEST_SSH_PLINK}" \
 		TEST_SSH_PUTTYGEN="${TEST_SSH_PUTTYGEN}" \
 		TEST_SSH_CONCH="${TEST_SSH_CONCH}" \
 		TEST_SSH_IPV6="yes" \
 		EXEEXT="" \
 		tests && echo all tests passed
make[1]: Entering directory `/home/src/openssh/regress'
ssh-keygen -if /src/openssh/regress/rsa_ssh2.prv | diff -
/src/openssh/regress/rsa_openssh.prv
cat /src/openssh/regress/rsa_openssh.prv > /src/openssh/regress//t2.out
chmod 600 /src/openssh/regress//t2.out
ssh-keygen -yf /src/openssh/regress//t2.out | diff -
/src/openssh/regress/rsa_openssh.pub
ssh-keygen -ef /src/openssh/regress/rsa_openssh.pub
>/src/openssh/regress//rsa_secsh.pub
ssh-keygen -if /src/openssh/regress//rsa_secsh.pub | diff -
/src/openssh/regress/rsa_openssh.pub
rm -f /src/openssh/regress/rsa_secsh.pub
ssh-keygen -lf /src/openssh/regress/rsa_openssh.pub |\
 		awk '{print $2}' | diff - /src/openssh/regress/t4.ok
ssh-keygen -Bf /src/openssh/regress/rsa_openssh.pub |\
 		awk '{print $2}' | diff - /src/openssh/regress/t5.ok
ssh-keygen -if /src/openssh/regress/dsa_ssh2.prv >
/src/openssh/regress//t6.out1
ssh-keygen -if /src/openssh/regress/dsa_ssh2.pub >
/src/openssh/regress//t6.out2
chmod 600 /src/openssh/regress//t6.out1
ssh-keygen -yf /src/openssh/regress//t6.out1 | diff -
/src/openssh/regress//t6.out2
ssh-keygen -lf /src/openssh/regress//t7.out > /dev/null
ssh-keygen -Bf /src/openssh/regress//t7.out > /dev/null
run test stderr-after-eof.sh ...
++ tid='stderr data after eof'
++ DATA=/etc/motd
++ DATA=/src/openssh/regress/data
++ COPY=/src/openssh/regress/copy
++ have_prog md5sum
++ saved_IFS=' 
'
++ IFS=:
++ for i in '$PATH'
++ '[' -x /src/openssh/md5sum ']'
++ for i in '$PATH'
++ '[' -x /usr/local/bin/md5sum ']'
++ for i in '$PATH'
++ '[' -x /opt/kde/bin/md5sum ']'
++ for i in '$PATH'
++ '[' -x /bin/md5sum ']'
++ IFS=' 
'
++ return 0
++ CHECKSUM=md5sum
++ rm -f /src/openssh/regress/data /src/openssh/regress/copy
++ cp /dev/null /src/openssh/regress/data
++ for i in 1 2 3 4 5 6
++ date
++ md5sum
++ echo 1
++ for i in 1 2 3 4 5 6
++ date
++ echo 2
++ md5sum
++ for i in 1 2 3 4 5 6
++ date
++ md5sum
++ echo 3
++ for i in 1 2 3 4 5 6
++ date
++ md5sum
++ echo 4
++ for i in 1 2 3 4 5 6
++ date
++ md5sum
++ echo 5
++ for i in 1 2 3 4 5 6
++ date
++ md5sum
++ echo 6
++ /src/openssh/ssh -2 -F /src/openssh/regress/ssh_proxy otherhost exec sh -c
''\''exec > /dev/null; sleep 2; cat /src/openssh/regress/data
1>&2 '\'''
++ r=0
++ '[' 0 -ne 0 ']'
++ egrep 'Disconnecting: Received extended_data after EOF'
/src/openssh/regress/copy
++ cmp /src/openssh/regress/data /src/openssh/regress/copy
/src/openssh/regress/data /src/openssh/regress/copy differ: char 1, line 1
++ fail 'stderr corrupt'
++ echo 'FAIL: stderr corrupt'
++ RESULT=1
++ echo 'stderr corrupt'
stderr corrupt
++ rm -f /src/openssh/regress/data /src/openssh/regress/copy
+ cleanup
+ '[' -f /src/openssh/regress/pidfile ']'
+ '[' 1 -eq 0 ']'
+ echo failed stderr data after eof
failed stderr data after eof
+ exit 1
make[1]: *** [t-exec] Error 1
make[1]: Leaving directory `/home/src/openssh/regress'
make: *** [tests] Error 2
----------------------------------------

Thanks,

Andy

Dr Andy Tsouladze
Sr Unix/Storage SysAdmin

Corinna Vinschen

2010-Aug-17 07:26 UTC

head link

Final(?) changes committed

On Aug 17 02:08, Damien Miller wrote:> Hi,
> 
> In addition to the strptime change that Darren has just committed to
> fix Irix, I have committed a change to ssh(1) that affects all platforms:
> 
> > - djm at cvs.openbsd.org 2010/08/12 21:49:44
> >   [ssh.c]
> >   close any extra file descriptors inherited from parent at start and
> >   reopen stdin/stdout to /dev/null when forking for ControlPersist.
> >   
> >   prevents tools that fork and run a captive ssh for communication
from
> >   failing to exit when the ssh completes while they wait for these fds
to
> >   close. The inherited fds may persist arbitrarily long if a
background
> >   mux master has been started by ControlPersist. cvs and scp were
effected
> >   by this.
> 
> The problem that this fixed was tools like cvs(1) and scp(1) hanging
> if they were the first connection to a server with ControlPersist active.
> They would start a background ssh(1) to act as a mux master, and the
> grandparent process (cvs or scp) would hang after the original parent
> ssh(1) process had exited, waiting for the mux master process to close
> its fds.
> 
> This is a low-risk change in my opinion, but I'd appreciate any tests
that
> you are willing to run. A snapshot with the strptime and ssh(1) change is
> available at:
> 
> http://www.mindrot.org/openssh_snap/openssh-SNAP-20100817.tar.gz
Builds and tests fine on Cygwin, with the usual sftp-glob exception.


Corinna

-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat

Kevin Brott

2010-Aug-17 19:24 UTC

head link

Final(?) changes committed

Using openssh-SNAP-20100817.tar.gz
./configure && make tests

 OS             Build_Target             CC               OpenSSL BUILDS
TESTS
 ============== ======================== ================ =======
=============================== Ubuntu 6.06.2  i686-pc-linux-gnu        gcc
4.0.3         0.9.8a   YES  all
tests passed
 Ubuntu 7.10    i686-pc-linux-gnu        gcc 4.1.3         0.9.8n   YES  all
tests passed
 Ubuntu 10.04.1 x86_64-unknown-linux-gnu gcc 4.4.3         0.9.8k   YES  all
tests passed
 AIX 5.2 sp10   powerpc-ibm-aix5.2.0.0   gcc 3.3.2         0.9.8f   YES  all
tests passed
 AIX 5.3 sp7    powerpc-ibm-aix5.3.0.0   gcc 4.2.0         0.9.8k   YES  all
tests passed
 AIX 6.1 sp4    powerpc-ibm-aix6.1.0.0   gcc 4.2.0         0.9.8k   YES  all
tests passed
 HP-UX 11.11    hppa2.0w-hp-hpux11.11    gcc 3.4.3         0.9.7m   YES  all
tests passed
 HP-UX 11.23    ia64-hp-hpux11.23        gcc 4.1.1         0.9.7m   *1*  all
tests passed
 HP-UX 11.31    ia64-hp-hpux11.31        gcc 4.3.3         0.9.8l   YES  all
tests passed
 HP-UX 11.31    ia64-hp-hpux11.31        HP C/aC++ A.06.20 0.9.8l   YES  all
tests passed
 RH 6.2         i686-pc-linux-gnu        egcs-2.91.66      0.9.8j   YES  all
tests passed
 RH 8.0         i686-pc-linux-gnu        gcc 3.2.2         0.9.7a   YES  all
tests passed
 RHEL 2.1       i686-pc-linux-gnu        gcc 2.9.6         0.9.8n  *2*3* all
tests passed
 RHEL 3.0 tu6   i686-pc-linux-gnu        gcc 3.2.3         0.9.7a   YES  all
tests passed
 RHEL 4.0 nu5   i686-pc-linux-gnu        gcc 3.4.6         0.9.7a   *3*  all
tests passed
 RHEL 5.4       x86_64-redhat-linux      gcc 4.1.2         0.9.8e   YES  all
tests passed
 FedoraCore r2  i686-pc-linux-gnu        gcc 3.3.3         0.9.7a   *3*  all
tests passed

*1* HP-UX 11.23 on ia64 required --disable-utmpx to build
*2* OS shipped with openssl 0.9.6b & openssh 5.6 will not configure/build \
       however, building against 0.9.8n installed in local/tmp directory
works
*3* OS shipped with an old version of zlib - openssh will build/compile/run
\
       using --without-zlib-version-check

====On Mon, Aug 16, 2010 at 09:08, Damien Miller <djm at mindrot.org>
wrote:
> Hi,
>
> In addition to the strptime change that Darren has just committed to
> fix Irix, I have committed a change to ssh(1) that affects all platforms:
>
> > - djm at cvs.openbsd.org 2010/08/12 21:49:44
> >   [ssh.c]
> >   close any extra file descriptors inherited from parent at start and
> >   reopen stdin/stdout to /dev/null when forking for ControlPersist.
> >
> >   prevents tools that fork and run a captive ssh for communication
from
> >   failing to exit when the ssh completes while they wait for these fds
to
> >   close. The inherited fds may persist arbitrarily long if a
background
> >   mux master has been started by ControlPersist. cvs and scp were
> effected
> >   by this.
>
> The problem that this fixed was tools like cvs(1) and scp(1) hanging
> if they were the first connection to a server with ControlPersist active.
> They would start a background ssh(1) to act as a mux master, and the
> grandparent process (cvs or scp) would hang after the original parent
> ssh(1) process had exited, waiting for the mux master process to close
> its fds.
>
> This is a low-risk change in my opinion, but I'd appreciate any tests
that
> you are willing to run. A snapshot with the strptime and ssh(1) change is
> available at:
>
> http://www.mindrot.org/openssh_snap/openssh-SNAP-20100817.tar.gz
>
> Thanks,
> Damien
> _______________________________________________
> openssh-unix-dev mailing list
> openssh-unix-dev at mindrot.org
> https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
>


-- 
# include <stddisclaimer.h>
/* Kevin  Brott <Kevin.Brott at gmail.com> */

Possibly Parallel Threads

Search for more reasonably related threads

openssh unix dev - Aug 2010 - Final(?) changes committed

Final(?) changes committed

Final(?) changes committed

Slackware-12 still fails three tests

Final(?) changes committed

Final(?) changes committed

Possibly Parallel Threads