Author: trasz
Date: Mon Aug  3 07:28:23 2015
New Revision: 286220
URL: https://svnweb.freebsd.org/changeset/base/286220

Log:
  MFC r284542:
  
  Allow '@' in unquoted strings, such as with the "path" statement.  Note
  that one can use any character they like by using double quotes.
  
  PR:           200895
  Sponsored by: The FreeBDS Foundation

Modified:
  stable/10/usr.sbin/ctld/token.l
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/token.l
==============================================================================
--- stable/10/usr.sbin/ctld/token.l     Mon Aug  3 07:20:33 2015        
(r286219)
+++ stable/10/usr.sbin/ctld/token.l     Mon Aug  3 07:28:23 2015        
(r286220)
@@ -80,7 +80,7 @@ target                        { return TARGET; }
 timeout                        { return TIMEOUT; }
 \"[^"]+\"              { yylval.str = strndup(yytext + 1,
                            strlen(yytext) - 2); return STR; }
-[a-zA-Z0-9\.\-_/\:\[\]]+ { yylval.str = strdup(yytext); return STR; }
+[a-zA-Z0-9\.\-@_/\:\[\]]+ { yylval.str = strdup(yytext); return STR; }
 \{                     { return OPENING_BRACKET; }
 \}                     { return CLOSING_BRACKET; }
 #.*$                   /* ignore comments */;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to