summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-15 10:28:55 +1100
committerDamien Miller <djm@mindrot.org>2013-02-15 10:28:55 +1100
commit4018dc04daa613d0e20df10947b85f154dc5765d (patch)
tree9d1216fc13fa4148007c8ba01479123ac907fd4d
parent91edc1ce2b4a7038432efbcbbfc0b1cb2fb85d0d (diff)
- djm@cvs.openbsd.org 2013/02/14 21:35:59
[auth2-pubkey.c] Correct error message that had a typo and was logging the wrong thing; patch from Petr Lautrbach
-rw-r--r--ChangeLog5
-rw-r--r--auth2-pubkey.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 997982e61..2a2584661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
120130215 120130215
2 - (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from 2 - (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from
3 Iain Morgan 3 Iain Morgan
4 - (djm) OpenBSD CVS Sync
5 - djm@cvs.openbsd.org 2013/02/14 21:35:59
6 [auth2-pubkey.c]
7 Correct error message that had a typo and was logging the wrong thing;
8 patch from Petr Lautrbach
4 9
520130214 1020130214
6 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC. 11 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC.
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 70d8996ea..3ff6faa8b 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.33 2012/11/14 02:24:27 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.34 2013/02/14 21:35:59 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -479,8 +479,8 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)
479 "u", user_pw->pw_name, (char *)NULL); 479 "u", user_pw->pw_name, (char *)NULL);
480 pw = getpwnam(username); 480 pw = getpwnam(username);
481 if (pw == NULL) { 481 if (pw == NULL) {
482 error("AuthorizedKeyCommandUser \"%s\" not found: %s", 482 error("AuthorizedKeysCommandUser \"%s\" not found: %s",
483 options.authorized_keys_command, strerror(errno)); 483 username, strerror(errno));
484 free(username); 484 free(username);
485 return 0; 485 return 0;
486 } 486 }