From owner-svn-src-head@FreeBSD.ORG  Wed Feb 26 09:06:58 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 7A74476D;
 Wed, 26 Feb 2014 09:06:58 +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 65D841D5D;
 Wed, 26 Feb 2014 09:06:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q96wbg014704;
 Wed, 26 Feb 2014 09:06:58 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q96wYY014703;
 Wed, 26 Feb 2014 09:06:58 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201402260906.s1Q96wYY014703@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 26 Feb 2014 09:06:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262525 - head/usr.bin/iscsictl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 09:06:58 -0000

Author: trasz
Date: Wed Feb 26 09:06:57 2014
New Revision: 262525
URL: http://svnweb.freebsd.org/changeset/base/262525

Log:
  There is no need to prevent iscsictl from adding iSER session when there
  is no iSER support in ctld and/or kernel; should the user make that mistake,
  the output from "iscsictl -L" is enough to determine what the problem is.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.bin/iscsictl/iscsictl.c

Modified: head/usr.bin/iscsictl/iscsictl.c
==============================================================================
--- head/usr.bin/iscsictl/iscsictl.c	Wed Feb 26 06:25:36 2014	(r262524)
+++ head/usr.bin/iscsictl/iscsictl.c	Wed Feb 26 09:06:57 2014	(r262525)
@@ -242,11 +242,6 @@ conf_verify(struct conf *conf)
 		}
 		if (targ->t_protocol == PROTOCOL_UNSPECIFIED)
 			targ->t_protocol = PROTOCOL_ISCSI;
-#ifndef ICL_KERNEL_PROXY
-		if (targ->t_protocol == PROTOCOL_ISER)
-			errx(1, "iSER support requires ICL_KERNEL_PROXY; "
-			    "see iscsi(4) for details");
-#endif
 		if (targ->t_address == NULL)
 			errx(1, "missing TargetAddress for target \"%s\"",
 			    targ->t_nickname);