d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FreeBSD doesn't support strings greater than MAXHOSTNAMELEN-1 in

Browse Source 
{get,set}{domain,host}name. Adjust the tests to not exceed that
value when testing out the code

Add a positive and negative test for MAXHOSTNAMELEN-1 and
MAXHOSTNAMELEN, respectively

PR: 181127
In collaboration with: pho
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2014-10-10 19:18:52 +00:00
parent 97dc3d98cb
commit 4cf97cc9d2
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c
View File

@ -63,8 +63,20 @@ ATF_TC_BODY(setdomainname_basic, tc)
(void)memset(name, 0, sizeof(name));
#if defined(__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);
}
@ -89,6 +101,10 @@ ATF_TC_BODY(setdomainname_limit, tc)
(void)memset(name, 0, sizeof(name));
#if defined(__FreeBSD__)
ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN - 1 ) == 0);
ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN) == -1);
#endif
ATF_REQUIRE(setdomainname(name, sizeof(name)) == -1);
}

16
contrib/netbsd-tests/lib/libc/gen/t_sethostname.c
View File

@ -63,8 +63,20 @@ ATF_TC_BODY(sethostname_basic, tc)
(void)memset(name, 0, sizeof(name));
#if defined(__FreeBSD__)
/*
* Sanity checks to ensure that the wrong invariant isn't being
* tested for per PR # 181127
*/
ATF_REQUIRE_EQ(sizeof(hosts[i]), MAXHOSTNAMELEN);
ATF_REQUIRE_EQ(sizeof(name), MAXHOSTNAMELEN);
ATF_REQUIRE(sethostname(hosts[i], sizeof(hosts[i]) - 1) == 0);
ATF_REQUIRE(gethostname(name, sizeof(name) - 1) == 0);
#else
ATF_REQUIRE(sethostname(hosts[i], sizeof(hosts[i])) == 0);
ATF_REQUIRE(gethostname(name, sizeof(name)) == 0);
#endif
ATF_REQUIRE(strcmp(hosts[i], name) == 0);
}
@ -94,6 +106,10 @@ ATF_TC_BODY(sethostname_limit, tc)
ATF_TC_CLEANUP(sethostname_limit, tc)
{
#if defined(__FreeBSD__)
ATF_REQUIRE(sethostname(host, MAXHOSTNAMELEN - 1 ) == 0);
ATF_REQUIRE(sethostname(host, MAXHOSTNAMELEN) == -1);
#endif
(void)sethostname(host, sizeof(host));
}