From owner-svn-src-all@FreeBSD.ORG  Thu Mar  6 11:10:57 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 D0D1163D;
 Thu,  6 Mar 2014 11:10:57 +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 BD83F262;
 Thu,  6 Mar 2014 11:10:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26BAvZ2050468;
 Thu, 6 Mar 2014 11:10:57 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26BAvIe050467;
 Thu, 6 Mar 2014 11:10:57 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201403061110.s26BAvIe050467@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 6 Mar 2014 11:10:57 +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: r262843 - 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:10:57 -0000

Author: trasz
Date: Thu Mar  6 11:10:57 2014
New Revision: 262843
URL: http://svnweb.freebsd.org/changeset/base/262843

Log:
  MFC r262525:
  
  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:
  stable/10/usr.bin/iscsictl/iscsictl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/iscsictl/iscsictl.c
==============================================================================
--- stable/10/usr.bin/iscsictl/iscsictl.c	Thu Mar  6 11:09:46 2014	(r262842)
+++ stable/10/usr.bin/iscsictl/iscsictl.c	Thu Mar  6 11:10:57 2014	(r262843)
@@ -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);