40 lines
1.3 KiB
Text
40 lines
1.3 KiB
Text
$NetBSD: patch-ac,v 1.1 2006/09/24 15:40:24 joerg Exp $
|
|
|
|
--- cherokee/read_config_grammar.y.orig 2006-09-24 17:26:21.000000000 +0000
|
|
+++ cherokee/read_config_grammar.y
|
|
@@ -440,7 +440,7 @@ yyerror (char* msg)
|
|
|
|
|
|
%token T_QUOTE T_DENY T_THREAD_NUM T_SSL_CERT_KEY_FILE T_SSL_CERT_FILE T_KEEPALIVE_MAX_REQUESTS T_ERROR_HANDLER
|
|
-%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER T_GROUP T_POLICY
|
|
+%token T_TIMEOUT T_KEEPALIVE T_DOCUMENT_ROOT T_LOG T_MIME_FILE T_DIRECTORY T_HANDLER T_USER_ T_GROUP T_POLICY
|
|
%token T_SERVER T_USERDIR T_PIDFILE T_LISTEN T_SERVER_TOKENS T_ENCODER T_ALLOW T_DIRECTORYINDEX
|
|
%token T_ICONS T_AUTH T_NAME T_METHOD T_PASSWDFILE T_SSL_CA_LIST_FILE T_FROM T_SOCKET T_LOG_FLUSH_INTERVAL
|
|
%token T_HEADERFILE T_PANIC_ACTION T_JUST_ABOUT T_LISTEN_QUEUE_SIZE T_SENDFILE T_MINSIZE T_MAXSIZE T_MAX_FDS
|
|
@@ -1059,7 +1059,7 @@ ipv6 : T_IPV6 T_NUMBER
|
|
SRV(server)->ipv6 = $2;
|
|
};
|
|
|
|
-user1 : T_USER T_ID
|
|
+user1 : T_USER_ T_ID
|
|
{
|
|
struct passwd *pwd;
|
|
|
|
@@ -1074,7 +1074,7 @@ user1 : T_USER T_ID
|
|
free ($2);
|
|
};
|
|
|
|
-user2 : T_USER T_NUMBER
|
|
+user2 : T_USER_ T_NUMBER
|
|
{
|
|
SRV(server)->user = $2;
|
|
};
|
|
@@ -1702,7 +1702,7 @@ auth_option : T_NAME T_QSTRING
|
|
free ($2);
|
|
};
|
|
|
|
-auth_option : T_USER id_list
|
|
+auth_option : T_USER_ id_list
|
|
{
|
|
linked_list_t *i;
|
|
|