date:20160222

CVS commit: xsrc/external/mit/xdm/dist/man

2016-02-22 Thread Valeriy E. Ushakov

Module Name:xsrc
Committed By:   uwe
Date:   Tue Feb 23 00:27:11 UTC 2016

Modified Files:
xsrc/external/mit/xdm/dist/man: xdm.man

Log Message:
Use \e for backslash in resource examples.

We try to trick the C preprocessor by adding a space after \\ at the
end of line, but that doesn't work as it complains and joins those
lines anyway, destroying the examples.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdm/dist/man/xdm.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/man/xdm.man
diff -u xsrc/external/mit/xdm/dist/man/xdm.man:1.2 xsrc/external/mit/xdm/dist/man/xdm.man:1.3
--- xsrc/external/mit/xdm/dist/man/xdm.man:1.2	Mon Feb 22 23:57:51 2016
+++ xsrc/external/mit/xdm/dist/man/xdm.man	Tue Feb 23 00:27:11 2016
@@ -702,7 +702,7 @@ bambi.ogi.edu	# allow access from this p

CVS commit: xsrc/external/mit/xdm/dist/man

2016-02-22 Thread Valeriy E. Ushakov

Module Name:xsrc
Committed By:   uwe
Date:   Mon Feb 22 23:57:51 UTC 2016

Modified Files:
xsrc/external/mit/xdm/dist/man: xdm.man

Log Message:
Protect comments in Xaccess file example from being eaten by the
C preprocessor.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xdm/dist/man/xdm.man

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xdm/dist/man/xdm.man
diff -u xsrc/external/mit/xdm/dist/man/xdm.man:1.1.1.1 xsrc/external/mit/xdm/dist/man/xdm.man:1.2
--- xsrc/external/mit/xdm/dist/man/xdm.man:1.1.1.1	Fri May 31 22:19:37 2013
+++ xsrc/external/mit/xdm/dist/man/xdm.man	Mon Feb 22 23:57:51 2016
@@ -683,13 +683,13 @@ Here is an example Xaccess file:
 .LP
 .ta 2i 4i
 .nf
-#
-# Xaccess \- XDMCP access control file
-#
-
-#
-# Direct/Broadcast query entries
-#

CVS commit: src/usr.bin/indent

2016-02-22 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Mon Feb 22 22:01:48 UTC 2016

Modified Files:
src/usr.bin/indent: indent.c

Log Message:
Use warnx(3).


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/indent/indent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.20 src/usr.bin/indent/indent.c:1.21
--- src/usr.bin/indent/indent.c:1.20	Mon Feb 22 19:04:18 2016
+++ src/usr.bin/indent/indent.c	Mon Feb 22 22:01:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.20 2016/02/22 19:04:18 ginsbach Exp $	*/
+/*	$NetBSD: indent.c,v 1.21 2016/02/22 22:01:48 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -75,7 +75,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985 Sun
 #if 0
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #else
-__RCSID("$NetBSD: indent.c,v 1.20 2016/02/22 19:04:18 ginsbach Exp $");
+__RCSID("$NetBSD: indent.c,v 1.21 2016/02/22 22:01:48 ginsbach Exp $");
 #endif
 #endif/* not lint */
 
@@ -134,7 +134,7 @@ main(int argc, char **argv)
 \*---*/
 
 	if (!setlocale(LC_ALL, ""))
-		fprintf(stderr, "indent: can't set locale.\n");
+		warnx("can't set locale.");
 
 	hd_type = 0;
 	ps.p_stack[0] = stmt;	/* this is the parser's stack */

CVS commit: src/usr.bin/indent

2016-02-22 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Mon Feb 22 21:20:29 UTC 2016

Modified Files:
src/usr.bin/indent: args.c

Log Message:
Stray '\n' in errx(3) format.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/indent/args.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.12 src/usr.bin/indent/args.c:1.13
--- src/usr.bin/indent/args.c:1.12	Mon Feb 22 19:04:18 2016
+++ src/usr.bin/indent/args.c	Mon Feb 22 21:20:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: args.c,v 1.12 2016/02/22 19:04:18 ginsbach Exp $	*/
+/*	$NetBSD: args.c,v 1.13 2016/02/22 21:20:29 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: args.c,v 1.12 2016/02/22 19:04:18 ginsbach Exp $");
+__RCSID("$NetBSD: args.c,v 1.13 2016/02/22 21:20:29 ginsbach Exp $");
 #endif
 #endif/* not lint */
 
@@ -432,7 +432,7 @@ found:
 			break;
 
 		default:
-			errx(1, "set_option: internal error: p_special %d\n",
+			errx(1, "set_option: internal error: p_special %d",
 			 p->p_special);
 		}
 		break;

CVS commit: src/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 20:03:48 UTC 2016

Modified Files:
src/bin/sh: eval.c

