diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-08-07 10:37:47 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-08-07 10:37:47 +0000 |
| commit | 92e3687754de0bf314e76407304c0d05105c42ab (patch) | |
| tree | a0a7be721d84df522787900e0f01bd26cc036853 /usr.bin/ssh | |
| parent | b485b5e55cb81496e84b1ea61dd6ba1000012cac (diff) | |
extended failure messages from galb@vandyke.com
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/authfd.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/authfd.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c index e18935ac625..da99f1bbeb9 100644 --- a/usr.bin/ssh/authfd.c +++ b/usr.bin/ssh/authfd.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.43 2001/08/01 22:03:33 markus Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.44 2001/08/07 10:37:46 markus Exp $"); #include <openssl/evp.h> @@ -58,7 +58,8 @@ int decode_reply(int type); /* macro to check for "agent failure" message */ #define agent_failed(x) \ - ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE)) + ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \ + (x == SSH2_AGENT_FAILURE)) /* Returns the number of the authentication fd, or -1 if there is none. */ @@ -583,6 +584,7 @@ decode_reply(int type) switch (type) { case SSH_AGENT_FAILURE: case SSH_COM_AGENT2_FAILURE: + case SSH2_AGENT_FAILURE: log("SSH_AGENT_FAILURE"); return 0; case SSH_AGENT_SUCCESS: diff --git a/usr.bin/ssh/authfd.h b/usr.bin/ssh/authfd.h index b7e88fde8e5..8075a7ebddf 100644 --- a/usr.bin/ssh/authfd.h +++ b/usr.bin/ssh/authfd.h @@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: authfd.h,v 1.20 2001/08/01 22:03:33 markus Exp $"); */ +/* RCSID("$OpenBSD: authfd.h,v 1.21 2001/08/07 10:37:46 markus Exp $"); */ #ifndef AUTHFD_H #define AUTHFD_H @@ -42,6 +42,9 @@ #define SSH_AGENTC_ADD_SMARTCARD_KEY 20 #define SSH_AGENTC_REMOVE_SMARTCARD_KEY 21 +/* extended failure messages */ +#define SSH2_AGENT_FAILURE 30 + /* additional error code for ssh.com's ssh-agent2 */ #define SSH_COM_AGENT2_FAILURE 102 |