diff -rwub dictd-1.9.7.orig/clientparse.y dictd-1.9.7/clientparse.y
--- clientparse.y	Sat Nov 29 16:39:28 2003
+++ clientparse.y	Sat Nov 29 16:40:49 2003
@@ -36,7 +36,7 @@
 
 				/* Terminals */
 
-%token <token> '{' '}' T_SERVER T_PORT T_USER T_FILTER T_PAGER
+%token <token> '{' '}' T_SERVER T_PORT DT_USER T_FILTER T_PAGER
 
 %token <token>  T_STRING
 %type  <list>   Options Pager Server ServerList
@@ -77,5 +77,5 @@
          ;
 
 Spec : T_PORT T_STRING          { s->port = $2.string; }
-     | T_USER T_STRING T_STRING { s->user = $2.string; s->secret = $3.string; }
+     | DT_USER T_STRING T_STRING { s->user = $2.string; s->secret = $3.string; }
      ;
diff -rwub dictd-1.9.7.orig/clientscan.l dictd-1.9.7/clientscan.l
--- clientscan.l	Sat Nov 29 16:39:28 2003
+++ clientscan.l	Sat Nov 29 16:39:42 2003
@@ -49,7 +49,7 @@
 pager                       RETURN(T_PAGER);
 server                      RETURN(T_SERVER);
 port                        RETURN(T_PORT);
-user                        RETURN(T_USER);
+user                        RETURN(DT_USER);
 filter                      RETURN(T_FILTER);
 {word}                      { yylval.token.string = str_findn(yytext, yyleng);
                               RETURN(T_STRING);
diff -rwub dictd-1.9.7.orig/servparse.y dictd-1.9.7/servparse.y
--- servparse.y	Sat Nov 29 16:39:28 2003
+++ servparse.y	Sat Nov 29 16:40:10 2003
@@ -48,7 +48,7 @@
 %token <token> '{' '}' T_ACCESS T_ALLOW T_DENY T_GROUP T_DATABASE T_DATA
 %token <token> T_INDEX T_INDEX_SUFFIX T_INDEX_WORD
 %token <token> T_FILTER T_PREFILTER T_POSTFILTER T_NAME T_INFO
-%token <token> T_USER T_AUTHONLY T_SITE T_DATABASE_EXIT
+%token <token> DT_USER T_AUTHONLY T_SITE T_DATABASE_EXIT
 %token <token> T_STRING
 %token <token> T_INVISIBLE
 %token <token> T_DATABASE_VIRTUAL T_DATABASE_LIST
@@ -131,11 +131,11 @@
 Site : T_SITE T_STRING { $$ = $2; }
      ;
 
-UserList : T_USER T_STRING T_STRING
+UserList : DT_USER T_STRING T_STRING
            { $$ = hsh_create(NULL,NULL);
 	     hsh_insert( $$, $2.string, $3.string );
 	   }
-         | UserList T_USER T_STRING T_STRING
+         | UserList DT_USER T_STRING T_STRING
            { hsh_insert( $1, $3.string, $4.string ); $$ = $1; }
          ;
 
@@ -160,7 +160,7 @@
 		a->spec = $2.string;
 		$$ = a;
 	     }
-           | T_USER T_STRING
+           | DT_USER T_STRING
              {
 		dictAccess *a = xmalloc(sizeof(struct dictAccess));
 		a->type = DICT_USER;
diff -rwub dictd-1.9.7.orig/servscan.l dictd-1.9.7/servscan.l
--- servscan.l	Sat Nov 29 16:39:28 2003
+++ servscan.l	Sat Nov 29 16:39:49 2003
@@ -100,7 +100,7 @@
 prefilter                   RETURN(T_PREFILTER);
 postfilter                  RETURN(T_POSTFILTER);
 name                        RETURN(T_NAME);
-user                        RETURN(T_USER);
+user                        RETURN(DT_USER);
 authonly                    RETURN(T_AUTHONLY);
 site                        RETURN(T_SITE);
 invisible                   RETURN(T_INVISIBLE);
