Page MenuHomeFreeBSD
Differential D19292

net-mgmt/check_mk_agent: Update to 1.5.0p12
ClosedPublic
Actions

Authored by 0mp on Feb 22 2019, 9:19 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 13, 8:01 AM
Unknown Object (File)
Mar 3 2025, 4:14 PM
Unknown Object (File)
Feb 24 2025, 4:30 AM
Unknown Object (File)
Feb 21 2025, 6:52 AM
Unknown Object (File)
Feb 17 2025, 1:28 AM
Unknown Object (File)
Jan 28 2025, 9:57 PM
Unknown Object (File)
Nov 28 2024, 8:22 AM
Unknown Object (File)
Nov 14 2024, 3:46 PM
View All 58 Files
Subscribers
None

Details

Reviewers
mat
krion
Commits
rP493567: net-mgmt/check_mk_agent: Update to 1.5.0p12
Summary
net-mgmt/check_mk_agent: Update to 1.5.0p12

Changelog:
https://mathias-kettner.com/check_mk-werks.php?edition_id=raw&branch=1.5.0&version=1.5.0p12&HTML=yes
Test Plan
  • poudriere 11.2 amd64

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 22654
Build 21759: arc lint + arc unit

Event Timeline

0mp created this revision.Feb 22 2019, 9:19 AM
Harbormaster completed remote builds in B22654: Diff 54215.Feb 22 2019, 9:19 AM
mat accepted this revision.Feb 22 2019, 9:56 AM
This revision is now accepted and ready to land.Feb 22 2019, 9:56 AM
Closed by commit rP493567: net-mgmt/check_mk_agent: Update to 1.5.0p12 (authored by 0mp). · Explain WhyFeb 22 2019, 10:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
net-mgmt/
check_mk_agent/
2 lines
6 lines

Diff 54215

View Options

net-mgmt/check_mk_agent/Makefile

Show First 20 Lines • Show All 450 Lines • ▼ Show 20 Lines
* while the latter sets things up from a root context. Such as might * while the latter sets things up from a root context. Such as might
* be called from login(1). * be called from login(1).
* *
*/ */
int int
setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned int flags) setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned int flags)
{ {
rlim_t p;
login_cap_t *llc = NULL; login_cap_t *llc = NULL;
struct rtprio rtp;
int error; int error;
if (lc == NULL) { if (lc == NULL) {
if (pwd != NULL && (lc = login_getpwclass(pwd)) != NULL) if (pwd != NULL && (lc = login_getpwclass(pwd)) != NULL)
llc = lc; /* free this when we're done */ llc = lc; /* free this when we're done */
} }
if (flags & LOGIN_SETPATH) if (flags & LOGIN_SETPATH)
pathvars[0].def = uid ? _PATH_DEFPATH : _PATH_STDPATH; pathvars[0].def = uid ? _PATH_DEFPATH : _PATH_STDPATH;
/* we need a passwd entry to set these */ /* we need a passwd entry to set these */
if (pwd == NULL) if (pwd == NULL)
flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC); flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC);
/* Set the process priority */ /* Set the process priority */
if (flags & LOGIN_SETPRIORITY) { if (flags & LOGIN_SETPRIORITY) {
p = login_getcapnum(lc, "priority", LOGIN_DEFPRI, LOGIN_DEFPRI); /*
* Make it unlikely that someone would input our default sentinel
* (which indicates no specification).
*/
rlim_t const def_val = INT64_MIN + 1, err_val = INT64_MIN;
rlim_t p = login_getcapnum(lc, "priority", def_val, err_val);
int rc;
if (p != def_val) {
/* Invariant: 'lc' != NULL from here. */
if (p == err_val) {
syslog(LOG_WARNING,
"%s%s%sLogin class '%s': "
kibUnsubmitted
Done
Inline Actions

Indents are wrong.

kib: Indents are wrong.
"Invalid priority specification: '%s'",
pwd ? "Login '" : "",
pwd ? pwd->pw_name : "",
pwd ? "': " : "",
lc->lc_class,
login_getcapstr(lc, "priority", "", ""));
} else {
if (p > PRIO_MAX) { if (p > PRIO_MAX) {
struct rtprio rtp;
rtp.type = RTP_PRIO_IDLE; rtp.type = RTP_PRIO_IDLE;
p += RTP_PRIO_MIN - (PRIO_MAX + 1); p += RTP_PRIO_MIN - (PRIO_MAX + 1);
rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p; rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p;
if (rtprio(RTP_SET, 0, &rtp)) rc = rtprio(RTP_SET, 0, &rtp);
syslog(LOG_WARNING, "rtprio '%s' (%s): %m",
pwd ? pwd->pw_name : "-",
lc ? lc->lc_class : LOGIN_DEFCLASS);
} else if (p < PRIO_MIN) { } else if (p < PRIO_MIN) {
struct rtprio rtp;
rtp.type = RTP_PRIO_REALTIME; rtp.type = RTP_PRIO_REALTIME;
p += RTP_PRIO_MAX - (PRIO_MIN - 1); p += RTP_PRIO_MAX - (PRIO_MIN - 1);
rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p; rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p;
if (rtprio(RTP_SET, 0, &rtp)) rc = rtprio(RTP_SET, 0, &rtp);
syslog(LOG_WARNING, "rtprio '%s' (%s): %m", } else
pwd ? pwd->pw_name : "-", rc = setpriority(PRIO_PROCESS, 0, (int)p);
lc ? lc->lc_class : LOGIN_DEFCLASS);
} else { if (rc != 0)
if (setpriority(PRIO_PROCESS, 0, (int)p) != 0) syslog(LOG_WARNING,
syslog(LOG_WARNING, "setpriority '%s' (%s): %m", "%s%s%sLogin class '%s': "
pwd ? pwd->pw_name : "-", "Setting priority failed: %m",
lc ? lc->lc_class : LOGIN_DEFCLASS); pwd ? "Login '" : "",
pwd ? pwd->pw_name : "",
pwd ? "': " : "",
lc->lc_class);
}
} }
} }
emasteUnsubmitted
Not Done
Inline Actions

