d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r261714:

Browse Source 
Make iscsictl(8) properly handle (optional) semicolons in iscsi.conf,
instead of ignoring them and echoing them to stdout.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2014-03-06 11:07:51 +00:00
parent b379e28a77
commit 9cc265a090
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/iscsictl/parse.y
View File

@ -57,7 +57,7 @@ extern void yyrestart(FILE *);
%token AUTH_METHOD HEADER_DIGEST DATA_DIGEST TARGET_NAME TARGET_ADDRESS
%token INITIATOR_NAME INITIATOR_ADDRESS INITIATOR_ALIAS USER SECRET
%token MUTUAL_USER MUTUAL_SECRET SESSION_TYPE PROTOCOL IGNORED
%token MUTUAL_USER MUTUAL_SECRET SEMICOLON SESSION_TYPE PROTOCOL IGNORED
%token EQUALS OPENING_BRACKET CLOSING_BRACKET
%union
@ -86,6 +86,8 @@ target: STR OPENING_BRACKET target_entries CLOSING_BRACKET
target_entries:
|
target_entries target_entry
|
target_entries target_entry SEMICOLON
;
target_entry:

2
usr.bin/iscsictl/token.l
View File

@ -87,7 +87,9 @@ chapDigest { return IGNORED; }
\{ { return OPENING_BRACKET; }
\} { return CLOSING_BRACKET; }
= { return EQUALS; }
; { return SEMICOLON; }
#.*$ /* ignore comments */;
\n { lineno++; }
[ \t]+ /* ignore whitespace */;
. { yylval.str = strdup(yytext); return STR; }
%%