Remove strict mode for now, it is in the way.

4 files changed, 5 insertions, 17 deletions

diff --git a/sbin/unwind/parse.y b/sbin/unwind/parse.y
index 6518975e47a..94e6cd763ef 100644
--- a/sbin/unwind/parse.y
+++ b/sbin/unwind/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.5 2019/05/10 14:10:38 florian Exp $	*/
+/*	$OpenBSD: parse.y,v 1.6 2019/05/13 23:13:24 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -99,7 +99,7 @@ typedef struct {
 
 %}
 
-%token	STRICT YES NO INCLUDE ERROR
+%token	YES NO INCLUDE ERROR
 %token	FORWARDER DOT PORT CAPTIVE PORTAL URL EXPECTED RESPONSE
 %token	STATUS AUTO AUTHENTICATION NAME PREFERENCE RECURSOR DHCP
 %token	BLOCK LIST
@@ -114,7 +114,6 @@ typedef struct {
 grammar		: /* empty */
 		| grammar include '\n'
 		| grammar '\n'
-		| grammar conf_main '\n'
 		| grammar varset '\n'
 		| grammar uw_pref '\n'
 		| grammar uw_forwarder '\n'
@@ -173,10 +172,6 @@ varset		: STRING '=' string		{
 		}
 		;
 
-conf_main	: STRICT yesno {
-			conf->uw_options = $2;
-		}
-		;
 
 optnl		: '\n' optnl		/* zero or more newlines */
 		| /*empty*/
@@ -551,7 +546,6 @@ lookup(char *s)
 		{"recursor",		RECURSOR},
 		{"response",		RESPONSE},
 		{"status",		STATUS},
-		{"strict",		STRICT},
 		{"tls",			DOT},
 		{"url",			URL},
 		{"yes",			YES},
diff --git a/sbin/unwind/printconf.c b/sbin/unwind/printconf.c
index 0c6fa5c5fe1..1fa0ab39f7a 100644
--- a/sbin/unwind/printconf.c
+++ b/sbin/unwind/printconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printconf.c,v 1.9 2019/05/10 14:10:38 florian Exp $	*/
+/*	$OpenBSD: printconf.c,v 1.10 2019/05/13 23:13:24 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -68,10 +68,6 @@ print_config(struct uw_conf *conf)
 	struct uw_forwarder	*uw_forwarder;
 	int			 i;
 
-#if notyet
-	printf("strict %s\n", yesno(conf->uw_options));
-#endif
-
 	if (conf->res_pref_len > 0) {
 		printf("preference {");
 		for (i = 0; i < conf->res_pref_len; i++) {
diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c
index f6d9a6abe44..c6670d82696 100644
--- a/sbin/unwind/unwind.c
+++ b/sbin/unwind/unwind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.c,v 1.26 2019/05/10 14:10:38 florian Exp $	*/
+/*	$OpenBSD: unwind.c,v 1.27 2019/05/13 23:13:24 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -795,7 +795,6 @@ merge_config(struct uw_conf *conf, struct uw_conf *xconf)
 		free(uw_forwarder);
 	}
 
-	conf->uw_options = xconf->uw_options;
 	conf->res_pref_len = xconf->res_pref_len;
 	memcpy(&conf->res_pref, &xconf->res_pref,
 	    sizeof(conf->res_pref));
diff --git a/sbin/unwind/unwind.h b/sbin/unwind/unwind.h
index 98e2df710c4..1206260e512 100644
--- a/sbin/unwind/unwind.h
+++ b/sbin/unwind/unwind.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.h,v 1.15 2019/05/10 14:10:38 florian Exp $	*/
+/*	$OpenBSD: unwind.h,v 1.16 2019/05/13 23:13:24 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -133,7 +133,6 @@ SIMPLEQ_HEAD(uw_forwarder_head, uw_forwarder);
 struct uw_conf {
 	struct uw_forwarder_head	 uw_forwarder_list;
 	struct uw_forwarder_head	 uw_dot_forwarder_list;
-	int				 uw_options;
 	enum uw_resolver_type		 res_pref[UW_RES_NONE];
 	int				 res_pref_len;
 	char				*captive_portal_host;