linux-pam-commits
November 2016
linux-pam-commits@lists.fedorahosted.org
- 1 participants
- 2 discussions
[linux-pam] Regular links doesn't work with -no-numbering -no-references.
by Tomáš Mráz
commit 1ca735ff2d3622ef8bd68e8c360e6117b6bda5c4
Author: Tomas Mraz <tmraz(a)fedoraproject.org>
Date: Mon Nov 14 11:43:12 2016 +0100
Regular links doesn't work with -no-numbering -no-references.
* configure.ac: Use elinks instead of links.
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index df39d07..8cd9e72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -558,7 +558,7 @@ AC_PATH_PROG([BROWSER], [w3m])
if test ! -z "$BROWSER"; then
BROWSER="$BROWSER -T text/html -dump"
else
- AC_PATH_PROG([BROWSER], [links])
+ AC_PATH_PROG([BROWSER], [elinks])
if test ! -z "$BROWSER"; then
BROWSER="$BROWSER -no-numbering -no-references -dump"
else
7 years, 5 months
- 1
- 0
[linux-pam] pam_access: First check for the (group) match.
by Tomáš Mráz
commit 2fc2673d889a15f097acd8ae68fe9d292dea472d
Author: Tomas Mraz <tmraz(a)fedoraproject.org>
Date: Tue Nov 1 15:17:54 2016 +0100
pam_access: First check for the (group) match.
The (group) match is performed first to allow for groups
containing '@'.
* modules/pam_access/pam_access.c (user_match): First check for the (group) match.
modules/pam_access/pam_access.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c
index 3ac1ad0..d689578 100644
--- a/modules/pam_access/pam_access.c
+++ b/modules/pam_access/pam_access.c
@@ -516,7 +516,9 @@ user_match (pam_handle_t *pamh, char *tok, struct login_info *item)
/* Try to split on a pattern (@*[^@]+)((a)+.*) */
for (at = tok; *at == '@'; ++at);
- if ((at = strchr(at, '@')) != NULL) {
+ if (tok[0] == '(' && tok[strlen(tok) - 1] == ')') {
+ return (group_match (pamh, tok, string, item->debug));
+ } else if ((at = strchr(at, '@')) != NULL) {
/* split user@host pattern */
if (item->hostname == NULL)
return NO;
@@ -541,9 +543,7 @@ user_match (pam_handle_t *pamh, char *tok, struct login_info *item)
hostname = item->hostname;
}
return (netgroup_match (pamh, tok + 1, hostname, string, item->debug));
- } else if (tok[0] == '(' && tok[strlen(tok) - 1] == ')')
- return (group_match (pamh, tok, string, item->debug));
- else if ((rv=string_match (pamh, tok, string, item->debug)) != NO) /* ALL or exact match */
+ } else if ((rv=string_match (pamh, tok, string, item->debug)) != NO) /* ALL or exact match */
return rv;
else if (item->only_new_group_syntax == NO &&
pam_modutil_user_in_group_nam_nam (pamh,
7 years, 5 months
- 1
- 0
- ← Newer
- 1
- Older →