diff options
author | Damien Miller <djm@mindrot.org> | 2005-05-04 15:33:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-05-04 15:33:09 +1000 |
commit | 4f10e25684fdbe00b9e563b510e03f9c2aa7a192 (patch) | |
tree | 1337ed6e6a35edd5c244b5f8a9d58cf947728cb2 | |
parent | 5b115d4401453a99313996dc48e6b8f3e54c5b54 (diff) | |
download | openssh-git-4f10e25684fdbe00b9e563b510e03f9c2aa7a192.tar.gz |
- (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@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -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 - (dtucker) [canohost.c] normalise socket addresses returned by get_remote_hostname(). This means that IPv4 addresses in log messages @@ -2470,4 +2474,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ @@ -1095,7 +1095,7 @@ ssh_control_listener(void) old_umask = umask(0177); if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { control_fd = -1; - if (errno == EINVAL) + if (errno == EINVAL || errno == EADDRINUSE) fatal("ControlSocket %s already exists", options.control_path); else |