diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh-agent.c | 6 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20020919 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - stevesk@cvs.openbsd.org 2002/09/12 19:11:52 | ||
4 | [ssh-agent.c] | ||
5 | %u for uid print; ok markus@ | ||
6 | |||
1 | 20020912 | 7 | 20020912 |
2 | - (djm) Made GNOME askpass programs return non-zero if cancel button is | 8 | - (djm) Made GNOME askpass programs return non-zero if cancel button is |
3 | pressed. | 9 | pressed. |
@@ -647,4 +653,4 @@ | |||
647 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 653 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
648 | ok provos@ | 654 | ok provos@ |
649 | 655 | ||
650 | $Id: ChangeLog,v 1.2463 2002/09/12 04:49:00 djm Exp $ | 656 | $Id: ChangeLog,v 1.2464 2002/09/19 01:46:58 djm Exp $ |
diff --git a/ssh-agent.c b/ssh-agent.c index d4c008bbf..77958cca0 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | #include "openbsd-compat/sys-queue.h" | 37 | #include "openbsd-compat/sys-queue.h" |
38 | RCSID("$OpenBSD: ssh-agent.c,v 1.103 2002/09/10 20:24:47 markus Exp $"); | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.104 2002/09/12 19:11:52 stevesk Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
@@ -835,8 +835,8 @@ after_select(fd_set *readset, fd_set *writeset) | |||
835 | } | 835 | } |
836 | if (getuid() != euid) { | 836 | if (getuid() != euid) { |
837 | error("uid mismatch: " | 837 | error("uid mismatch: " |
838 | "peer euid %d != uid %d", | 838 | "peer euid %u != uid %u", |
839 | (int) euid, (int) getuid()); | 839 | (u_int) euid, (u_int) getuid()); |
840 | close(sock); | 840 | close(sock); |
841 | break; | 841 | break; |
842 | } | 842 | } |