The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6ab923cbca8759503a08683a5978b9ebf5efd607
commit 6ab923cbca8759503a08683a5978b9ebf5efd607
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2021-02-23 22:01:29 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-02-24 00:14:05 +0000
pam_login_access: Fix negative entry matching logic
PR: 252194
Approved by: so
Security: CVE-2020-25580
Security: FreeBSD-SA-21:03.pam_login_access
---
lib/libpam/modules/pam_login_access/login_access.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/libpam/modules/pam_login_access/login_access.c
b/lib/libpam/modules/pam_login_access/login_access.c
index 9496081d362e..719808858dac 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -137,10 +137,10 @@ list_match(char *list, const char *item,
if (match != NO) {
while ((tok = strtok((char *) 0, listsep)) && strcmp(tok, "EXCEPT")) {
/* VOID */ ;
- if (tok == NULL || list_match((char *) 0, item, match_fn,
- login_access_opts) == NO) {
+ }
+ if (tok == NULL ||
+ list_match((char *) 0, item, match_fn, login_access_opts) == NO) {
return (match);
- }
}
}
return (NO);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
