upstream commit
Fix inverted logic for updating StreamLocalBindMask which
would cause the server to set an invalid mask. ok djm@
Upstream-ID: 8a4404c8307a5ef9e07ee2169fc6d8106b527587
diff --git a/servconf.c b/servconf.c
index c064d0b..1cb45f5 100644
--- a/servconf.c
+++ b/servconf.c
@@ -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 @@
* 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;
}