Log Message:
PR/43255: Make -n apply to the -c string so sh -n -c 'commands' works
as it should. Also, other places where the shell parses strings of
commands are also now controlled by -n (traps, eval, ...)  (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/bin/sh/eval.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.111 src/bin/sh/eval.c:1.112
--- src/bin/sh/eval.c:1.111	Sun Jan  3 22:00:24 2016
+++ src/bin/sh/eval.c	Mon Feb 22 15:03:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.111 2016/01/04 03:00:24 christos Exp $	*/
+/*	$NetBSD: eval.c,v 1.112 2016/02/22 20:03:48 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.111 2016/01/04 03:00:24 christos Exp $");
+__RCSID("$NetBSD: eval.c,v 1.112 2016/02/22 20:03:48 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -220,7 +220,8 @@ evalstring(char *s, int flag)
 	setinputstring(s, 1);
 
 	while ((n = parsecmd(0)) != NEOF) {
-		evaltree(n, flag);
+		if (nflag == 0)
+			evaltree(n, flag);
 		popstackmark();
 	}
 	popfile();

CVS commit: src/tests/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 20:02:30 UTC 2016

Modified Files:
src/tests/bin/sh: t_expand.sh

Log Message:
PR/43469 has been fixed


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/bin/sh/t_expand.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/bin/sh/t_expand.sh
diff -u src/tests/bin/sh/t_expand.sh:1.4 src/tests/bin/sh/t_expand.sh:1.5
--- src/tests/bin/sh/t_expand.sh:1.4	Fri Feb 19 08:49:01 2016
+++ src/tests/bin/sh/t_expand.sh	Mon Feb 22 15:02:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.4 2016/02/19 13:49:01 christos Exp $
+# $NetBSD: t_expand.sh,v 1.5 2016/02/22 20:02:29 christos Exp $
 #
 # Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -86,12 +86,11 @@ atf_test_case strip
 strip_head() {
 	atf_set "descr" "Checks that the %% operator works and strips" \
 	"the contents of a variable from the given point" \
-			"to the end"
+			"to the end (PR bin/43469)"
 }
 strip_body() {
 	line='#define bindir "/usr/bin" /* comment */'
 	stripped='#define bindir "/usr/bin" '
-	atf_expect_fail "PR bin/43469"
 	atf_check_equal '$stripped' '${line%%/\**}'
 }

CVS commit: src/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 20:02:00 UTC 2016

Modified Files:
src/bin/sh: expand.c parser.c parser.h

