39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From db8bb80e3ac1bcb3e1305d846cd98c6b869bf03f Mon Sep 17 00:00:00 2001
|
||
|
|
From: "mestre@openbsd.org" <mestre@openbsd.org>
|
||
|
|
Date: Tue, 28 Aug 2018 12:25:53 +0000
|
||
|
|
Subject: [PATCH 006/294] upstream: fix misplaced parenthesis inside if-clause.
|
||
|
|
it's harmless
|
||
|
|
|
||
|
|
and the only issue is showing an unknown error (since it's not defined)
|
||
|
|
during fatal(), if it ever an error occurs inside that condition.
|
||
|
|
|
||
|
|
OK deraadt@ markus@ djm@
|
||
|
|
|
||
|
|
OpenBSD-Commit-ID: acb0a8e6936bfbe590504752d01d1d251a7101d8
|
||
|
|
---
|
||
|
|
auth2-pubkey.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
|
||
|
|
index 3d9f9af..f9e4e2e 100644
|
||
|
|
--- a/auth2-pubkey.c
|
||
|
|
+++ b/auth2-pubkey.c
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* $OpenBSD: auth2-pubkey.c,v 1.84 2018/08/23 03:01:08 djm Exp $ */
|
||
|
|
+/* $OpenBSD: auth2-pubkey.c,v 1.85 2018/08/28 12:25:53 mestre Exp $ */
|
||
|
|
/*
|
||
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
||
|
|
*
|
||
|
|
@@ -177,7 +177,7 @@ userauth_pubkey(struct ssh *ssh)
|
||
|
|
(r = sshbuf_put_cstring(b, authctxt->service)) != 0 ||
|
||
|
|
(r = sshbuf_put_cstring(b, "publickey")) != 0 ||
|
||
|
|
(r = sshbuf_put_u8(b, have_sig)) != 0 ||
|
||
|
|
- (r = sshbuf_put_cstring(b, pkalg) != 0) ||
|
||
|
|
+ (r = sshbuf_put_cstring(b, pkalg)) != 0 ||
|
||
|
|
(r = sshbuf_put_string(b, pkblob, blen)) != 0)
|
||
|
|
fatal("%s: build packet failed: %s",
|
||
|
|
__func__, ssh_err(r));
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|