[openssh-commits] [openssh] branch master updated: upstream: report errors in fill_default_options() properly, based on

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new c87161382 upstream: report errors in fill_default_options() properly, based on
c87161382 is described below

commit c8716138281d3dac33c2c7e98615c52d2b606d85
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Jun 29 07:56:19 2026 +0000

    upstream: report errors in fill_default_options() properly, based on
    
    GHPR649 by Zoltán Fridrich
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 10137e31df74c3100e3abc7d008b1645ca5b45af
---
 readconf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readconf.c b/readconf.c
index 10cbd04ba..6ec751096 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.411 2026/03/30 07:18:24 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.412 2026/06/29 07:56:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -2849,7 +2849,7 @@ fill_default_options(Options * options)
 {
 	char *all_cipher, *all_mac, *all_kex, *all_key, *all_sig;
 	char *def_cipher, *def_mac, *def_kex, *def_key, *def_sig;
-	int ret = 0, r;
+	int ret = -1, r;
 
 	if (options->forward_agent == -1)
 		options->forward_agent = 0;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.