Index: stable/10/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
===================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c	(revision 321877)
+++ stable/10/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c	(revision 321878)
@@ -1,148 +1,182 @@
 /* $NetBSD: t_setdomainname.c,v 1.2 2012/03/25 08:17:54 joerg Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
  *
  * 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.
  */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_setdomainname.c,v 1.2 2012/03/25 08:17:54 joerg Exp $");
 
 #include <sys/param.h>
 
 #include <atf-c.h>
+#include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 
-static char domain[MAXHOSTNAMELEN];
+#define	DOMAIN_BACKUP_FILE "domain.bak"
 
 static const char domains[][MAXHOSTNAMELEN] = {
 	"1234567890",
 	"abcdefghijklmnopqrst",
 	"!#\xa4%&/(..xasS812=!=!(I(!;X;;X.as.dasa=?;,..<>|**^\xa8",
 	"--------------------------------------------------------------------"
 };
 
+static void
+backup_domain(void)
+{
+	char domain[MAXHOSTNAMELEN];
+	int fd;
+	size_t l;
+	ssize_t r,n = 0;
+
+	memset(domain, 0, sizeof(domain));
+
+	ATF_REQUIRE_EQ(0, getdomainname(domain, sizeof(domain)));
+	l = strnlen(domain, MAXHOSTNAMELEN);
+	fd = open(DOMAIN_BACKUP_FILE, O_WRONLY | O_CREAT | O_EXCL, 0644);
+	ATF_REQUIRE(fd >= 0);
+	while ((r = write(fd, domain + n, l - n)) > 0)
+		n += r;
+	ATF_REQUIRE_EQ(0, r);
+	close(fd);
+}
+
+static void
+restore_domain(void)
+{
+	char domain[MAXHOSTNAMELEN];
+	int fd;
+	ssize_t r, n = 0;
+
+	memset(domain, 0, sizeof(domain));
+	if ((fd = open(DOMAIN_BACKUP_FILE, O_RDONLY)) < 0)
+		err(1, "open");
+	while ((r = read(fd, domain + n, sizeof(domain) - n)) > 0)
+		n += r;
+	if (r < 0)
+		err(1, "read");
+	if (setdomainname(domain, n) != 0)
+		err(1, "setdomainname");
+	close(fd);
+}
+
 ATF_TC_WITH_CLEANUP(setdomainname_basic);
 ATF_TC_HEAD(setdomainname_basic, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "A basic test of setdomainname(3)");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(setdomainname_basic, tc)
 {
 	char name[MAXHOSTNAMELEN];
 	size_t i;
 
+	backup_domain();
 	for (i = 0; i < __arraycount(domains); i++) {
 
 		(void)memset(name, 0, sizeof(name));
 
 #ifdef __FreeBSD__
 		/*
 		 * Sanity checks to ensure that the wrong invariant isn't being
 		 * tested for per PR # 181127
 		 */
 		ATF_REQUIRE_EQ(sizeof(domains[i]), MAXHOSTNAMELEN);
 		ATF_REQUIRE_EQ(sizeof(name), MAXHOSTNAMELEN);
 
 		ATF_REQUIRE(setdomainname(domains[i],sizeof(domains[i]) -  1) == 0);
 		ATF_REQUIRE(getdomainname(name, sizeof(name) - 1) == 0);
 #else
 		ATF_REQUIRE(setdomainname(domains[i],sizeof(domains[i])) == 0);
 		ATF_REQUIRE(getdomainname(name, sizeof(name)) == 0);
 #endif
 		ATF_REQUIRE(strcmp(domains[i], name) == 0);
 	}
 
-	(void)setdomainname(domain, sizeof(domain));
 }
 
 ATF_TC_CLEANUP(setdomainname_basic, tc)
 {
-	(void)setdomainname(domain, sizeof(domain));
+	restore_domain();
 }
 
 ATF_TC_WITH_CLEANUP(setdomainname_limit);
 ATF_TC_HEAD(setdomainname_limit, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Too long domain name errors out?");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(setdomainname_limit, tc)
 {
 	char name[MAXHOSTNAMELEN + 1];
 
 	(void)memset(name, 0, sizeof(name));
+	backup_domain();
 
 #ifdef __FreeBSD__
 	ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN - 1 ) == 0);
 	ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN) == -1);
 #endif
 	ATF_REQUIRE(setdomainname(name, sizeof(name)) == -1);
 }
 
 ATF_TC_CLEANUP(setdomainname_limit, tc)
 {
-	(void)setdomainname(domain, sizeof(domain));
+	restore_domain();
 }
 
-ATF_TC_WITH_CLEANUP(setdomainname_perm);
+ATF_TC(setdomainname_perm);
 ATF_TC_HEAD(setdomainname_perm, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Can normal user set the domain name?");
 	atf_tc_set_md_var(tc, "require.user", "unprivileged");
 }
 
 ATF_TC_BODY(setdomainname_perm, tc)
 {
+	char domain[MAXHOSTNAMELEN];
 
-	errno = 0;
+	memset(domain, 0, sizeof(domain));
 
+	errno = 0;
 	ATF_REQUIRE_ERRNO(EPERM, setdomainname(domain, sizeof(domain)) == -1);
 }
 