as with comment in some previous review, I prefer braces around all if-else blocks if any have them

emaste: as with comment in some previous review, I prefer braces around all if-else blocks if any have…
impUnsubmitted
Not Done
Inline Actions

style(9) tries to make this point, but is a hopeless. on clearity in its striving for brevity:

Space after keywords (if, while, for, return, switch).  Two styles of
 braces (‘{’ and ‘}’) are allowed for single line statements.  Either they
 are used for all single statements, or they are used only where needed
 for clarity.  Usage within a function should be consistent.  Forever

which can be read many ways. Certainly within a single if statement, I prefer what you're advocating
too and that seemed to be the consensus of the discussions when I added the above text, but it's not 100% clear.

imp: style(9) tries to make this point, but is a hopeless. on clearity in its striving for brevity…
/* Setup the user's group permissions */ /* Setup the user's group permissions */
if (flags & LOGIN_SETGROUP) { if (flags & LOGIN_SETGROUP) {
if (setgid(pwd->pw_gid) != 0) { if (setgid(pwd->pw_gid) != 0) {
syslog(LOG_ERR, "setgid(%lu): %m", (u_long)pwd->pw_gid); syslog(LOG_ERR, "setgid(%lu): %m", (u_long)pwd->pw_gid);
login_close(llc); login_close(llc);
return (-1); return (-1);
} }
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

net-mgmt/check_mk_agent/distinfo

Show First 20 Lines • Show All 450 Lines • ▼ Show 20 Lines
* while the latter sets things up from a root context. Such as might * while the latter sets things up from a root context. Such as might
* be called from login(1). * be called from login(1).
* *
*/ */
int int
setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned int flags) setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned int flags)
{ {
rlim_t p;
login_cap_t *llc = NULL; login_cap_t *llc = NULL;
struct rtprio rtp;
int error; int error;
if (lc == NULL) { if (lc == NULL) {
if (pwd != NULL && (lc = login_getpwclass(pwd)) != NULL) if (pwd != NULL && (lc = login_getpwclass(pwd)) != NULL)
llc = lc; /* free this when we're done */ llc = lc; /* free this when we're done */
} }
if (flags & LOGIN_SETPATH) if (flags & LOGIN_SETPATH)
pathvars[0].def = uid ? _PATH_DEFPATH : _PATH_STDPATH; pathvars[0].def = uid ? _PATH_DEFPATH : _PATH_STDPATH;
/* we need a passwd entry to set these */ /* we need a passwd entry to set these */
if (pwd == NULL) if (pwd == NULL)
flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC); flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC);
/* Set the process priority */ /* Set the process priority */
if (flags & LOGIN_SETPRIORITY) { if (flags & LOGIN_SETPRIORITY) {
p = login_getcapnum(lc, "priority", LOGIN_DEFPRI, LOGIN_DEFPRI); /*
* Make it unlikely that someone would input our default sentinel
* (which indicates no specification).
*/
rlim_t const def_val = INT64_MIN + 1, err_val = INT64_MIN;
rlim_t p = login_getcapnum(lc, "priority", def_val, err_val);
int rc;
if (p != def_val) {
/* Invariant: 'lc' != NULL from here. */
if (p == err_val) {
syslog(LOG_WARNING,
"%s%s%sLogin class '%s': "
kibUnsubmitted
Done
Inline Actions

Indents are wrong.

kib: Indents are wrong.
"Invalid priority specification: '%s'",
pwd ? "Login '" : "",
pwd ? pwd->pw_name : "",
pwd ? "': " : "",
lc->lc_class,
login_getcapstr(lc, "priority", "", ""));
} else {
if (p > PRIO_MAX) { if (p > PRIO_MAX) {
struct rtprio rtp;
rtp.type = RTP_PRIO_IDLE; rtp.type = RTP_PRIO_IDLE;
p += RTP_PRIO_MIN - (PRIO_MAX + 1); p += RTP_PRIO_MIN - (PRIO_MAX + 1);
rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p; rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p;
if (rtprio(RTP_SET, 0, &rtp)) rc = rtprio(RTP_SET, 0, &rtp);
syslog(LOG_WARNING, "rtprio '%s' (%s): %m",
pwd ? pwd->pw_name : "-",
lc ? lc->lc_class : LOGIN_DEFCLASS);
} else if (p < PRIO_MIN) { } else if (p < PRIO_MIN) {
struct rtprio rtp;
rtp.type = RTP_PRIO_REALTIME; rtp.type = RTP_PRIO_REALTIME;
p += RTP_PRIO_MAX - (PRIO_MIN - 1); p += RTP_PRIO_MAX - (PRIO_MIN - 1);
rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p; rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p;
if (rtprio(RTP_SET, 0, &rtp)) rc = rtprio(RTP_SET, 0, &rtp);
syslog(LOG_WARNING, "rtprio '%s' (%s): %m", } else
pwd ? pwd->pw_name : "-", rc = setpriority(PRIO_PROCESS, 0, (int)p);
lc ? lc->lc_class : LOGIN_DEFCLASS);
} else { if (rc != 0)
if (setpriority(PRIO_PROCESS, 0, (int)p) != 0) syslog(LOG_WARNING,
syslog(LOG_WARNING, "setpriority '%s' (%s): %m", "%s%s%sLogin class '%s': "
pwd ? pwd->pw_name : "-", "Setting priority failed: %m",
lc ? lc->lc_class : LOGIN_DEFCLASS); pwd ? "Login '" : "",
pwd ? pwd->pw_name : "",
pwd ? "': " : "",
lc->lc_class);
}
} }
} }
emasteUnsubmitted
Not Done
Inline Actions

