diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2022-04-18 19:44:36 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2022-04-18 19:53:15 +0000 |
| commit | f0df72273377daf5e1e97b80a4e542362b261a1d (patch) | |
| tree | fe0cb6618690521cc24e8715c07ef7773cd97067 /usr.sbin/iscsid | |
| parent | e2c5ab094b1107fa60b064760c0c7e085899ea8b (diff) | |
| download | src-f0df72273377daf5e1e97b80a4e542362b261a1d.tar.gz src-f0df72273377daf5e1e97b80a4e542362b261a1d.zip | |
iscsid: Push #ifdef ICL_KERNEL_PROXY into cap_ioctl_limits list.
This reduces duplication in the two lists and makes it clearer which
ioctls are needed in the ICL_KERNEL_PROXY case.
Reviewed by: mav
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D34927
Diffstat (limited to 'usr.sbin/iscsid')
| -rw-r--r-- | usr.sbin/iscsid/iscsid.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index d08a11c90eeb..5555ffccbf7c 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -496,13 +496,18 @@ static void capsicate(struct iscsid_connection *conn) { cap_rights_t rights; + const unsigned long cmds[] = { #ifdef ICL_KERNEL_PROXY - const unsigned long cmds[] = { ISCSIDCONNECT, ISCSIDSEND, ISCSIDRECEIVE, - ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, ISCSISREMOVE, ISCSISMODIFY }; -#else - const unsigned long cmds[] = { ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, - ISCSISREMOVE, ISCSISMODIFY }; + ISCSIDCONNECT, + ISCSIDSEND, + ISCSIDRECEIVE, #endif + ISCSIDHANDOFF, + ISCSIDFAIL, + ISCSISADD, + ISCSISREMOVE, + ISCSISMODIFY + }; cap_rights_init(&rights, CAP_IOCTL); if (caph_rights_limit(conn->conn_iscsi_fd, &rights) < 0) |