Log Message:
PR bin/43469 - correctly handle quoting of the pattern part of ${var%pat}
type expansions. (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/bin/sh/expand.c
cvs rdiff -u -r1.97 -r1.98 src/bin/sh/parser.c
cvs rdiff -u -r1.18 -r1.19 src/bin/sh/parser.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.93 src/bin/sh/expand.c:1.94
--- src/bin/sh/expand.c:1.93	Thu Aug 27 03:46:47 2015
+++ src/bin/sh/expand.c	Mon Feb 22 15:02:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: expand.c,v 1.93 2015/08/27 07:46:47 christos Exp $	*/
+/*	$NetBSD: expand.c,v 1.94 2016/02/22 20:02:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.93 2015/08/27 07:46:47 christos Exp $");
+__RCSID("$NetBSD: expand.c,v 1.94 2016/02/22 20:02:00 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -511,7 +511,7 @@ subevalvar(char *p, char *str, int strlo
 	case VSTRIMLEFTMAX:
 	case VSTRIMRIGHT:
 	case VSTRIMRIGHTMAX:
-		how = (varflags & VSQUOTE) ? 0 : EXP_CASE;
+		how = (varflags & (VSQUOTE|VSPATQ)) == VSQUOTE ? 0 : EXP_CASE;
 		break;
 	default:
 		how = 0;

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.97 src/bin/sh/parser.c:1.98
--- src/bin/sh/parser.c:1.97	Mon Feb 22 14:42:46 2016
+++ src/bin/sh/parser.c	Mon Feb 22 15:02:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.97 2016/02/22 19:42:46 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.98 2016/02/22 20:02:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.97 2016/02/22 19:42:46 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.98 2016/02/22 20:02:00 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1517,6 +1517,8 @@ badsub:
 		}
 		if (ISDBLQUOTE() || arinest)
 			flags |= VSQUOTE;
+		if (subtype >= VSTRIMLEFT && subtype <= VSTRIMRIGHTMAX)
+			flags |= VSPATQ;
 		*(stackblock() + typeloc) = subtype | flags;
 		if (subtype != VSNORMAL) {
 			TS_PUSH();

Index: src/bin/sh/parser.h
diff -u src/bin/sh/parser.h:1.18 src/bin/sh/parser.h:1.19
--- src/bin/sh/parser.h:1.18	Wed Oct  2 15:52:58 2013
+++ src/bin/sh/parser.h	Mon Feb 22 15:02:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.h,v 1.18 2013/10/02 19:52:58 christos Exp $	*/
+/*	$NetBSD: parser.h,v 1.19 2016/02/22 20:02:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -53,6 +53,7 @@
 #define VSNUL		0x10	/* colon--treat the empty string as unset */
 #define VSLINENO	0x20	/* expansion of $LINENO, the line number
    follows immediately */
+#define VSPATQ		0x40	/* ensure correct pattern quoting in ${x#pat} */
 #define VSQUOTE	 	0x80	/* inside double quotes--suppress splitting */
 
 /* values of VSTYPE field */

CVS commit: src/distrib/sets/lists/tests

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 19:53:16 UTC 2016

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
new shell test


To generate a diff of this commit:
cvs rdiff -u -r1.661 -r1.662 src/distrib/sets/lists/tests/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.661 src/distrib/sets/lists/tests/mi:1.662
--- src/distrib/sets/lists/tests/mi:1.661	Thu Jan 28 23:15:46 2016
+++ src/distrib/sets/lists/tests/mi	Mon Feb 22 14:53:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.661 2016/01/29 04:15:46 ozaki-r Exp $
+# $NetBSD: mi,v 1.662 2016/02/22 19:53:16 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1260,6 +1260,7 @@
 ./usr/tests/bin/sh/t_expand			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_fsplit			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_here			tests-bin-tests		compattestfile,atf
+./usr/tests/bin/sh/t_redir			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_set_e			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_ulimit			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_varquote			tests-bin-tests		compattestfile,atf

CVS commit: src/tests/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 19:52:03 UTC 2016

Modified Files:
src/tests/bin/sh: Makefile
Added Files:
src/tests/bin/sh: t_redir.sh

Log Message:
Add new test


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/bin/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/sh/t_redir.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/bin/sh/Makefile
diff -u src/tests/bin/sh/Makefile:1.4 src/tests/bin/sh/Makefile:1.5
--- src/tests/bin/sh/Makefile:1.4	Thu Sep 11 14:25:30 2014
+++ src/tests/bin/sh/Makefile	Mon Feb 22 14:52:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/09/11 18:25:30 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/22 19:52:03 christos Exp $
 #
 
 .include 
@@ -13,6 +13,7 @@ TESTS_SH+=	t_expand
 TESTS_SH+=	t_evaltested
 TESTS_SH+=	t_fsplit
 TESTS_SH+=	t_here
+TESTS_SH+=	t_redir
 TESTS_SH+=	t_set_e
 TESTS_SH+=	t_ulimit
 TESTS_SH+=	t_varquote

Added files:

Index: src/tests/bin/sh/t_redir.sh
diff -u /dev/null src/tests/bin/sh/t_redir.sh:1.1
--- /dev/null	Mon Feb 22 14:52:03 2016
+++ src/tests/bin/sh/t_redir.sh	Mon Feb 22 14:52:03 2016
@@ -0,0 +1,40 @@
+# $NetBSD: t_redir.sh,v 1.1 2016/02/22 19:52:03 christos Exp $
+#
+# Copyright (c) 2016 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case redir_in_case
+redir_in_case_head() {
+	atf_set "descr" "Tests that sh(1) allows plain redirections " \
+	"in case statements. (PR bin/48631)"
+}
+redir_in_case_body() {
+	atf_check -s exit:0 -o ignore -e ignore \
+	-x '/bin/sh -c "case x in (whatever) >foo;; esac"'
+}
+
+atf_init_test_cases() {
+	atf_add_test_case redir_in_case
+}

CVS commit: src/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 19:42:46 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
Fix for PR bin/48631 - allow commands controlled
by case statements to be nothing more than redirects (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/bin/sh/parser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.96 src/bin/sh/parser.c:1.97
--- src/bin/sh/parser.c:1.96	Mon Feb 22 14:38:10 2016
+++ src/bin/sh/parser.c	Mon Feb 22 14:42:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.96 2016/02/22 19:38:10 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.97 2016/02/22 19:42:46 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.96 2016/02/22 19:38:10 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.97 2016/02/22 19:42:46 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -515,6 +515,12 @@ TRACE(("expecting DO got %s %s\n", tokna
 		tokpushback++;
 		n1 = simplecmd(rpp, redir);
 		goto checkneg;
+	case TENDCASE:
+		if (redir) {
+			tokpushback++;
+			goto checkneg;
+		}
+		/* FALLTHROUGH */
 	default:
 		synexpect(-1);
 		/* NOTREACHED */

CVS commit: src/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 19:38:10 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
Finish the fix for PR/48631 - that is, make the parser correctly
handle the token syntax it really should be handling (including
some that posix does not require, but is right anyway.) This is
quite similar to, and to some extent inspired by the way the FreeBSD
sh parser.c works, but the actual implementation is quite different.
(from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/bin/sh/parser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.95 src/bin/sh/parser.c:1.96
--- src/bin/sh/parser.c:1.95	Mon Feb 22 14:25:26 2016
+++ src/bin/sh/parser.c	Mon Feb 22 14:38:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.95 2016/02/22 19:25:26 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.96 2016/02/22 19:38:10 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.95 2016/02/22 19:25:26 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.96 2016/02/22 19:38:10 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -902,6 +902,138 @@ breakloop:
  * will run code that appears at the end of readtoken1.
  */
 
+/*
+ * We used to remember only the current syntax, variable nesting level,
+ * double quote state for each var nexting level, and arith nesting
+ * level (unrelated to var nesting) and one prev syntax when in arith
+ * syntax.  This worked for simple cases, but can't handle arith inside
+ * var expansion inside arith inside var with some quoted and some not.
+ *
+ * Inspired by FreeBSD's implementation (though it was the obvious way)
+ * though implemented differently, we now have a stack that keeps track
+ * of what we are doing now, and what we were doing previously.
+ * Every time something changes, which will eventually end and should
+ * revert to the previous state, we push this stack, and then pop it
+ * again later (that is every ${} with an operator (to parse the word
+ * or pattern that follows) ${x} and $x are too * simple to need it)
+ * $(( )) $( ) and "...".   Always.   Really, always!
+ *
+ * The stack is implemented as one static (on the C stack) base block
+ * containing LEVELS_PER_BLOCK (8) stack entries, which should be
+ * enough for the vast majority of cases.  For torture tests, we
+ * malloc more blocks as needed.  All accesses through the inline
+ * functions below.
+ */
+
+/*
+ * varnest & arinest will typically be 0 or 1
+ * (varnest can increment in usages like ${x=${y}} but probably
+ *  does not really need to)
+ * parenlevel allows balancing parens inside a $(( )), it is reset
+ * at each new nesting level ( $(( ( x + 3 ${unset-)} )) does not work.
+ * quoted is special - we need to know 2 things ... are we inside "..."
+ * (even if inherited from some previous nesting level) and was there
+ * an opening '"' at this level (so the next will be closing).
+ * "..." can span nexting levels, but cannot be opened in one and
+ * closed in a different one.
+ * To handle this, "quoted" has two fields, the bottom 4 (really 2)
+ * bits are 0, 1, or 2, for un, single, and double quoted (single quoted
+ * is really so special that this setting is not very important)
+ * and 0x10 that indicates that an opening quote has been seen.
+ * The bottom 4 bits are inherited, the 0x10 bit is not.
+ */
+struct tokenstate {
+	const char *ts_syntax;
+	unsigned short ts_parenlevel;	/* counters */
+	unsigned short ts_varnest;	/* 64000 levels should be enough! */
+	unsigned short ts_arinest;
+	unsigned short ts_quoted;	/* 1 -> single, 2 -> double */
+};
+
+#define	NQ	0x00
+#define	SQ	0x01
+#define	DQ	0x02
+#define	QF	0x0F
+#define	QS	0x10
+
+#define	LEVELS_PER_BLOCK	8
+#define	VSS			volatile struct statestack
+
+struct statestack {
+	VSS *prev;		/* previous block in list */
+	int cur;		/* which of our tokenstates is current */
+	struct tokenstate tokenstate[LEVELS_PER_BLOCK];
+};
+
+static inline volatile struct tokenstate *
+currentstate(VSS *stack)
+{
+	return >tokenstate[stack->cur];
+}
+
+static inline volatile struct tokenstate *
+prevstate(VSS *stack)
+{
+	if (stack->cur != 0)
+		return >tokenstate[stack->cur - 1];
+	if (stack->prev == NULL)	/* cannot drop below base */
+		return >tokenstate[0];
+	return >prev->tokenstate[LEVELS_PER_BLOCK - 1];
+}
+
+static inline VSS *
+bump_state_level(VSS *stack)
+{
+	volatile struct tokenstate *os, *ts;
+
+	os = currentstate(stack);
+
+	if (++stack->cur >= LEVELS_PER_BLOCK) {
+		VSS *ss;
+
+		ss = (VSS *)ckmalloc(sizeof (struct statestack));
+		ss->cur = 0;
+		ss->prev = stack;
+		stack = ss;
+	}
+
+	ts = currentstate(stack);
+
+	ts->ts_parenlevel = 0;	/* parens inside never match outside */
+
+	ts->ts_quoted  = os->ts_quoted & QF;	/*

CVS commit: src/bin/sh

2016-02-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Feb 22 19:25:26 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
KNF / whitespace fixes. No changes of substance. (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/bin/sh/parser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.94 src/bin/sh/parser.c:1.95
--- src/bin/sh/parser.c:1.94	Fri Feb 19 08:50:37 2016
+++ src/bin/sh/parser.c	Mon Feb 22 14:25:26 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.94 2016/02/19 13:50:37 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.95 2016/02/22 19:25:26 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.94 2016/02/19 13:50:37 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.95 2016/02/22 19:25:26 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -389,8 +389,9 @@ TRACE(("expecting DO got %s %s\n", tokna
 			if (lasttoken != TNL && lasttoken != TSEMI)
 synexpect(-1);
 		} else {
-			static char argvars[5] = {CTLVAR, VSNORMAL|VSQUOTE,
-   '@', '=', '\0'};
+			static char argvars[5] = {
+			CTLVAR, VSNORMAL|VSQUOTE, '@', '=', '\0'
+			};
 			n2 = (union node *)stalloc(sizeof (struct narg));
 			n2->type = NARG;
 			n2->narg.text = argvars;
@@ -641,8 +642,9 @@ makename(void)
 	return n;
 }
 
-void fixredir(union node *n, const char *text, int err)
-	{
+void
+fixredir(union node *n, const char *text, int err)
+{
 	TRACE(("Fix redir %s %d\n", text, err));
 	if (!err)
 		n->ndup.vname = NULL;
@@ -766,13 +768,11 @@ readtoken(void)
 		/*
 		 * check for keywords and aliases
 		 */
-		if (t == TWORD && !quoteflag)
-		{
+		if (t == TWORD && !quoteflag) {
 			const char *const *pp;
 
 			for (pp = parsekwd; *pp; pp++) {
-if (**pp == *wordtext && equal(*pp, wordtext))
-{
+if (**pp == *wordtext && equal(*pp, wordtext)) {
 	lasttoken = t = pp -
 	parsekwd + KWDOFFSET;
 	TRACE(("keyword %s recognized\n", tokname[t]));
@@ -902,11 +902,11 @@ breakloop:
  * will run code that appears at the end of readtoken1.
  */
 
-#define CHECKEND()	{goto checkend; checkend_return:;}
-#define PARSEREDIR()	{goto parseredir; parseredir_return:;}
-#define PARSESUB()	{goto parsesub; parsesub_return:;}
-#define PARSEBACKQOLD()	{oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
-#define PARSEBACKQNEW()	{oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
+#define	CHECKEND()	{goto checkend; checkend_return:;}
+#define	PARSEREDIR()	{goto parseredir; parseredir_return:;}
+#define	PARSESUB()	{goto parsesub; parsesub_return:;}
+#define	PARSEBACKQOLD()	{oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
+#define	PARSEBACKQNEW()	{oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
 #define	PARSEARITH()	{goto parsearith; parsearith_return:;}
 
 /*

CVS commit: src/usr.bin/indent

2016-02-22 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Mon Feb 22 19:04:18 UTC 2016

Modified Files:
src/usr.bin/indent: args.c indent.c io.c

Log Message:
Use errx(3).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/indent/args.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/indent/io.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.11 src/usr.bin/indent/args.c:1.12
--- src/usr.bin/indent/args.c:1.11	Thu Sep  4 04:06:07 2014
+++ src/usr.bin/indent/args.c	Mon Feb 22 19:04:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: args.c,v 1.11 2014/09/04 04:06:07 mrg Exp $	*/
+/*	$NetBSD: args.c,v 1.12 2016/02/22 19:04:18 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: args.c,v 1.11 2014/09/04 04:06:07 mrg Exp $");
+__RCSID("$NetBSD: args.c,v 1.12 2016/02/22 19:04:18 ginsbach Exp $");
 #endif
 #endif/* not lint */
 
@@ -78,6 +78,7 @@ __RCSID("$NetBSD: args.c,v 1.11 2014/09/
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -396,8 +397,7 @@ set_option(char *arg)
 	for (p = pro; p->p_name; p++)
 		if (*p->p_name == *arg && eqin(p->p_name, arg))
 			goto found;
-	fprintf(stderr, "indent: %s: unknown parameter \"%s\"\n", option_source, arg - 1);
-	exit(1);
+	errx(1, "%s: unknown parameter \"%s\"", option_source, arg - 1);
 found:
 	switch (p->p_type) {
 
@@ -432,9 +432,8 @@ found:
 			break;
 
 		default:
-			fprintf(stderr, "\
-indent: set_option: internal error: p_special %d\n", p->p_special);
-			exit(1);
+			errx(1, "set_option: internal error: p_special %d\n",
+			 p->p_special);
 		}
 		break;
 
@@ -448,9 +447,8 @@ indent: set_option: internal error: p_sp
 	case PRO_INT:
 		if (!isdigit((unsigned char)*param_start)) {
 	need_param:
-			fprintf(stderr, "indent: %s: ``%s'' requires a parameter\n",
-			option_source, arg - 1);
-			exit(1);
+			errx(1, "%s: ``%s'' requires a parameter",
+			 option_source, arg - 1);
 		}
 		*p->p_obj = atoi(param_start);
 		break;
@@ -460,8 +458,6 @@ indent: set_option: internal error: p_sp
 		break;
 
 	default:
-		fprintf(stderr, "indent: set_option: internal error: p_type %d\n",
-		p->p_type);
-		exit(1);
+		errx(1, "set_option: internal error: p_type %d", p->p_type);
 	}
 }

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.19 src/usr.bin/indent/indent.c:1.20
--- src/usr.bin/indent/indent.c:1.19	Thu Sep  4 04:06:07 2014
+++ src/usr.bin/indent/indent.c	Mon Feb 22 19:04:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.19 2014/09/04 04:06:07 mrg Exp $	*/
+/*	$NetBSD: indent.c,v 1.20 2016/02/22 19:04:18 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -75,7 +75,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985 Sun
 #if 0
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #else
-__RCSID("$NetBSD: indent.c,v 1.19 2014/09/04 04:06:07 mrg Exp $");
+__RCSID("$NetBSD: indent.c,v 1.20 2016/02/22 19:04:18 ginsbach Exp $");
 #endif
 #endif/* not lint */
 
@@ -236,8 +236,7 @@ main(int argc, char **argv)
  * output file */
 	if (strcmp(in_name, out_name) == 0) {	/* attempt to overwrite
 		 * the file */
-		fprintf(stderr, "indent: input and output files must be different\n");
-		exit(1);
+		errx(1, "input and output files must be different");
 	}
 	output = fopen(out_name, "w");
 	if (output == 0)	/* check for create
@@ -245,8 +244,7 @@ main(int argc, char **argv)
 		err(1, "%s", out_name);
 	continue;
 }
-			fprintf(stderr, "indent: unknown parameter: %s\n", argv[i]);
-			exit(1);
+			errx(1, "unknown parameter: %s", argv[i]);
 		} else
 			set_option(argv[i]);
 	}			/* end of for */

Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.15 src/usr.bin/indent/io.c:1.16
--- src/usr.bin/indent/io.c:1.15	Thu Sep  4 04:06:07 2014
+++ src/usr.bin/indent/io.c	Mon Feb 22 19:04:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.15 2014/09/04 04:06:07 mrg Exp $	*/
+/*	$NetBSD: io.c,v 1.16 2016/02/22 19:04:18 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: io.c,v 1.15 2014/09/04 04:06:07 mrg Exp $");
+__RCSID("$NetBSD: io.c,v 1.16 2016/02/22 19:04:18 ginsbach Exp $");
 #endif
 #endif/* not lint */
 
@@ -668,8 +668,7 @@ parsefont(struct fstate *f, const char *
 		if (*s == '-')
 			sizedelta--;
 		else {
-			fprintf(stderr, "indent: bad font specification: %s\n", s0);
-			exit(1);
+			errx(1, "bad font specification: %s", s0);
 		}
 		s++;
 	}

CVS commit: [netbsd-7-0] src/doc

2016-02-22 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Feb 22 11:25:39 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
1075


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-7.0.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.33 src/doc/CHANGES-7.0.1:1.1.2.34
--- src/doc/CHANGES-7.0.1:1.1.2.33	Thu Feb 11 23:13:25 2016
+++ src/doc/CHANGES-7.0.1	Mon Feb 22 11:25:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.33 2016/02/11 23:13:25 snj Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.34 2016/02/22 11:25:39 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -960,3 +960,9 @@ sys/external/bsd/drm2/linux/linux_work.c
 	WORK_DELAYED_CANCELLED case.  PR#49560.
 	[riastradh, ticket #1086]
 
+crypto/external/bsd/openssh/dist/readconf.c	patch
+crypto/external/bsd/openssh/dist/ssh.c		patch
+
+	Fix CVE CVE-2016-0777 by disabling roaming completely.
+	[christos, ticket #1075]
+

CVS commit: [netbsd-7] src/doc

2016-02-22 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Feb 22 11:25:01 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
1075


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-7.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.56 src/doc/CHANGES-7.1:1.1.2.57
--- src/doc/CHANGES-7.1:1.1.2.56	Fri Feb 12 10:56:48 2016
+++ src/doc/CHANGES-7.1	Mon Feb 22 11:25:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.56 2016/02/12 10:56:48 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.57 2016/02/22 11:25:01 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -2039,3 +2039,9 @@ sys/arch/x86/x86/pmap.cpatch
 	Use IPL_NONE for pserialized lock.  Assert sleepable.
 	[riastradh, ticket #1115]
 
+crypto/external/bsd/openssh/dist/readconf.c	patch
+crypto/external/bsd/openssh/dist/ssh.c		patch
+
+	Fix CVE CVE-2016-0777 by disabling roaming completely.
+	[christos, ticket #1075]
+

CVS commit: [netbsd-7-0] src/crypto/external/bsd/openssh/dist

2016-02-22 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Feb 22 11:24:18 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7-0]: readconf.c ssh.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1075):
crypto/external/bsd/openssh/dist/readconf.c: patch
crypto/external/bsd/openssh/dist/ssh.c: patch
Fix CVE CVE-2016-0777 by disabling roaming completely.


To generate a diff of this commit:
cvs rdiff -u -r1.11.4.1 -r1.11.4.1.2.1 \
src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.1.2.1 \
src/crypto/external/bsd/openssh/dist/ssh.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssh/dist/readconf.c
diff -u src/crypto/external/bsd/openssh/dist/readconf.c:1.11.4.1 src/crypto/external/bsd/openssh/dist/readconf.c:1.11.4.1.2.1
--- src/crypto/external/bsd/openssh/dist/readconf.c:1.11.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/readconf.c	Mon Feb 22 11:24:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: readconf.c,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: readconf.c,v 1.11.4.1.2.1 2016/02/22 11:24:18 snj Exp $	*/
 /* $OpenBSD: readconf.c,v 1.232 2015/02/16 22:13:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen 
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: readconf.c,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.11.4.1.2.1 2016/02/22 11:24:18 snj Exp $");
 #include 
 #include 
 #include 
@@ -1745,7 +1745,7 @@ initialize_options(Options * options)
 	options->tun_remote = -1;
 	options->local_command = NULL;
 	options->permit_local_command = -1;
-	options->use_roaming = -1;
+	options->use_roaming = 0;
 	options->visual_host_key = -1;
 	options->ip_qos_interactive = -1;
 	options->ip_qos_bulk = -1;
@@ -1960,8 +1960,7 @@ fill_default_options(Options * options)
 		options->tun_remote = SSH_TUNID_ANY;
 	if (options->permit_local_command == -1)
 		options->permit_local_command = 0;
-	if (options->use_roaming == -1)
-		options->use_roaming = 1;
+	options->use_roaming = 0;
 	if (options->visual_host_key == -1)
 		options->visual_host_key = 0;
 	if (options->ip_qos_interactive == -1)

Index: src/crypto/external/bsd/openssh/dist/ssh.c
diff -u src/crypto/external/bsd/openssh/dist/ssh.c:1.14.4.1 src/crypto/external/bsd/openssh/dist/ssh.c:1.14.4.1.2.1
--- src/crypto/external/bsd/openssh/dist/ssh.c:1.14.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/ssh.c	Mon Feb 22 11:24:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssh.c,v 1.14.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: ssh.c,v 1.14.4.1.2.1 2016/02/22 11:24:18 snj Exp $	*/
 /* $OpenBSD: ssh.c,v 1.416 2015/03/03 06:48:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen 
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh.c,v 1.14.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: ssh.c,v 1.14.4.1.2.1 2016/02/22 11:24:18 snj Exp $");
 #include 
 #include 
 #include 
@@ -1963,9 +1963,6 @@ ssh_session2(void)
 			fork_postauth();
 	}
 
-	if (options.use_roaming)
-		request_roaming();
-
 	return client_loop(tty_flag, tty_flag ?
 	options.escape_char : SSH_ESCAPECHAR_NONE, id);
 }

CVS commit: [netbsd-7] src/crypto/external/bsd/openssh/dist

2016-02-22 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Feb 22 11:23:29 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: readconf.c ssh.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1075):
crypto/external/bsd/openssh/dist/readconf.c: patch
crypto/external/bsd/openssh/dist/ssh.c: patch
Fix CVE CVE-2016-0777 by disabling roaming completely.


To generate a diff of this commit:
cvs rdiff -u -r1.11.4.1 -r1.11.4.2 \
src/crypto/external/bsd/openssh/dist/readconf.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 src/crypto/external/bsd/openssh/dist/ssh.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssh/dist/readconf.c
diff -u src/crypto/external/bsd/openssh/dist/readconf.c:1.11.4.1 src/crypto/external/bsd/openssh/dist/readconf.c:1.11.4.2
--- src/crypto/external/bsd/openssh/dist/readconf.c:1.11.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/readconf.c	Mon Feb 22 11:23:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: readconf.c,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: readconf.c,v 1.11.4.2 2016/02/22 11:23:29 snj Exp $	*/
 /* $OpenBSD: readconf.c,v 1.232 2015/02/16 22:13:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen 
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: readconf.c,v 1.11.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: readconf.c,v 1.11.4.2 2016/02/22 11:23:29 snj Exp $");
 #include 
 #include 
 #include 
@@ -1745,7 +1745,7 @@ initialize_options(Options * options)
 	options->tun_remote = -1;
 	options->local_command = NULL;
 	options->permit_local_command = -1;
-	options->use_roaming = -1;
+	options->use_roaming = 0;
 	options->visual_host_key = -1;
 	options->ip_qos_interactive = -1;
 	options->ip_qos_bulk = -1;
@@ -1960,8 +1960,7 @@ fill_default_options(Options * options)
 		options->tun_remote = SSH_TUNID_ANY;
 	if (options->permit_local_command == -1)
 		options->permit_local_command = 0;
-	if (options->use_roaming == -1)
-		options->use_roaming = 1;
+	options->use_roaming = 0;
 	if (options->visual_host_key == -1)
 		options->visual_host_key = 0;
 	if (options->ip_qos_interactive == -1)

Index: src/crypto/external/bsd/openssh/dist/ssh.c
diff -u src/crypto/external/bsd/openssh/dist/ssh.c:1.14.4.1 src/crypto/external/bsd/openssh/dist/ssh.c:1.14.4.2
--- src/crypto/external/bsd/openssh/dist/ssh.c:1.14.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/ssh.c	Mon Feb 22 11:23:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssh.c,v 1.14.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: ssh.c,v 1.14.4.2 2016/02/22 11:23:29 snj Exp $	*/
 /* $OpenBSD: ssh.c,v 1.416 2015/03/03 06:48:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen 
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh.c,v 1.14.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: ssh.c,v 1.14.4.2 2016/02/22 11:23:29 snj Exp $");
 #include 
 #include 
 #include 
@@ -1963,9 +1963,6 @@ ssh_session2(void)
 			fork_postauth();
 	}
 
-	if (options.use_roaming)
-		request_roaming();
-
 	return client_loop(tty_flag, tty_flag ?
 	options.escape_char : SSH_ESCAPECHAR_NONE, id);
 }

CVS commit: src/doc

2016-02-22 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Mon Feb 22 10:10:15 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note import of openresolv-3.7.3


To generate a diff of this commit:
cvs rdiff -u -r1.1306 -r1.1307 src/doc/3RDPARTY
cvs rdiff -u -r1.2136 -r1.2137 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1306 src/doc/3RDPARTY:1.1307
--- src/doc/3RDPARTY:1.1306	Sat Feb 20 02:50:33 2016
+++ src/doc/3RDPARTY	Mon Feb 22 10:10:15 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1306 2016/02/20 02:50:33 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1307 2016/02/22 10:10:15 roy Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -972,8 +972,8 @@ Location:	external/bsd/openpam/dist
 Notes:
 
 Package:	openresolv
-Version:	3.7.1
-Current Vers:	3.7.1
+Version:	3.7.3
+Current Vers:	3.7.3
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/openresolv/
 Home Page:	http://roy.marples.name/projects/openresolv/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2136 src/doc/CHANGES:1.2137
--- src/doc/CHANGES:1.2136	Sat Feb 20 02:50:33 2016
+++ src/doc/CHANGES	Mon Feb 22 10:10:15 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2136 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2137 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -249,3 +249,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	dhcpcd: Import dhcpcd 6.10.1. [roy 20160120]
 	openssl: Import openssl 1.0.1r [christos 20160130]
 	elftoolchain: Import FreeBSD-2016-02-19. [christos 20160219]
+	openresolv: Import openresolv-3.7.3. [roy 20160222]

CVS commit: src/external/bsd/openresolv/dist

2016-02-22 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Mon Feb 22 10:09:06 UTC 2016

Modified Files:
src/external/bsd/openresolv/dist: resolvconf.conf.5.in

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.13 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.14
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.13	Tue Sep 29 09:11:47 2015
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in	Mon Feb 22 10:09:06 2016
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009-2015 Roy Marples
+.\" Copyright (c) 2009-2016 Roy Marples
 .\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 14, 2015
+.Dd February 21, 2016
 .Dt RESOLVCONF.CONF 5
 .Os
 .Sh NAME
@@ -42,8 +42,11 @@ must contain valid shell commands.
 Listed below are the standard
 .Nm
 variables that may be set.
-If the values contain white space for special shell characters,
+If the values contain whitespace, wildcards or other special shell characters,
 ensure they are quoted and escaped correctly.
+See the
+.Sy replace
+variable for an example on quoting.
 .Pp
 After updating this file, you may wish to run
 .Nm resolvconf -u

CVS import: src/external/bsd/openresolv/dist

2016-02-22 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Mon Feb 22 10:07:27 UTC 2016

Update of /cvsroot/src/external/bsd/openresolv/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv26587

Log Message:
Import openresolv-3.7.3 with the following changes:
  *  Save the initial working directory and change to it just before
 running any scripts.
 This avoids scripts putting files accidently where they shouldn't.
  *  Strip trailing dot from search and domain names.
  *  man page improvements.

Status:

Vendor Tag: roy
Release Tags:   openresolv-3-7-3

U src/external/bsd/openresolv/dist/README
U src/external/bsd/openresolv/dist/resolvconf.in
U src/external/bsd/openresolv/dist/resolvconf.8.in
C src/external/bsd/openresolv/dist/resolvconf.conf.5.in
U src/external/bsd/openresolv/dist/libc.in
U src/external/bsd/openresolv/dist/dnsmasq.in
U src/external/bsd/openresolv/dist/named.in
U src/external/bsd/openresolv/dist/pdnsd.in
U src/external/bsd/openresolv/dist/unbound.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jroy:yesterday -jroy src/external/bsd/openresolv/dist

CVS commit: src/sys/dev/usb

2016-02-22 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Feb 22 08:06:47 UTC 2016

Modified Files:
src/sys/dev/usb: ugen.c

Log Message:
Provide a ugen_clear_endpoints declaration


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/usb/ugen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.130 src/sys/dev/usb/ugen.c:1.131
--- src/sys/dev/usb/ugen.c:1.130	Mon Feb 22 07:46:00 2016
+++ src/sys/dev/usb/ugen.c	Mon Feb 22 08:06:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugen.c,v 1.130 2016/02/22 07:46:00 skrll Exp $	*/
+/*	$NetBSD: ugen.c,v 1.131 2016/02/22 08:06:47 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.130 2016/02/22 07:46:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.131 2016/02/22 08:06:47 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -175,6 +175,7 @@ Static usb_config_descriptor_t *ugen_get
 	   int index, int *lenp);
 Static usbd_status ugen_set_interface(struct ugen_softc *, int, int);
 Static int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx);
+Static void ugen_clear_endpoints(struct ugen_softc *);
 
 #define UGENUNIT(n) ((minor(n) >> 4) & 0xf)
 #define UGENENDPOINT(n) (minor(n) & 0xf)

CVS commit: xsrc/external/mit/xdm/dist/man

CVS commit: xsrc/external/mit/xdm/dist/man

CVS commit: src/usr.bin/indent

CVS commit: src/usr.bin/indent

CVS commit: src/bin/sh

CVS commit: src/tests/bin/sh

CVS commit: src/bin/sh

CVS commit: src/distrib/sets/lists/tests

CVS commit: src/tests/bin/sh

CVS commit: src/bin/sh

CVS commit: src/bin/sh

CVS commit: src/bin/sh

CVS commit: src/usr.bin/indent

CVS commit: [netbsd-7-0] src/doc

CVS commit: [netbsd-7] src/doc

CVS commit: [netbsd-7-0] src/crypto/external/bsd/openssh/dist

CVS commit: [netbsd-7] src/crypto/external/bsd/openssh/dist

CVS commit: src/doc

CVS commit: src/external/bsd/openresolv/dist

CVS import: src/external/bsd/openresolv/dist

CVS commit: src/sys/dev/usb

21 matches

Site Navigation

Mail list logo

Footer information