summaryrefslogtreecommitdiff
path: root/ssherr.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-01-28 21:15:47 +0000
committerDamien Miller <djm@mindrot.org>2015-01-29 09:08:07 +1100
commitfae7bbe544cba7a9e5e4ab47ff6faa3d978646eb (patch)
treea27a07031b600a1925a128bc0f5258a4b3ab2e8c /ssherr.c
parent1a3d14f6b44a494037c7deab485abe6496bf2c60 (diff)
downloadopenssh-git-fae7bbe544cba7a9e5e4ab47ff6faa3d978646eb.tar.gz
upstream commit
avoid fatal() calls in packet code makes ssh-keyscan more reliable against server failures ok dtucker@ markus@
Diffstat (limited to 'ssherr.c')
-rw-r--r--ssherr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ssherr.c b/ssherr.c
index 49fbb71d..0b79fbb0 100644
--- a/ssherr.c
+++ b/ssherr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssherr.c,v 1.1 2014/04/30 05:29:56 djm Exp $ */
+/* $OpenBSD: ssherr.c,v 1.2 2015/01/28 21:15:47 djm Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -125,6 +125,10 @@ ssh_err(int n)
return "KRL file has invalid magic number";
case SSH_ERR_KEY_REVOKED:
return "Key is revoked";
+ case SSH_ERR_CONN_CLOSED:
+ return "Connection closed";
+ case SSH_ERR_CONN_TIMEOUT:
+ return "Connection timed out";
default:
return "unknown error";
}