summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-15 23:04:50 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-15 23:04:50 +0000
commitc9a26364205602dab08fa6740185ad2a41550ea2 (patch)
tree2a4956429b07a364cbc6bad03a3f996c3fe8c18e
parentd0ff40847d8c84b2cad534080b97f81e0ec2deba (diff)
- markus@cvs.openbsd.org 2001/08/07 10:37:46
[authfd.c authfd.h] extended failure messages from galb@vandyke.com
-rw-r--r--ChangeLog6
-rw-r--r--authfd.c6
-rw-r--r--authfd.h5
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a97dbf1..302c7381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
20010815
- (bal) Fixed stray code in readconf.c that went in by mistake.
+ - OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2001/08/07 10:37:46
+ [authfd.c authfd.h]
+ extended failure messages from galb@vandyke.com
20010814
- (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
@@ -6289,4 +6293,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1475 2001/08/15 22:58:59 mouring Exp $
+$Id: ChangeLog,v 1.1476 2001/08/15 23:04:50 mouring Exp $
diff --git a/authfd.c b/authfd.c
index da4a32e0..2eb4513d 100644
--- a/authfd.c
+++ b/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. */
@@ -585,6 +586,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/authfd.h b/authfd.h
index b7e88fde..8075a7eb 100644
--- a/authfd.h
+++ b/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