summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2005-05-10 10:28:11 +0000
committerdjm <djm@openbsd.org>2005-05-10 10:28:11 +0000
commitb38d043fb1de159ed4026627f63efed5d853609a (patch)
treea6d293c0abba927f51e0d3df307877a53e074c67 /usr.bin/ssh/ssh.c
parentkill strcpy; ok hshoexer@, prodded by david@ (diff)
downloadwireguard-openbsd-b38d043fb1de159ed4026627f63efed5d853609a.tar.xz
wireguard-openbsd-b38d043fb1de159ed4026627f63efed5d853609a.zip
print nice error message for EADDRINUSE as well
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 7910830f07e..f0d37d01b09 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.237 2005/04/26 13:08:37 jakob Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.238 2005/05/10 10:28:11 djm Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -1083,7 +1083,7 @@ ssh_control_listener(void)
old_umask = umask(0177);
if (bind(control_fd, (struct sockaddr*)&addr, addr.sun_len) == -1) {
control_fd = -1;
- if (errno == EINVAL)
+ if (errno == EINVAL || errno == EADDRINUSE)
fatal("ControlSocket %s already exists",
options.control_path);
else