summaryrefslogtreecommitdiff
path: root/auth2-pubkey.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-06-21 03:19:59 +0000
committerDamien Miller <djm@mindrot.org>2019-06-21 13:21:13 +1000
commit4cd6b12cc9c10bf59c8b425041f3ea5091285a0f (patch)
treec5192bd4d4cb5eea65f0aed4b03099b3a63f74df /auth2-pubkey.c
parent5f68ab436b0e01751d564e9a9041e6ac3673e45a (diff)
upstream: print the correct AuthorizedPrincipalsCommand rather than
an uninitialised variable; spotted by dtucker@ OpenBSD-Commit-ID: 02802018784250f68202f01c8561de82e17b0638
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r--auth2-pubkey.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 4e01b6055..05fa5c9f8 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.89 2019/06/14 03:39:59 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.90 2019/06/21 03:19: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 *
@@ -450,12 +450,12 @@ match_principals_command(struct ssh *ssh, struct passwd *user_pw,
450 /* Turn the command into an argument vector */ 450 /* Turn the command into an argument vector */
451 if (argv_split(options.authorized_principals_command, &ac, &av) != 0) { 451 if (argv_split(options.authorized_principals_command, &ac, &av) != 0) {
452 error("AuthorizedPrincipalsCommand \"%s\" contains " 452 error("AuthorizedPrincipalsCommand \"%s\" contains "
453 "invalid quotes", command); 453 "invalid quotes", options.authorized_principals_command);
454 goto out; 454 goto out;
455 } 455 }
456 if (ac == 0) { 456 if (ac == 0) {
457 error("AuthorizedPrincipalsCommand \"%s\" yielded no arguments", 457 error("AuthorizedPrincipalsCommand \"%s\" yielded no arguments",
458 command); 458 options.authorized_principals_command);
459 goto out; 459 goto out;
460 } 460 }
461 if ((ca_fp = sshkey_fingerprint(cert->signature_key, 461 if ((ca_fp = sshkey_fingerprint(cert->signature_key,