Commit Diff


commit - a8b5214b2832503dd332c0d53dc1777d7e35882941703b6c7ab9a3c221c39734
commit + 3a6d166c717e5fabc3027923af3c5aba0855531f7036c19bed453f7a5202c078
blob - c111f1c53d5fc9ef53f12ab163d8cddf0979f90d3dbfd5df516653cff8eaa0f8
blob + 483713c2df02c5238073c40a1a38ad8400e25ba0a45d23a861a948ceb74c8e74
--- gotwebd/parse.y	
+++ gotwebd/parse.y	
@@ -120,7 +120,7 @@ typedef struct {
 
 %}
 
-%token	LISTEN LOGIN WWW SITE_NAME SITE_OWNER SITE_LINK LOGO
+%token	LISTEN GOTWEBD_LOGIN WWW SITE_NAME SITE_OWNER SITE_LINK LOGO
 %token	LOGO_URL SHOW_REPO_OWNER SHOW_REPO_AGE SHOW_REPO_DESCRIPTION
 %token	MAX_REPOS_DISPLAY REPOS_PATH MAX_COMMITS_DISPLAY ON ERROR
 %token	SHOW_SITE_OWNER SHOW_REPO_CLONEURL PORT PREFORK RESPECT_EXPORTOK
@@ -311,7 +311,7 @@ main		: PREFORK NUMBER {
 			conf_new_access_rule(&gotwebd->access_rules,
 			    GOTWEBD_ACCESS_DENIED, $2);
 		}
-		| LOGIN SOCKET STRING {
+		| GOTWEBD_LOGIN SOCKET STRING {
 			struct address *h;
 			h = get_unix_addr($3);
 			if (h == NULL) {
@@ -629,7 +629,7 @@ lookup(char *s)
 		{ "enable",			ENABLE },
 		{ "insecure",			INSECURE },
 		{ "listen",			LISTEN },
-		{ "login",			LOGIN },
+		{ "login",			GOTWEBD_LOGIN },
 		{ "logo",			LOGO },
 		{ "logo_url",			LOGO_URL },
 		{ "max_commits_display",	MAX_COMMITS_DISPLAY },