From owner-svn-src-all@FreeBSD.ORG  Tue Jan 25 22:25:17 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 113AF1065670;
	Tue, 25 Jan 2011 22:25:17 +0000 (UTC)
	(envelope-from cracauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 00C2A8FC19;
	Tue, 25 Jan 2011 22:25:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0PMPGve054499;
	Tue, 25 Jan 2011 22:25:16 GMT
	(envelope-from cracauer@svn.freebsd.org)
Received: (from cracauer@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0PMPGS7054496;
	Tue, 25 Jan 2011 22:25:16 GMT
	(envelope-from cracauer@svn.freebsd.org)
Message-Id: <201101252225.p0PMPGS7054496@svn.freebsd.org>
From: Martin Cracauer <cracauer@FreeBSD.org>
Date: Tue, 25 Jan 2011 22:25:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217859 - head/sbin/iscontrol
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 25 Jan 2011 22:25:17 -0000

Author: cracauer
Date: Tue Jan 25 22:25:16 2011
New Revision: 217859
URL: http://svn.freebsd.org/changeset/base/217859

Log:
  Fix compilation with debug on.
  Fix segfault when TargetAddress is missing or mis-spelled in config file.

Modified:
  head/sbin/iscontrol/config.c
  head/sbin/iscontrol/fsm.c

Modified: head/sbin/iscontrol/config.c
==============================================================================
--- head/sbin/iscontrol/config.c	Tue Jan 25 22:21:05 2011	(r217858)
+++ head/sbin/iscontrol/config.c	Tue Jan 25 22:25:16 2011	(r217859)
@@ -295,7 +295,7 @@ keyLookup(char *key)
 {
      textkey_t	*tk;
 
-     for(tk = keyMap; tk->name; tk++) {
+     for(tk = keyMap; tk->name && strcmp(tk->name, "end"); tk++) {
 	  if(strcasecmp(key, tk->name) == 0)
 	       return tk;
      }

Modified: head/sbin/iscontrol/fsm.c
==============================================================================
--- head/sbin/iscontrol/fsm.c	Tue Jan 25 22:21:05 2011	(r217858)
+++ head/sbin/iscontrol/fsm.c	Tue Jan 25 22:25:16 2011	(r217859)
@@ -359,8 +359,8 @@ doCAM(isess_t *sess)
       | for now will do this for each lun ...
       */
      for(n = i = 0; i < sess->cam.target_nluns; i++) {
-	  debug(2, "CAM path_id=%d target_id=%d target_lun=%d",
-		sess->cam.path_id, sess->cam.target_id, sess->cam.target_lun[i]);
+	  debug(2, "CAM path_id=%d target_id=%d",
+		sess->cam.path_id, sess->cam.target_id);
 
 	  sess->camdev = cam_open_btl(sess->cam.path_id, sess->cam.target_id,
 				      i, O_RDWR, NULL);