Commit Diff

Commit:
031687baf3081932383b85041c49de781c43e432
From:
Josiah Frentsos <jfrent@tilde.team>
Via:
Omar Polo <op@omarpolo.com>
Date:
Message:
gotwebd.conf: disallow yes/no for booleans Supporting both "no" and "on" as valid syntax with an opposite meaning could easily result in accidental misconfiguration. Suggested by stsp, tracey agrees. Patch by Josiah Frentsos, thanks!
Actions:
Patch | Tree
commit - d571a1762e9ff7281a5363373468c1e00a62ed42
commit + 031687baf3081932383b85041c49de781c43e432
blob - 78e7f005317e5620be61b4b2bb064c91e4eff405
blob + 765208e819180a987e11496151b42a2800b2aed9
--- gotwebd/gotwebd.conf.5
+++ gotwebd/gotwebd.conf.5
@@ -205,7 +205,7 @@ server "localhost-unix" {
 	#show_site_owner  on
 	#show_repo_owner  on
 	#show_repo_age  on
-	#show_repo_description no
+	#show_repo_description on
 	#show_repo_cloneurl  on
 	#respect_exportok off
 
blob - f850d52bdb09788ea17c47cf4efaba216c389919
blob + 686908558b4951371e282ff25989e0b4eb8eb819
--- gotwebd/parse.y
+++ gotwebd/parse.y
@@ -157,12 +157,10 @@ varset		: STRING '=' STRING	{
 
 boolean		: STRING {
 			if (strcasecmp($1, "1") == 0 ||
-			    strcasecmp($1, "yes") == 0 ||
 			    strcasecmp($1, "on") == 0)
 				$$ = 1;
 			else if (strcasecmp($1, "0") == 0 ||
-			    strcasecmp($1, "off") == 0 ||
-			    strcasecmp($1, "no") == 0)
+			    strcasecmp($1, "off") == 0)
 				$$ = 0;
 			else {
 				yyerror("invalid boolean value '%s'", $1);
@@ -338,8 +336,7 @@ serveropts1	: REPOS_PATH STRING {
 			new_srv->fcgi_socket = 1;
 		}
 		| LISTEN ON SOCKET STRING {
-			if (!strcasecmp($4, "off") ||
-			    !strcasecmp($4, "no")) {
+			if (strcasecmp($4, "off") == 0) {
 				new_srv->unix_socket = 0;
 				free($4);
 				YYACCEPT;