summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-05-26 09:52:15 +0000
committerColin Watson <cjwatson@debian.org>2008-05-26 09:52:15 +0000
commit5bdf9cddf8c7c9104ecc1b9f0bcae79aa7496bca (patch)
treecbbba966711d1313ae53962b1d0f0c2816e11137
parent7487a077a410826fa48f6a1db33408831b48dd21 (diff)
Use EUID rather than UID when run with no file names and without -a.
-rw-r--r--debian/changelog1
-rw-r--r--ssh-vulnkey.c4
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
55 - Use xasprintf to build user key file names, avoiding truncation 55 - Use xasprintf to build user key file names, avoiding truncation
56 problems. 56 problems.
57 - Drop to the user's UID when reading user keys with -a. 57 - Drop to the user's UID when reading user keys with -a.
58 - Use EUID rather than UID when run with no file names and without -a.
58 59
59 -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 60 -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200
60 61
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)
343 if (!do_host(1)) 343 if (!do_host(1))
344 ret = 0; 344 ret = 0;
345 345
346 if ((pw = getpwuid(getuid())) == NULL) 346 if ((pw = getpwuid(geteuid())) == NULL)
347 fprintf(stderr, "No user found with uid %u\n", 347 fprintf(stderr, "No user found with uid %u\n",
348 (u_int)getuid()); 348 (u_int)geteuid());
349 else { 349 else {
350 if (!do_user(pw->pw_dir)) 350 if (!do_user(pw->pw_dir))
351 ret = 0; 351 ret = 0;