diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2014-11-15 06:14:38 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2014-11-15 06:14:38 +0000 |
| commit | c7ee47a77997a254dc77ed8225e42897702e19a4 (patch) | |
| tree | 9cbe3e003472658c08c108d57b16a69086c7cc67 /usr.bin/iscsictl | |
| parent | e7a8895c575f9a165e7418bc58d86a69eea446a4 (diff) | |
| download | src-c7ee47a77997a254dc77ed8225e42897702e19a4.tar.gz src-c7ee47a77997a254dc77ed8225e42897702e19a4.zip | |
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
Notes
Notes:
svn path=/head/; revision=274549
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 27467bbe185f..a27e32bd28f4 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"); |