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