Rename "asr" to "stub" in user visible parts.

More people know what a "stub" resolver is then asr.

Pointed out by & discussed with deraadt
Input & OK otto

6 files changed, 18 insertions, 18 deletions

diff --git a/sbin/unwind/parse.y b/sbin/unwind/parse.y
index 654b1c202bd..e79260e2be2 100644
--- a/sbin/unwind/parse.y
+++ b/sbin/unwind/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.13 2019/11/03 09:46:11 otto Exp $	*/
+/*	$OpenBSD: parse.y,v 1.14 2019/11/06 14:19:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -100,7 +100,7 @@ typedef struct {
 
 %token	YES NO INCLUDE ERROR
 %token	FORWARDER DOT PORT CAPTIVE PORTAL URL EXPECTED RESPONSE
-%token	STATUS AUTO AUTHENTICATION NAME PREFERENCE RECURSOR DHCP ASR
+%token	STATUS AUTO AUTHENTICATION NAME PREFERENCE RECURSOR DHCP STUB
 %token	BLOCK LIST LOG
 
 %token	<v.string>	STRING
@@ -270,7 +270,7 @@ prefopt			: DOT		{ $$ = UW_RES_DOT; }
 			| FORWARDER	{ $$ = UW_RES_FORWARDER; }
 			| RECURSOR	{ $$ = UW_RES_RECURSOR; }
 			| DHCP		{ $$ = UW_RES_DHCP; }
-			| ASR		{ $$ = UW_RES_ASR; }
+			| STUB		{ $$ = UW_RES_ASR; }
 			;
 
 uw_forwarder		: FORWARDER forwarder_block
@@ -404,7 +404,6 @@ lookup(char *s)
 	/* This has to be sorted always. */
 	static const struct keywords keywords[] = {
 		{"DoT",			DOT},
-		{"asr",			ASR},
 		{"authentication",	AUTHENTICATION},
 		{"auto",		AUTO},
 		{"block",		BLOCK},
@@ -424,6 +423,7 @@ lookup(char *s)
 		{"recursor",		RECURSOR},
 		{"response",		RESPONSE},
 		{"status",		STATUS},
+		{"stub",		STUB},
 		{"tls",			DOT},
 		{"url",			URL},
 		{"yes",			YES},
diff --git a/sbin/unwind/unwind.conf.5 b/sbin/unwind/unwind.conf.5
index f4d1d3352d8..597c989b17d 100644
--- a/sbin/unwind/unwind.conf.5
+++ b/sbin/unwind/unwind.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unwind.conf.5,v 1.16 2019/10/31 12:51:43 florian Exp $
+.\"	$OpenBSD: unwind.conf.5,v 1.17 2019/11/06 14:19:59 florian Exp $
 .\"
 .\" Copyright (c) 2018 Florian Obser <florian@openbsd.org>
 .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 31 2019 $
+.Dd $Mdocdate: November 6 2019 $
 .Dt UNWIND.CONF 5
 .Os
 .Sh NAME
@@ -131,8 +131,8 @@ Validating name servers are always picked over non-validating name servers.
 DNS name server types are:
 .Pp
 .Bl -tag -width "forwarder" -compact
-.It Ic asr
-Name servers learned via DHCP, queried using the asr functions.
+.It Ic stub
+Name servers learned via DHCP, queried using the libc functions.
 See
 .Xr asr_run 3 .
 Will never validate.
@@ -151,7 +151,7 @@ itself recursively resolves names.
 .El
 .Pp
 The default preference is
-.Ic DoT forwarder recursor dhcp asr .
+.Ic DoT forwarder recursor dhcp stub .
 .El
 .Sh FILES
 .Bl -tag -width "/etc/examples/unwind.conf" -compact
diff --git a/sbin/unwind/unwind.h b/sbin/unwind/unwind.h
index 7c146634f3e..e5bf373c57b 100644
--- a/sbin/unwind/unwind.h
+++ b/sbin/unwind/unwind.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.h,v 1.21 2019/11/03 09:46:11 otto Exp $	*/
+/*	$OpenBSD: unwind.h,v 1.22 2019/11/06 14:19:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -66,7 +66,7 @@ enum uw_resolver_type {
 static const char * const	uw_resolver_type_str[] = {
 	"recursor",
 	"dhcp",
-	"asr",
+	"stub",
 	"forwarder",
 	"DoT"
 };
diff --git a/usr.sbin/unwindctl/parser.c b/usr.sbin/unwindctl/parser.c
index da1b1a9174b..a130de587f7 100644
--- a/usr.sbin/unwindctl/parser.c
+++ b/usr.sbin/unwindctl/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.5 2019/11/03 09:49:02 otto Exp $	*/
+/*	$OpenBSD: parser.c,v 1.6 2019/11/06 14:19:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -74,7 +74,7 @@ static const struct token t_status[] = {
 	{KEYWORD,	"dhcp",		STATUS_DHCP,		NULL},
 	{KEYWORD,	"forwarder",	STATUS_STATIC,		NULL},
 	{KEYWORD,	"DoT",		STATUS_DOT,		NULL},
-	{KEYWORD,	"asr",		STATUS_ASR,		NULL},
+	{KEYWORD,	"stub",		STATUS_STUB,		NULL},
 	{ENDTOKEN,	"",		STATUS,			NULL}
 };
 
diff --git a/usr.sbin/unwindctl/parser.h b/usr.sbin/unwindctl/parser.h
index 8bd074934d9..4e641069278 100644
--- a/usr.sbin/unwindctl/parser.h
+++ b/usr.sbin/unwindctl/parser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.h,v 1.4 2019/10/31 12:51:43 florian Exp $	*/
+/*	$OpenBSD: parser.h,v 1.5 2019/11/06 14:19:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -29,7 +29,7 @@ enum actions {
 	STATUS_DHCP,
 	STATUS_STATIC,
 	STATUS_DOT,
-	STATUS_ASR
+	STATUS_STUB
 };
 
 struct parse_result {
diff --git a/usr.sbin/unwindctl/unwindctl.c b/usr.sbin/unwindctl/unwindctl.c
index ce7bed1ae56..a756aeb588b 100644
--- a/usr.sbin/unwindctl/unwindctl.c
+++ b/usr.sbin/unwindctl/unwindctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwindctl.c,v 1.9 2019/11/03 09:49:02 otto Exp $	*/
+/*	$OpenBSD: unwindctl.c,v 1.10 2019/11/06 14:19:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -167,7 +167,7 @@ main(int argc, char *argv[])
 		imsg_compose(ibuf, IMSG_CTL_STATUS, 0, 0, -1, &type,
 		    sizeof(type));
 		break;
-	case STATUS_ASR:
+	case STATUS_STUB:
 		type = UW_RES_ASR;
 		imsg_compose(ibuf, IMSG_CTL_STATUS, 0, 0, -1, &type,
 		    sizeof(type));
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 			case STATUS_DHCP:
 			case STATUS_STATIC:
 			case STATUS_DOT:
-			case STATUS_ASR:
+			case STATUS_STUB:
 				done = show_status_msg(&imsg);
 				break;
 			default: