tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 17:25:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used

Browse Source 
unix domain socket, so catch that too; from jakob@ ok dtucker@
This commit is contained in:
Damien Miller 2005-05-04 15:33:09 +10:00
parent 5b115d4401
commit 4f10e25684
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20050504
- (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used
unix domain socket, so catch that too; from jakob@ ok dtucker@
20050503 20050503
- (dtucker) [canohost.c] normalise socket addresses returned by - (dtucker) [canohost.c] normalise socket addresses returned by
get_remote_hostname(). This means that IPv4 addresses in log messages get_remote_hostname(). This means that IPv4 addresses in log messages
@ -2470,4 +2474,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3752 2005/05/03 09:05:32 dtucker Exp $ $Id: ChangeLog,v 1.3753 2005/05/04 05:33:09 djm Exp $

2
ssh.c
View File

@ -1095,7 +1095,7 @@ ssh_control_listener(void)
old_umask = umask(0177); old_umask = umask(0177);
if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
control_fd = -1; control_fd = -1;
if (errno == EINVAL) if (errno == EINVAL || errno == EADDRINUSE)
fatal("ControlSocket %s already exists", fatal("ControlSocket %s already exists",
options.control_path); options.control_path);
else else