svn commit: r275992 - stable/10/usr.bin/iscsictl

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Dec 21 10:56:06 2014
New Revision: 275992
URL: https://svnweb.freebsd.org/changeset/base/275992

Log:
  MFC r274549:
  
  Make it possible to do "iscsictl -Rt xxx -p yyy", to remove a session
  that matches both -t and -p.
  
  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	Sun Dec 21 10:04:26 2014	(r275991)
+++ stable/10/usr.bin/iscsictl/iscsictl.c	Sun Dec 21 10:56:06 2014	(r275992)
@@ -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");