diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-04-03 06:18:40 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-04-03 17:23:02 +1100 |
| commit | 31d8d231eb9377df474746a822d380c5d68d7ad6 (patch) | |
| tree | ab5619a06e3944f016d7779b8313acb8bbf1c06a /auth2-pubkey.c | |
| parent | 34afde5c73b5570d6f8cce9b49993b23b77bfb86 (diff) | |
upstream: highly polished whitespace, mostly fixing spaces-for-tab
and bad indentation on continuation lines. Prompted by GHPR#185
OpenBSD-Commit-ID: e5c81f0cbdcc6144df1ce468ec1bac366d8ad6e9
Diffstat (limited to 'auth2-pubkey.c')
| -rw-r--r-- | auth2-pubkey.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 411d2d88..721c1d9b 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.106 2021/01/27 10:05:28 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.107 2021/04/03 06:18:40 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -674,7 +674,8 @@ check_authkey_line(struct ssh *ssh, struct passwd *pw, struct sshkey *key, goto fail_reason; } if (sshkey_cert_check_authority(key, 0, 0, 0, - keyopts->cert_principals == NULL ? pw->pw_name : NULL, &reason) != 0) + keyopts->cert_principals == NULL ? pw->pw_name : NULL, + &reason) != 0) goto fail_reason; verbose("Accepted certificate ID \"%s\" (serial %llu) " @@ -785,7 +786,7 @@ user_cert_trusted_ca(struct ssh *ssh, struct passwd *pw, struct sshkey *key, found_principal = 1; /* If principals file or command is specified, then require a match */ use_authorized_principals = principals_file != NULL || - options.authorized_principals_command != NULL; + options.authorized_principals_command != NULL; if (!found_principal && use_authorized_principals) { reason = "Certificate does not contain an authorized principal"; goto fail_reason; |