[openssh-commits] [openssh] 02/02: upstream: make StreamLocalBindMask properly first-match-wins;

[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.

commit d1d37e27a14f3336e36666d59c4b3e1c76cce328
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Sat Oct 3 00:46:58 2026 +0000

    upstream: make StreamLocalBindMask properly first-match-wins;
    
    spotted while fixing bz4013
    
    OpenBSD-Commit-ID: 35ef4524da0d03a439751f7bcd4847f76d93ec7f
---
 servconf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/servconf.c b/servconf.c
index 85126b92f..b49e9e97c 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.457 2026/09/16 00:35:09 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.458 2026/10/03 00:46:58 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2512,7 +2512,8 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 		if (arg == p || value < 0 || value > 0777)
 			fatal("%s line %d: Invalid %s.",
 			    filename, linenum, keyword);
-		if (*activep)
+		if (*activep &&
+		    options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)
 			options->fwd_opts.streamlocal_bind_mask = (mode_t)value;
 		break;
 

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