-ATF_TC_CLEANUP(setdomainname_perm, tc)
-{
-	(void)setdomainname(domain, sizeof(domain));
-}
-
 ATF_TP_ADD_TCS(tp)
 {
-
-	(void)memset(domain, 0, sizeof(domain));
-
-	ATF_REQUIRE(getdomainname(domain, sizeof(domain)) == 0);
-
 	ATF_TP_ADD_TC(tp, setdomainname_basic);
 	ATF_TP_ADD_TC(tp, setdomainname_limit);
 	ATF_TP_ADD_TC(tp, setdomainname_perm);
 
 	return atf_no_error();
 }
Index: stable/10/lib/libc/tests/gen/Makefile
===================================================================
--- stable/10/lib/libc/tests/gen/Makefile	(revision 321877)
+++ stable/10/lib/libc/tests/gen/Makefile	(revision 321878)
@@ -1,95 +1,96 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 ATF_TESTS_C+=		arc4random_test
 ATF_TESTS_C+=		fmtcheck2_test
 ATF_TESTS_C+=		fmtmsg_test
 ATF_TESTS_C+=		fnmatch2_test
 ATF_TESTS_C+=		fpclassify2_test
 ATF_TESTS_C+=		ftw_test
 ATF_TESTS_C+=		popen_test
 ATF_TESTS_C+=		posix_spawn_test
 ATF_TESTS_C+=		wordexp_test
 ATF_TESTS_C+=		realpath2_test
 
 # TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid,
 # TODO: t_siginfo (fixes require further inspection)
 # TODO: t_sethostname_test (consistently screws up the hostname)
 
 CFLAGS+=	-DTEST_LONG_DOUBLE
 
 # Not sure why this isn't defined for all architectures, since most
 # have long double.
 .if ${MACHINE_CPUARCH} == "aarch64" || \
     ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=	-D__HAVE_LONG_DOUBLE
 .endif
 
 NETBSD_ATF_TESTS_C=	alarm_test
 NETBSD_ATF_TESTS_C+=	assert_test
 NETBSD_ATF_TESTS_C+=	basedirname_test
 NETBSD_ATF_TESTS_C+=	dir_test
 NETBSD_ATF_TESTS_C+=	floatunditf_test
 NETBSD_ATF_TESTS_C+=	fnmatch_test
 NETBSD_ATF_TESTS_C+=	fpclassify_test
 NETBSD_ATF_TESTS_C+=	fpsetmask_test
 NETBSD_ATF_TESTS_C+=	fpsetround_test
 NETBSD_ATF_TESTS_C+=	ftok_test
 NETBSD_ATF_TESTS_C+=	getcwd_test
 NETBSD_ATF_TESTS_C+=	getgrent_test
 NETBSD_ATF_TESTS_C+=	glob_test
 NETBSD_ATF_TESTS_C+=	humanize_number_test
 NETBSD_ATF_TESTS_C+=	isnan_test
 NETBSD_ATF_TESTS_C+=	nice_test
 NETBSD_ATF_TESTS_C+=	pause_test
 NETBSD_ATF_TESTS_C+=	raise_test
 NETBSD_ATF_TESTS_C+=	realpath_test
 NETBSD_ATF_TESTS_C+=	setdomainname_test
 NETBSD_ATF_TESTS_C+=	sethostname_test
 NETBSD_ATF_TESTS_C+=	sleep_test
 NETBSD_ATF_TESTS_C+=	syslog_test
 NETBSD_ATF_TESTS_C+=	time_test
 NETBSD_ATF_TESTS_C+=	ttyname_test
 NETBSD_ATF_TESTS_C+=	vis_test
 
 .include "../Makefile.netbsd-tests"
 
 LDADD.humanize_number_test+=	-lutil
 DPADD.humanize_number_test+=	${LIBUTIL}
 
 LDADD.fpclassify_test+=	-lm
 DPADD.fpclassify_test+=	${LIBM}
 LDADD.fpsetround_test+=	-lm
 DPADD.fpsetround_test+=	${LIBM}
 LDADD.siginfo_test+=	-lm
 DPADD.siginfo_test+=	${LIBM}
 
 LDADD.nice_test+=	-lpthread
 DPADD.nice_test+=	${LIBPTHREAD}
 LDADD.syslog_test+=	-lpthread
 DPADD.syslog_test+=	${LIBPTHREAD}
 
 CFLAGS+=		-I${.CURDIR}
 
 SRCS.fmtcheck2_test=	fmtcheck_test.c
 SRCS.fnmatch2_test=	fnmatch_test.c
 
+TEST_METADATA.setdomainname_test+=	is_exclusive=true
 TESTS_SUBDIRS=	execve
 TESTS_SUBDIRS+=	posix_spawn
 
 # The old testcase name
 TEST_FNMATCH=	test-fnmatch
 CLEANFILES+=		${GEN_SH_CASE_TESTCASES}
 sh-tests: .PHONY
 .for target in clean obj depend all
 	@cd ${.CURDIR} && ${MAKE} PROG=${TEST_FNMATCH} \
 	    -DNO_SUBDIR ${target}
 .endfor
 	@cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 1 > \
 	    ${SRCTOP}/bin/sh/tests/builtins/case2.0
 	@cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 2 > \
 	    ${SRCTOP}/bin/sh/tests/builtins/case3.0
 
 .include <bsd.test.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 321877)
+++ stable/10	(revision 321878)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r320737,320914