diff options
| author | araujo <araujo@FreeBSD.org> | 2017-04-17 18:55:54 +0000 |
|---|---|---|
| committer | araujo <araujo@FreeBSD.org> | 2017-04-17 18:55:54 +0000 |
| commit | a52fbfbaa6cb040819aaa956af20324f4cf1b1f9 (patch) | |
| tree | 647b1c8fb6ffc61d7646056b90483cfd245a7867 /usr.sbin/ctld | |
| parent | 1e35d29d6289b2c15cca0f7e951e77e144f0b08e (diff) | |
| download | FreeBSD-src-a52fbfbaa6cb040819aaa956af20324f4cf1b1f9.zip FreeBSD-src-a52fbfbaa6cb040819aaa956af20324f4cf1b1f9.tar.gz | |
MFC r314987-r314989, r314993-r314994, r315046-r315049, r315102
r314987:
Use nitems() from sys/param.h.
Reviewed by: asomers
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9944
r314988:
Use nitems() from sys/param.h.
Reviewed by: ume
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9938
r314989:
Use nitems() from sys/param.h and also remove the cast.
Reviewed by: markj
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9937
r314993:
Use nitems() from sys/param.h.
Reviewed by: ngie
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9936
r314994:
Use nitems() from sys/param.h.
Reviewed by: ngie
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9940
r315046:
Use nitems() from sys/param.h
Reviewed by: jhb
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9941
r315047:
Use nitems() from sys/param.h.
Reviewed by: np
MFC after: 3 weeks.
Differential Revision: https://reviews.freebsd.org/D9945
r315048:
Use nitems() from sys/param.h.
MFC after: 3 weeks.
r315049:
Bring back the cast removed in my previous commit to allow us build vmstat
with WARNS 2. This cast was first introduced at r87690.
Reported by: bde, pfg and ngie
MFC after: 3 weeks.
r315102:
Use nitems() from sys/param.h.
Reviewed by: ngie
Differential Revision: https://reviews.freebsd.org/D9943
Diffstat (limited to 'usr.sbin/ctld')
| -rw-r--r-- | usr.sbin/ctld/kernel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 057ea34..e1376c7 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -1259,8 +1259,8 @@ kernel_capsicate(void) if (error != 0 && errno != ENOSYS) log_err(1, "cap_rights_limit"); - error = cap_ioctls_limit(ctl_fd, cmds, - sizeof(cmds) / sizeof(cmds[0])); + error = cap_ioctls_limit(ctl_fd, cmds, nitems(cmds)); + if (error != 0 && errno != ENOSYS) log_err(1, "cap_ioctls_limit"); |
