diff options
| author | trasz <trasz@FreeBSD.org> | 2014-12-21 10:56:06 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2014-12-21 10:56:06 +0000 |
| commit | 5654688c9652563f5284d6f0453276e1cf777bd8 (patch) | |
| tree | 421fecafb3ca9843cef065d1fb790d03fda1a676 /usr.bin/iscsictl | |
| parent | dc3ad5131fa6525673d58aa537f9d67ba69edb94 (diff) | |
| download | FreeBSD-src-5654688c9652563f5284d6f0453276e1cf777bd8.zip FreeBSD-src-5654688c9652563f5284d6f0453276e1cf777bd8.tar.gz | |
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
Diffstat (limited to 'usr.bin/iscsictl')
| -rw-r--r-- | usr.bin/iscsictl/iscsictl.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c index 27467bb..a27e32b 100644 --- a/usr.bin/iscsictl/iscsictl.c +++ b/usr.bin/iscsictl/iscsictl.c @@ -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"); |
