upstream commit

Fix inverted logic for updating StreamLocalBindMask which
 would cause the server to set an invalid mask. ok djm@

Upstream-ID: 8a4404c8307a5ef9e07ee2169fc6d8106b527587
This commit is contained in:
dtucker@openbsd.org 2016-05-04 14:00:09 +00:00 committed by Darren Tucker
parent b02ad1ce91
commit 9faae50e2e

View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.289 2016/05/03 15:57:39 djm Exp $ */
/* $OpenBSD: servconf.c,v 1.290 2016/05/04 14:00:09 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@ -2012,7 +2012,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
* M_CP_INTOPT - it does a signed comparison that causes compiler
* warnings.
*/
if (src->fwd_opts.streamlocal_bind_mask == (mode_t)-1) {
if (src->fwd_opts.streamlocal_bind_mask != (mode_t)-1) {
dst->fwd_opts.streamlocal_bind_mask =
src->fwd_opts.streamlocal_bind_mask;
}