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");
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
