Page MenuHomeFreeBSD
Files F142782722

D40350.diff
No OneTemporary
Actions

D40350.diff
View Options

diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -455,6 +455,56 @@
}
+/*
+ * Private function to set process priority.
+ */
+static void
+setclasspriority(login_cap_t * const lc, struct passwd const * const pwd)
+{
+ const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN;
+ rlim_t p = login_getcapnum(lc, "priority", def_val, err_val);
+ int rc;
+
+ if (p == err_val) {
+ /* Invariant: 'lc' != NULL. */
+ syslog(LOG_WARNING,
+ "%s%s%sLogin class '%s': "
+ "Invalid priority specification: '%s'",
+ pwd ? "Login '" : "",
+ pwd ? pwd->pw_name : "",
+ pwd ? "': " : "",
+ lc->lc_class,
+ login_getcapstr(lc, "priority", "", ""));
+ /* Reset the priority, as if the capability was not present. */
+ p = def_val;
+ }
+
+ if (p > PRIO_MAX) {
+ struct rtprio rtp;
+
+ rtp.type = RTP_PRIO_IDLE;
+ p += RTP_PRIO_MIN - (PRIO_MAX + 1);
+ rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p;
+ rc = rtprio(RTP_SET, 0, &rtp);
+ } else if (p < PRIO_MIN) {
+ struct rtprio rtp;
+
+ rtp.type = RTP_PRIO_REALTIME;
+ p += RTP_PRIO_MAX - (PRIO_MIN - 1);
+ rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p;
+ rc = rtprio(RTP_SET, 0, &rtp);
+ } else
+ rc = setpriority(PRIO_PROCESS, 0, (int)p);
+
+ if (rc != 0)
+ syslog(LOG_WARNING,
+ "%s%s%sLogin class '%s': "
+ "Setting priority failed: %m",
+ pwd ? "Login '" : "",
+ pwd ? pwd->pw_name : "",
+ pwd ? "': " : "",
+ lc ? lc->lc_class : "<none>");
+}
/*
* setusercontext()
@@ -489,51 +539,8 @@
flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC);
/* Set the process priority */
- if (flags & LOGIN_SETPRIORITY) {
- const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN;
- rlim_t p = login_getcapnum(lc, "priority", def_val, err_val);
- int rc;
-
- if (p == err_val) {
- /* Invariant: 'lc' != NULL. */
- syslog(LOG_WARNING,
- "%s%s%sLogin class '%s': "
- "Invalid priority specification: '%s'",
- pwd ? "Login '" : "",
- pwd ? pwd->pw_name : "",
- pwd ? "': " : "",
- lc->lc_class,
- login_getcapstr(lc, "priority", "", ""));
- /* Reset the priority, as if the capability was not present. */
- p = def_val;
- }
-
- if (p > PRIO_MAX) {
- struct rtprio rtp;
-
- rtp.type = RTP_PRIO_IDLE;
- p += RTP_PRIO_MIN - (PRIO_MAX + 1);
- rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p;
- rc = rtprio(RTP_SET, 0, &rtp);
- } else if (p < PRIO_MIN) {
- struct rtprio rtp;
-
- rtp.type = RTP_PRIO_REALTIME;
- p += RTP_PRIO_MAX - (PRIO_MIN - 1);
- rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p;
- rc = rtprio(RTP_SET, 0, &rtp);
- } else
- rc = setpriority(PRIO_PROCESS, 0, (int)p);
-
- if (rc != 0)
- syslog(LOG_WARNING,
- "%s%s%sLogin class '%s': "
- "Setting priority failed: %m",
- pwd ? "Login '" : "",
- pwd ? pwd->pw_name : "",
- pwd ? "': " : "",
- lc ? lc->lc_class : "<none>");
- }
+ if (flags & LOGIN_SETPRIORITY)
+ setclasspriority(lc, pwd);
/* Setup the user's group permissions */
if (flags & LOGIN_SETGROUP) {

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 24, 1:48 PM (10 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27897431
Default Alt Text
D40350.diff (3 KB)

Event Timeline