lp:~jakobunt/ltsp/ldm-log-v2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ltsp-upstream/ltsp/ldm-trunk

Vagrant Cascadian: Pending requested 2014-09-22

Diff: 130 lines (+40/-18)

1 file modified

src/plugins/ssh/ssh.c (+40/-18)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Related blueprints

1566. By Jakob Unterwurzacher on 2014-09-22

ssh: Set ConnectTimeout=10

ConnectTimeout should be less than the timeout ssh_chat
passes to expect, so we get the error message from ssh
before expect gives up (30 seconds).

Also slightly increase the log level for spawning ssh to INFO.

1565. By Jakob Unterwurzacher on 2014-09-22

ssh: Make sure expect() notices if ssh dies after finding a match

Before this patch, the error message
"ssh: connect to host server port 22: Connection refused"
was sometime mistaken as a prompt because it contains a colon.
This caused a 30 second delay.

1564. By Jakob Unterwurzacher on 2014-09-22

ssh: expect() must handle EINTR

Otherwise, we do not capture the error message from ssh reliably as
select() may be interrupted by SIGCHLD before we read the message.

1563. By Jakob Unterwurzacher on 2014-09-22

ssh: Also log the error message from ssh

1562. By Jakob Unterwurzacher on 2014-09-22

ssh: De-duplicate message handling code

Clean-up step for the previous patch.

1561. By Jakob Unterwurzacher on 2014-09-22

ssh: Display specific error message if available

This way, we get a proper "Permission denied" for a wrong password.
Horrible code duplication is fixed in the next patch.

1560. By Jakob Unterwurzacher on 2014-09-22

ssh: Make expect() read all available data even if the child has exited

Implemented by checking if the child has exited *after* reading all
data. That way, we capture the error message.

1559. By Jakob Unterwurzacher on 2014-09-22

ssh: Remove superfluous timeout.tv_sec check in expect()

Timeout is already handled earlier. Checking for timeout.tv_sec == 0
is a bug as it may be zero under normal circumstances.

1558. By Vagrant Cascadian on 2014-09-11

Fix typo: conditionally enable "-nolisten tcp" based on LDM_DIRECTX.

1557. By Vagrant Cascadian on 2014-09-11

Disable listening on tcp, unless using LDM_DIRECTX. Thanks to Denis
Croombs for reporting the issue!