testsuite error on Solaris 2.6

[Ingo Schwarze]

Hi Tom,

Tom G. Christensen wrote on Sun, Apr 02, 2017 at 05:33:33PM +0200:

> For reference this is the patch I made and included in my Solaris 2.6
> openssh packages:
> https://github.com/tgc/tgcware-for-solaris/blob/master/openssh/src/0001-Treat-empty-codeset-value-as-ascii.patch
[...]
> Note that in 7.5p1, '646' was added as an additional alias (which happened
> to cover not only NetBSD but also Solaris 7 and later.)

at long last, i committed the patch appended below to OpenBSD.

By the standard OpenSSH-portable development process, i assume
that it is likely to also show up in the next OpenSSH-portable
release.

Thanks again for reporting,
  Ingo


CVSROOT:	/cvs
Module name:	src
Changes by:	schwarze at cvs.openbsd.org	2017/04/17 08:31:23

Modified files:
	usr.bin/ssh    : utf8.c 

Log message:
Recognize nl_langinfo(CODESET) return values "646" and "" as aliases
for "US-ASCII", useful for different versions of NetBSD and Solaris.
Found by dtucker@ and by Tom G. Christensen <tgc at jupiterrise dot com>.
OK dtucker@ deraadt@


Index: utf8.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/utf8.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- utf8.c	19 Feb 2017 00:10:57 -0000	1.5
+++ utf8.c	17 Apr 2017 14:31:23 -0000	1.6
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.5 2017/02/19 00:10:57 djm Exp $ */
+/* $OpenBSD: utf8.c,v 1.6 2017/04/17 14:31:23 schwarze Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze at openbsd.org>
  *
@@ -52,7 +52,8 @@ dangerous_locale(void) {
 
 	loc = nl_langinfo(CODESET);
 	return strcmp(loc, "US-ASCII") != 0 && strcmp(loc, "UTF-8") != 0 &&
-	    strcmp(loc, "ANSI_X3.4-1968") != 0;
+	    strcmp(loc, "ANSI_X3.4-1968") != 0 && strcmp(loc, "646") != 0 &&
+	    strcmp(loc, "") != 0;
 }
 
 static int