diff options
| author | Damien Miller <djm@mindrot.org> | 2002-10-03 11:54:35 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-10-03 11:54:35 +1000 |
| commit | af9de38c4319948b8cf73cc1b18ae8270dba185e (patch) | |
| tree | d4430756718ec108b27efee451ad35d09e93f4b2 | |
| parent | d8769625fba2c08e9eae81d225bba58427196c5a (diff) | |
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/10/01 20:34:12
[ssh-agent.c]
allow root to access the agent, since there is no protection from root.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ssh-agent.c | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +20021003 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2002/10/01 20:34:12 + [ssh-agent.c] + allow root to access the agent, since there is no protection from root. + 20020930 - (djm) Tidy contrib/, add Makefile for GNOME passphrase dialogs, tweak README @@ -746,4 +752,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2488 2002/09/30 02:00:55 djm Exp $ +$Id: ChangeLog,v 1.2489 2002/10/03 01:54:35 djm Exp $ diff --git a/ssh-agent.c b/ssh-agent.c index 77958cca..cca720ee 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.104 2002/09/12 19:11:52 stevesk Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.105 2002/10/01 20:34:12 markus Exp $"); #include <openssl/evp.h> #include <openssl/md5.h> @@ -833,7 +833,7 @@ after_select(fd_set *readset, fd_set *writeset) close(sock); break; } - if (getuid() != euid) { + if ((euid != 0) && (getuid() != euid)) { error("uid mismatch: " "peer euid %u != uid %u", (u_int) euid, (u_int) getuid()); |