diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-08-18 05:48:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-08-23 19:47:06 +1000 |
commit | b074c3c3f820000a21953441cea7699c4b17d72f (patch) | |
tree | 9304faf8fcaef5893524a7283450de2b75b1d8ea /auth2-pubkey.c | |
parent | de4ae07f12dabf8815ecede54235fce5d22e3f63 (diff) |
upstream commit
add a "quiet" flag to exited_cleanly() that supresses
errors about exit status (failure due to signal is still reported)
Upstream-ID: db85c39c3aa08e6ff67fc1fb4ffa89f807a9d2f0
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 0b1e88deb..e1845d7d5 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.69 2017/08/18 05:36:45 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.70 2017/08/18 05:48:04 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -437,7 +437,7 @@ match_principals_command(struct passwd *user_pw, const struct sshkey *key) | |||
437 | fclose(f); | 437 | fclose(f); |
438 | f = NULL; | 438 | f = NULL; |
439 | 439 | ||
440 | if (exited_cleanly(pid, "AuthorizedPrincipalsCommand", command) != 0) | 440 | if (exited_cleanly(pid, "AuthorizedPrincipalsCommand", command, 0) != 0) |
441 | goto out; | 441 | goto out; |
442 | 442 | ||
443 | /* Read completed successfully */ | 443 | /* Read completed successfully */ |
@@ -767,7 +767,7 @@ user_key_command_allowed2(struct passwd *user_pw, struct sshkey *key) | |||
767 | fclose(f); | 767 | fclose(f); |
768 | f = NULL; | 768 | f = NULL; |
769 | 769 | ||
770 | if (exited_cleanly(pid, "AuthorizedKeysCommand", command) != 0) | 770 | if (exited_cleanly(pid, "AuthorizedKeysCommand", command, 0) != 0) |
771 | goto out; | 771 | goto out; |
772 | 772 | ||
773 | /* Read completed successfully */ | 773 | /* Read completed successfully */ |