diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-17 23:40:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-17 23:40:15 +1100 |
commit | 7684ee17ee96426970c00cb44d9d00b6611b9a57 (patch) | |
tree | cb447b6e9d3fdc10b3e66a90b198092d7245447a /ssh-agent.c | |
parent | d6121d2972c1a6924f6d186ea04eefe9dab774ef (diff) |
- OpenBSD CVS updates:
- [atomicio.c auth-krb4.c bufaux.c channels.c compress.c fingerprint.c]
[packet.h radix.c rsa.c scp.c ssh-agent.c ssh-keygen.c sshconnect.c]
[sshd.c]
pedantic: signed vs. unsigned, void*-arithm, etc
- [ssh.1 sshd.8]
Various cleanups and standardizations.
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 8a69b1d08..459fa39f3 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "includes.h" | 11 | #include "includes.h" |
12 | RCSID("$OpenBSD: ssh-agent.c,v 1.25 2000/01/02 21:51:03 markus Exp $"); | 12 | RCSID("$OpenBSD: ssh-agent.c,v 1.26 2000/03/16 20:56:14 markus Exp $"); |
13 | 13 | ||
14 | #include "ssh.h" | 14 | #include "ssh.h" |
15 | #include "rsa.h" | 15 | #include "rsa.h" |
@@ -417,6 +417,7 @@ after_select(fd_set *readset, fd_set *writeset) | |||
417 | { | 417 | { |
418 | unsigned int i; | 418 | unsigned int i; |
419 | int len, sock; | 419 | int len, sock; |
420 | socklen_t slen; | ||
420 | char buf[1024]; | 421 | char buf[1024]; |
421 | struct sockaddr_un sunaddr; | 422 | struct sockaddr_un sunaddr; |
422 | 423 | ||
@@ -426,8 +427,8 @@ after_select(fd_set *readset, fd_set *writeset) | |||
426 | break; | 427 | break; |
427 | case AUTH_SOCKET: | 428 | case AUTH_SOCKET: |
428 | if (FD_ISSET(sockets[i].fd, readset)) { | 429 | if (FD_ISSET(sockets[i].fd, readset)) { |
429 | len = sizeof(sunaddr); | 430 | slen = sizeof(sunaddr); |
430 | sock = accept(sockets[i].fd, (struct sockaddr *) & sunaddr, &len); | 431 | sock = accept(sockets[i].fd, (struct sockaddr *) & sunaddr, &slen); |
431 | if (sock < 0) { | 432 | if (sock < 0) { |
432 | perror("accept from AUTH_SOCKET"); | 433 | perror("accept from AUTH_SOCKET"); |
433 | break; | 434 | break; |