The branch main has been updated by olce:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c7e645269f1c7e9872a7ccf6b72f045c55a66793
commit c7e645269f1c7e9872a7ccf6b72f045c55a66793
Author: Olivier Certner <o...@freebsd.org>
AuthorDate: 2024-01-25 22:25:10 +0000
Commit: Olivier Certner <o...@freebsd.org>
CommitDate: 2024-01-29 21:58:10 +0000
login_cap.h: Remove LOGIN_DEFPRI
This is an implementation detail which is likely to become irrelevant in
the future, as we move to not resetting the priority if the
corresponding capability is not present in the configuration file
('/etc/login.conf').
GitHub's code search and Google show no use of this public constant, and
it doesn't exist in OpenBSD and NetBSD.
So, remove this definition and its sole use in-tree.
PR: 276570 (exp-run)
Reviewed by: emaste
Approved by: emaste (mentor)
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D43609
---
lib/libutil/login_cap.h | 1 -
lib/libutil/login_class.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h
index a48246804a47..316d6e62d790 100644
--- a/lib/libutil/login_cap.h
+++ b/lib/libutil/login_cap.h
@@ -32,7 +32,6 @@
#define LOGIN_MECLASS "me"
#define LOGIN_DEFSTYLE "passwd"
#define LOGIN_DEFSERVICE "login"
-#define LOGIN_DEFPRI 0
#define _PATH_LOGIN_CONF "/etc/login.conf"
#define _FILE_LOGIN_CONF ".login_conf"
#define _PATH_AUTHPROG "/usr/libexec/login_"
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 5ae0fbfb80b8..916e69065320 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -461,7 +461,7 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd,
unsigned long flags)
static void
setclasspriority(login_cap_t * const lc, struct passwd const * const pwd)
{
- const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN;
+ const rlim_t def_val = 0, err_val = INT64_MIN;
rlim_t p;
int rc;
