- (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.

diff --git a/ChangeLog b/ChangeLog
index a9725f7ef71e752521b2afd6e87f2ac126862996..88a9930b9b7b00a77844fd28c8e12dade50f4db4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ssh-agent.c b/ssh-agent.c
index 77958cca0741c103b8e3494a944f01ee2ce6b1a7..cca720ee2717a03606a7884cf2c33d16fab7472a 100644 (file)
--- 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());