===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/toke.l,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/sudo/Attic/toke.l	2011/04/29 17:26:59	1.9
--- src/usr.bin/sudo/Attic/toke.l	2011/05/01 14:42:06	1.10
***************
*** 391,412 ****
  			    return(NTWKADDR);
  			}
  
! [[:upper:]][[:upper:][:digit:]_]* {
! 			    if (strcmp(yytext, "ALL") == 0) {
! 				LEXTRACE("ALL ");
! 				return(ALL);
! 			    }
  #ifdef HAVE_SELINUX
! 			    /* XXX - restrict type/role to initial state */
! 			    if (strcmp(yytext, "TYPE") == 0) {
! 				LEXTRACE("TYPE ");
! 				return(TYPE);
! 			    }
! 			    if (strcmp(yytext, "ROLE") == 0) {
! 				LEXTRACE("ROLE ");
! 				return(ROLE);
! 			    }
! #endif /* HAVE_SELINUX */
  			    if (!fill(yytext, yyleng))
  				yyterminate();
  			    LEXTRACE("ALIAS ");
--- 391,422 ----
  			    return(NTWKADDR);
  			}
  
! ALL {
! 			    LEXTRACE("ALL ");
! 			    return(ALL);
! 
! 			}
! 
! <INITIAL>ROLE {
  #ifdef HAVE_SELINUX
! 			    LEXTRACE("ROLE ");
! 			    return(ROLE);
! #else
! 			    goto got_alias;
! #endif
! 			}
! 
! <INITIAL>TYPE {
! #ifdef HAVE_SELINUX
! 			    LEXTRACE("TYPE ");
! 			    return(TYPE);
! #else
! 			    goto got_alias;
! #endif
! 			}
! 
! [[:upper:]][[:upper:][:digit:]_]* {
! 			got_alias:
  			    if (!fill(yytext, yyleng))
  				yyterminate();
  			    LEXTRACE("ALIAS ");