From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 17 Dec 2020 23:28:50 +0000 (+0000)
Subject: upstream: fix possible error("%s", NULL) on error paths
X-Git-Tag: V_8_5_P1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ebead6593e2441e4af2735bbe2cd097607cd0d3;p=thirdparty%2Fopenssh-portable.git

upstream: fix possible error("%s", NULL) on error paths

OpenBSD-Commit-ID: 0b3833c2cb985453ecca1d76803ebb8f3b736a11
---

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index b331216c8..307afa562 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.101 2020/10/18 11:32:01 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.102 2020/12/17 23:28:50 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -927,12 +927,12 @@ user_key_command_allowed2(struct ssh *ssh, struct passwd *user_pw,
 	/* Turn the command into an argument vector */
 	if (argv_split(options.authorized_keys_command, &ac, &av) != 0) {
 		error("AuthorizedKeysCommand \"%s\" contains invalid quotes",
-		    command);
+		    options.authorized_keys_command);
 		goto out;
 	}
 	if (ac == 0) {
 		error("AuthorizedKeysCommand \"%s\" yielded no arguments",
-		    command);
+		    options.authorized_keys_command);
 		goto out;
 	}
 	snprintf(uidstr, sizeof(uidstr), "%llu",