summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth2-pubkey.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 997982e6..2a258466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
20130215
- (djm) [contrib/suse/rc.sshd] Use SSHD_BIN consistently; bz#2056 from
Iain Morgan
+ - (djm) OpenBSD CVS Sync
+ - 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
20130214
- (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 70d8996e..3ff6faa8 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.33 2012/11/14 02:24:27 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.34 2013/02/14 21:35:59 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -479,8 +479,8 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)
"u", user_pw->pw_name, (char *)NULL);
pw = getpwnam(username);
if (pw == NULL) {
- error("AuthorizedKeyCommandUser \"%s\" not found: %s",
- options.authorized_keys_command, strerror(errno));
+ error("AuthorizedKeysCommandUser \"%s\" not found: %s",
+ username, strerror(errno));
free(username);
return 0;
}