Module Name:    src
Committed By:   jruoho
Date:           Fri Jun  3 05:42:09 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/lib/libc/gen: Makefile
Added Files:
        src/tests/lib/libc/gen: t_setdomainname.c

Log Message:
Test also setdomainname(3).


To generate a diff of this commit:
cvs rdiff -u -r1.344 -r1.345 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libc/gen/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/gen/t_setdomainname.c

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.344 src/distrib/sets/lists/tests/mi:1.345
--- src/distrib/sets/lists/tests/mi:1.344	Thu Jun  2 12:15:33 2011
+++ src/distrib/sets/lists/tests/mi	Fri Jun  3 05:42:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.344 2011/06/02 12:15:33 jruoho Exp $
+# $NetBSD: mi,v 1.345 2011/06/03 05:42:09 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -365,6 +365,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_raise.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_randomid.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/gen/t_setdomainname.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_sethostname.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_siginfo.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_syslog_pthread.debug	tests-lib-debug		debug,atf
@@ -1801,6 +1802,7 @@
 ./usr/tests/lib/libc/gen/t_raise		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_randomid		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_rbstress		tests-obsolete		obsolete
+./usr/tests/lib/libc/gen/t_setdomainname	tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_sethostname		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_siginfo		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_syslog_pthread	tests-lib-tests		atf

Index: src/tests/lib/libc/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.24 src/tests/lib/libc/gen/Makefile:1.25
--- src/tests/lib/libc/gen/Makefile:1.24	Thu Jun  2 12:15:33 2011
+++ src/tests/lib/libc/gen/Makefile	Fri Jun  3 05:42:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/06/02 12:15:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.25 2011/06/03 05:42:09 jruoho Exp $
 
 .include <bsd.own.mk>
 
@@ -18,6 +18,7 @@
 TESTS_C+=	t_pause
 TESTS_C+=	t_raise
 TESTS_C+=	t_randomid
+TESTS_C+=	t_setdomainname
 TESTS_C+=	t_sethostname
 TESTS_C+=	t_siginfo
 TESTS_C+=	t_syslog_pthread

Added files:

Index: src/tests/lib/libc/gen/t_setdomainname.c
diff -u /dev/null src/tests/lib/libc/gen/t_setdomainname.c:1.1
--- /dev/null	Fri Jun  3 05:42:09 2011
+++ src/tests/lib/libc/gen/t_setdomainname.c	Fri Jun  3 05:42:09 2011
@@ -0,0 +1,132 @@
+/* $NetBSD: t_setdomainname.c,v 1.1 2011/06/03 05:42:09 jruoho 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.1 2011/06/03 05:42:09 jruoho Exp $");
+
+#include <sys/param.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+static char domain[MAXHOSTNAMELEN];
+
+static const char domains[][MAXHOSTNAMELEN] = {
+	"1234567890",
+	"abcdefghijklmnopqrst",
+	"!#�%&/(..xasS812=!=!(I(!;X;;X.as.dasa=?;,..<>|**^�",
+	"--------------------------------------------------------------------"
+};
+
+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;
+
+	for (i = 0; i < __arraycount(domains); i++) {
+
+		(void)memset(name, 0, sizeof(name));
+
+		ATF_REQUIRE(setdomainname(domains[i],sizeof(domains[i])) == 0);
+		ATF_REQUIRE(getdomainname(name, sizeof(name)) == 0);
+		ATF_REQUIRE(strcmp(domains[i], name) == 0);
+	}
+
+	(void)setdomainname(domain, sizeof(domain));
+}
+
+ATF_TC_CLEANUP(setdomainname_basic, tc)
+{
+	(void)setdomainname(domain, sizeof(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));
+
+	ATF_REQUIRE(setdomainname(name, sizeof(name)) == -1);
+}
+
+ATF_TC_CLEANUP(setdomainname_limit, tc)
+{
+	(void)setdomainname(domain, sizeof(domain));
+}
+
+ATF_TC_WITH_CLEANUP(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)
+{
+
+	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();
+}

Reply via email to