From owner-svn-src-all@FreeBSD.ORG  Thu Mar  6 11:07:52 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 804C82DF;
 Thu,  6 Mar 2014 11:07:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6C3761E0;
 Thu,  6 Mar 2014 11:07:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26B7qgD047638;
 Thu, 6 Mar 2014 11:07:52 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26B7q2A047636;
 Thu, 6 Mar 2014 11:07:52 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201403061107.s26B7q2A047636@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 6 Mar 2014 11:07:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262841 - stable/10/usr.bin/iscsictl
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 11:07:52 -0000

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; }
 %%