4 files changed, 52 insertions, 52 deletions

diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile
index cec3bb180a6aa..d36e1097c6d2e 100644
--- a/lib/libcasper/services/cap_dns/Makefile
+++ b/lib/libcasper/services/cap_dns/Makefile
@@ -6,7 +6,7 @@ SHLIBDIR?=	/lib/casper
 
 PACKAGE=libcasper
 
-SHLIB_MAJOR=	1
+SHLIB_MAJOR=	2
 INCSDIR?=	${INCLUDEDIR}/casper
 
 .if ${MK_CASPER} != "no"
diff --git a/lib/libcasper/services/cap_dns/cap_dns.3 b/lib/libcasper/services/cap_dns/cap_dns.3
index bc38e6bf3dd8e..47444b6a24614 100644
--- a/lib/libcasper/services/cap_dns/cap_dns.3
+++ b/lib/libcasper/services/cap_dns/cap_dns.3
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 4, 2018
+.Dd November 12, 2018
 .Dt CAP_DNS 3
 .Os
 .Sh NAME
@@ -92,9 +92,9 @@ function limits the functions allowed in the service.
 The
 .Fa types
 variable can be set to
-.Dv ADDR
+.Dv ADDR2NAME
 or
-.Dv NAME .
+.Dv NAME2ADDR .
 See the
 .Sx LIMITS
 section for more details.
@@ -129,9 +129,9 @@ for that function can contain the following values and types:
 The
 .Va type
 can have two values:
-.Dv ADDR
+.Dv ADDR2NAME
 or
-.Dv NAME .
+.Dv NAME2ADDR .
 The
 .Dv ADDR
 means that reverse DNS lookups are allowed with
diff --git a/lib/libcasper/services/cap_dns/cap_dns.c b/lib/libcasper/services/cap_dns/cap_dns.c
index 319abb35f4eef..0abadaff6d77a 100644
--- a/lib/libcasper/services/cap_dns/cap_dns.c
+++ b/lib/libcasper/services/cap_dns/cap_dns.c
@@ -474,7 +474,7 @@ dns_gethostbyname(const nvlist_t *limits, const nvlist_t *nvlin,
 	struct hostent *hp;
 	int family;
 
-	if (!dns_allowed_type(limits, "NAME"))
+	if (!dns_allowed_type(limits, "NAME2ADDR"))
 		return (NO_RECOVERY);
 
 	family = (int)nvlist_get_number(nvlin, "family");
@@ -498,7 +498,7 @@ dns_gethostbyaddr(const nvlist_t *limits, const nvlist_t *nvlin,
 	size_t addrsize;
 	int family;
 
-	if (!dns_allowed_type(limits, "ADDR"))
+	if (!dns_allowed_type(limits, "ADDR2NAME"))
 		return (NO_RECOVERY);
 
 	family = (int)nvlist_get_number(nvlin, "family");
@@ -524,7 +524,7 @@ dns_getnameinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
 	socklen_t salen;
 	int error, flags;
 
-	if (!dns_allowed_type(limits, "ADDR"))
+	if (!dns_allowed_type(limits, "ADDR2NAME"))
 		return (NO_RECOVERY);
 
 	error = 0;
@@ -617,7 +617,7 @@ dns_getaddrinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
 	unsigned int ii;
 	int error, family, n;
 
-	if (!dns_allowed_type(limits, "NAME"))
+	if (!dns_allowed_type(limits, "NAME2ADDR"))
 		return (NO_RECOVERY);
 
 	hostname = dnvlist_get_string(nvlin, "hostname", NULL);
@@ -702,8 +702,8 @@ dns_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits)
 			if (strncmp(name, "type", sizeof("type") - 1) != 0)
 				return (EINVAL);
 			type = nvlist_get_string(newlimits, name);
-			if (strcmp(type, "ADDR") != 0 &&
-			    strcmp(type, "NAME") != 0) {
+			if (strcmp(type, "ADDR2NAME") != 0 &&
+			    strcmp(type, "NAME2ADDR") != 0) {
 				return (EINVAL);
 			}
 			if (!dns_allowed_type(oldlimits, type))
diff --git a/lib/libcasper/services/cap_dns/tests/dns_test.c b/lib/libcasper/services/cap_dns/tests/dns_test.c
index f95209b3320e8..e25caf9c1c928 100644
--- a/lib/libcasper/services/cap_dns/tests/dns_test.c
+++ b/lib/libcasper/services/cap_dns/tests/dns_test.c
@@ -357,8 +357,8 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET;
 	families[1] = AF_INET6;
@@ -380,12 +380,12 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
-	types[1] = "ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;
@@ -407,12 +407,12 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
-	types[1] = "NAME";
+	types[1] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;
@@ -432,8 +432,8 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET;
 	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
@@ -459,8 +459,8 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET6;
 	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
@@ -488,18 +488,18 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET;
 	families[1] = AF_INET6;
 	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
-	types[1] = "ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;
@@ -525,18 +525,18 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET;
 	families[1] = AF_INET6;
 	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
-	types[1] = "ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET6;
@@ -562,18 +562,18 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET;
 	families[1] = AF_INET6;
 	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
-	types[1] = "NAME";
+	types[1] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;
@@ -598,18 +598,18 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
 	families[0] = AF_INET;
 	families[1] = AF_INET6;
 	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
-	types[1] = "NAME";
+	types[1] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET6;
@@ -630,13 +630,13 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
 	families[0] = AF_INET;
 	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;
@@ -644,7 +644,7 @@ main(void)
 	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
 	    errno == ENOTCAPABLE);
 
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET6;
@@ -665,13 +665,13 @@ main(void)
 	capdns = cap_clone(origcapdns);
 	CHECK(capdns != NULL);
 
-	types[0] = "ADDR";
+	types[0] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
 	families[0] = AF_INET6;
 	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
 
-	types[0] = "NAME";
-	types[1] = "ADDR";
+	types[0] = "NAME2ADDR";
+	types[1] = "ADDR2NAME";
 	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;
@@ -679,7 +679,7 @@ main(void)
 	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
 	    errno == ENOTCAPABLE);
 
-	types[0] = "NAME";
+	types[0] = "NAME2ADDR";
 	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
 	    errno == ENOTCAPABLE);
 	families[0] = AF_INET;