svn commit: r262841 - stable/10/usr.bin/iscsictl

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Mar  6 11:07:51 2014
New Revision: 262841
URL: http://svnweb.freebsd.org/changeset/base/262841

Log:
  MFC r261714:
  
  Make iscsictl(8) properly handle (optional) semicolons in iscsi.conf,
  instead of ignoring them and echoing them to stdout.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.bin/iscsictl/parse.y
  stable/10/usr.bin/iscsictl/token.l
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/iscsictl/parse.y
==============================================================================
--- stable/10/usr.bin/iscsictl/parse.y	Thu Mar  6 11:05:35 2014	(r262840)
+++ stable/10/usr.bin/iscsictl/parse.y	Thu Mar  6 11:07:51 2014	(r262841)
@@ -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_entr
 target_entries:
 	|
 	target_entries target_entry
+	|
+	target_entries target_entry SEMICOLON
 	;
 
 target_entry:

Modified: stable/10/usr.bin/iscsictl/token.l
==============================================================================
--- stable/10/usr.bin/iscsictl/token.l	Thu Mar  6 11:05:35 2014	(r262840)
+++ stable/10/usr.bin/iscsictl/token.l	Thu Mar  6 11:07:51 2014	(r262841)
@@ -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; }
 %%