summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-05-04 14:00:09 +0000
committerDarren Tucker <dtucker@zip.com.au>2016-05-05 00:10:03 +1000
commit9faae50e2e82ba42eb0cb2726bf6830fe7948f28 (patch)
tree7c19602dba2644a82f30101592f6c90367842ffb
parentb02ad1ce9105bfa7394ac7590c0729dd52e26a81 (diff)
upstream commit
Fix inverted logic for updating StreamLocalBindMask which would cause the server to set an invalid mask. ok djm@ Upstream-ID: 8a4404c8307a5ef9e07ee2169fc6d8106b527587
-rw-r--r--servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c
index c064d0b59..1cb45f536 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.289 2016/05/03 15:57:39 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.290 2016/05/04 14:00:09 dtucker Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -2012,7 +2012,7 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
2012 * M_CP_INTOPT - it does a signed comparison that causes compiler 2012 * M_CP_INTOPT - it does a signed comparison that causes compiler
2013 * warnings. 2013 * warnings.
2014 */ 2014 */
2015 if (src->fwd_opts.streamlocal_bind_mask == (mode_t)-1) { 2015 if (src->fwd_opts.streamlocal_bind_mask != (mode_t)-1) {
2016 dst->fwd_opts.streamlocal_bind_mask = 2016 dst->fwd_opts.streamlocal_bind_mask =
2017 src->fwd_opts.streamlocal_bind_mask; 2017 src->fwd_opts.streamlocal_bind_mask;
2018 } 2018 }