From owner-svn-src-head@FreeBSD.ORG  Sat Nov 15 06:14:38 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EE6AAD11;
 Sat, 15 Nov 2014 06:14:38 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DAAA1D22;
 Sat, 15 Nov 2014 06:14:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAF6Ecp0013239;
 Sat, 15 Nov 2014 06:14:38 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAF6Ec5F013238;
 Sat, 15 Nov 2014 06:14:38 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201411150614.sAF6Ec5F013238@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 15 Nov 2014 06:14:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274549 - 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.18-1
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: Sat, 15 Nov 2014 06:14:39 -0000

Author: trasz
Date: Sat Nov 15 06:14:38 2014
New Revision: 274549
URL: https://svnweb.freebsd.org/changeset/base/274549

Log:
  Make it possible to do "iscsictl -Rt xxx -p yyy", to remove a session
  that matches both -t and -p.
  
  MFC after:	1 month
  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	Sat Nov 15 05:53:45 2014	(r274548)
+++ head/usr.bin/iscsictl/iscsictl.c	Sat Nov 15 06:14:38 2014	(r274549)
@@ -758,14 +758,9 @@ main(int argc, char **argv)
 				errx(1, "-n and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-n and -t and mutually exclusive");
-		} else if (portal != NULL) {
-			if (target != NULL)
-				errx(1, "-p and -t and mutually exclusive");
-		} else if (target != NULL) {
-			if (portal != NULL)
-				errx(1, "-t and -p and mutually exclusive");
-		} else
+		} else if (target == NULL && portal == NULL) {
 			errx(1, "must specify either -a, -n, -t, or -p");
+		}
 
 		if (session_id != -1)
 			errx(1, "-i cannot be used with -R");