summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-12-06 16:32:47 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-12-06 16:32:47 +0000
commit65366a8c766c8a769d42aa6e66b70f4512b4b7c3 (patch)
treeec32d1fd8da3491d6da5a88cc0bb54db14ad907d /ssh-agent.c
parenteaffb9d6b6daafdfba60e76f766ed0dbf69c3d60 (diff)
- stevesk@cvs.openbsd.org 2001/11/17 19:14:34
[auth2.c auth.c readconf.c servconf.c ssh-agent.c ssh-keygen.c] enum/int type cleanup where it made sense to do so; ok markus@
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index a004e3246..dbef400c4 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $"); 39RCSID("$OpenBSD: ssh-agent.c,v 1.73 2001/11/17 19:14:34 stevesk Exp $");
40 40
41#include <openssl/evp.h> 41#include <openssl/evp.h>
42#include <openssl/md5.h> 42#include <openssl/md5.h>
@@ -61,11 +61,15 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $");
61#include "scard.h" 61#include "scard.h"
62#endif 62#endif
63 63
64typedef enum {
65 AUTH_UNUSED,
66 AUTH_SOCKET,
67 AUTH_CONNECTION
68} sock_type;
69
64typedef struct { 70typedef struct {
65 int fd; 71 int fd;
66 enum { 72 sock_type type;
67 AUTH_UNUSED, AUTH_SOCKET, AUTH_CONNECTION
68 } type;
69 Buffer input; 73 Buffer input;
70 Buffer output; 74 Buffer output;
71} SocketEntry; 75} SocketEntry;
@@ -627,7 +631,7 @@ process_message(SocketEntry *e)
627} 631}
628 632
629static void 633static void
630new_socket(int type, int fd) 634new_socket(sock_type type, int fd)
631{ 635{
632 u_int i, old_alloc; 636 u_int i, old_alloc;
633 if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) 637 if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)