as with comment in some previous review, I prefer braces around all if-else blocks if any have them

emaste: as with comment in some previous review, I prefer braces around all if-else blocks if any have…
impUnsubmitted
Not Done
Inline Actions

style(9) tries to make this point, but is a hopeless. on clearity in its striving for brevity:

Space after keywords (if, while, for, return, switch).  Two styles of
 braces (‘{’ and ‘}’) are allowed for single line statements.  Either they
 are used for all single statements, or they are used only where needed
 for clarity.  Usage within a function should be consistent.  Forever

which can be read many ways. Certainly within a single if statement, I prefer what you're advocating
too and that seemed to be the consensus of the discussions when I added the above text, but it's not 100% clear.

imp: style(9) tries to make this point, but is a hopeless. on clearity in its striving for brevity…
/* Setup the user's group permissions */ /* Setup the user's group permissions */
if (flags & LOGIN_SETGROUP) { if (flags & LOGIN_SETGROUP) {
if (setgid(pwd->pw_gid) != 0) { if (setgid(pwd->pw_gid) != 0) {
syslog(LOG_ERR, "setgid(%lu): %m", (u_long)pwd->pw_gid); syslog(LOG_ERR, "setgid(%lu): %m", (u_long)pwd->pw_gid);
login_close(llc); login_close(llc);
return (-1); return (-1);
} }
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines