summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-19 11:46:58 +1000
committerDamien Miller <djm@mindrot.org>2002-09-19 11:46:58 +1000
commitdb30b12d7b41565aa7215c7aa45709cda0b41ab3 (patch)
tree832b8979a3989c3ecf48535379373bb38921b41a
parent10f3085137e80c1b01b07a807cc40688738d5db5 (diff)
- (djm) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2002/09/12 19:11:52 [ssh-agent.c] %u for uid print; ok markus@
-rw-r--r--ChangeLog8
-rw-r--r--ssh-agent.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d7ca09db..c1c240a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20020919
+ - (djm) OpenBSD CVS Sync
+ - stevesk@cvs.openbsd.org 2002/09/12 19:11:52
+ [ssh-agent.c]
+ %u for uid print; ok markus@
+
20020912
- (djm) Made GNOME askpass programs return non-zero if cancel button is
pressed.
@@ -647,4 +653,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2463 2002/09/12 04:49:00 djm Exp $
+$Id: ChangeLog,v 1.2464 2002/09/19 01:46:58 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index d4c008bb..77958cca 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
#include "includes.h"
#include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.103 2002/09/10 20:24:47 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.104 2002/09/12 19:11:52 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
@@ -835,8 +835,8 @@ after_select(fd_set *readset, fd_set *writeset)
}
if (getuid() != euid) {
error("uid mismatch: "
- "peer euid %d != uid %d",
- (int) euid, (int) getuid());
+ "peer euid %u != uid %u",
+ (u_int) euid, (u_int) getuid());
close(sock);
break;
}