summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-01-24 20:31:20 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-01-24 20:31:20 +0000
commitfb17f39fbc339e2d5e2a7aca0cd200695d2512cb (patch)
tree0d3389d02dafdbf8a2843388c5d115f34833d32c /usr.bin
parent8ab79768928e8c7d0a8be3bfe6cf4f810c9c047f (diff)
don't panic if client behaves strange. ok deraadt@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 0f270b4e598..616123e6f32 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -11,7 +11,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.80 2000/01/20 15:19:22 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.81 2000/01/24 20:31:19 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -230,6 +230,7 @@ grace_alarm_handler(int sig)
char *
get_authname(int type)
{
+ static char buf[1024];
switch (type) {
case SSH_CMSG_AUTH_PASSWORD:
return "password";
@@ -248,8 +249,8 @@ get_authname(int type)
return "s/key";
#endif
}
- fatal("get_authname: unknown auth %d: internal error", type);
- return NULL;
+ snprintf(buf, sizeof buf, "bad-auth-msg-%d", type);
+ return buf;
}
/*