summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c4
-rw-r--r--ssh.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bc5c6867..47bfa94ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - djm@cvs.openbsd.org 2013/07/20 01:43:46 9 - djm@cvs.openbsd.org 2013/07/20 01:43:46
10 [umac.c] 10 [umac.c]
11 use a union to ensure correct alignment; ok deraadt 11 use a union to ensure correct alignment; ok deraadt
12 - djm@cvs.openbsd.org 2013/07/20 01:44:37
13 [ssh-keygen.c ssh.c]
14 More useful error message on missing current user in /etc/passwd
12 15
1320130718 1620130718
14 - (djm) OpenBSD CVS Sync 17 - (djm) OpenBSD CVS Sync
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1edc965d5..03c444d42 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.229 2013/07/12 05:42:03 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.230 2013/07/20 01:44:37 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2214,7 +2214,7 @@ main(int argc, char **argv)
2214 /* we need this for the home * directory. */ 2214 /* we need this for the home * directory. */
2215 pw = getpwuid(getuid()); 2215 pw = getpwuid(getuid());
2216 if (!pw) { 2216 if (!pw) {
2217 printf("You don't exist, go away!\n"); 2217 printf("No user exists for uid %lu\n", (u_long)getuid());
2218 exit(1); 2218 exit(1);
2219 } 2219 }
2220 if (gethostname(hostname, sizeof(hostname)) < 0) { 2220 if (gethostname(hostname, sizeof(hostname)) < 0) {
diff --git a/ssh.c b/ssh.c
index a9b0a7086..30e65338f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.379 2013/07/12 05:48:55 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.380 2013/07/20 01:44:37 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -299,7 +299,7 @@ main(int ac, char **av)
299 /* Get user data. */ 299 /* Get user data. */
300 pw = getpwuid(original_real_uid); 300 pw = getpwuid(original_real_uid);
301 if (!pw) { 301 if (!pw) {
302 logit("You don't exist, go away!"); 302 logit("No user exists for uid %lu", (u_long)original_real_uid);
303 exit(255); 303 exit(255);
304 } 304 }
305 /* Take a copy of the returned structure. */ 305 /* Take a copy of the returned structure. */