2 files changed, 3 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 01dcc41f4..e14cb2a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,7 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
     - Use xasprintf to build user key file names, avoiding truncation
       problems.
     - Drop to the user's UID when reading user keys with -a.
+    - Use EUID rather than UID when run with no file names and without -a.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 17 May 2008 08:48:45 +0200
 
diff --git a/ssh-vulnkey.c b/ssh-vulnkey.c
index 52667199c..df4addf17 100644
--- a/ssh-vulnkey.c
+++ b/ssh-vulnkey.c
@@ -343,9 +343,9 @@ main(int argc, char **argv)
                 if (!do_host(1))
                         ret = 0;
 
-                if ((pw = getpwuid(getuid())) == NULL)
+                if ((pw = getpwuid(geteuid())) == NULL)
                         fprintf(stderr, "No user found with uid %u\n",
-                            (u_int)getuid());
+                            (u_int)geteuid());
                 else {
                         if (!do_user(pw->pw_dir))
                                 ret = 0;