- (djm) OpenBSD CVS Sync

- stevesk@cvs.openbsd.org 2002/09/12 19:11:52
     [ssh-agent.c]
     %u for uid print; ok markus@
This commit is contained in:
Damien Miller 2002-09-19 11:46:58 +10:00
parent 10f3085137
commit db30b12d7b
2 changed files with 10 additions and 4 deletions

View File

@ -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 20020912
- (djm) Made GNOME askpass programs return non-zero if cancel button is - (djm) Made GNOME askpass programs return non-zero if cancel button is
pressed. pressed.
@ -647,4 +653,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ 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 $

View File

@ -35,7 +35,7 @@
#include "includes.h" #include "includes.h"
#include "openbsd-compat/sys-queue.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/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -835,8 +835,8 @@ after_select(fd_set *readset, fd_set *writeset)
} }
if (getuid() != euid) { if (getuid() != euid) {
error("uid mismatch: " error("uid mismatch: "
"peer euid %d != uid %d", "peer euid %u != uid %u",
(int) euid, (int) getuid()); (u_int) euid, (u_int) getuid());
close(sock); close(sock);
break; break;
} }