summaryrefslogtreecommitdiff
path: root/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c
diff options
context:
space:
mode:
Diffstat (limited to 'package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c')
-rw-r--r--package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c47
1 files changed, 9 insertions, 38 deletions
diff --git a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c
index 63f82cc4b..93a79ebda 100644
--- a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c
+++ b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c
@@ -1,52 +1,23 @@
---- Linux-PAM-1.1.4.orig/modules/pam_succeed_if/pam_succeed_if.c 2011-06-21 11:04:56.000000000 +0200
-+++ Linux-PAM-1.1.4/modules/pam_succeed_if/pam_succeed_if.c 2012-07-31 12:02:24.000000000 +0200
-@@ -230,6 +230,7 @@ evaluate_notingroup(pam_handle_t *pamh,
- return PAM_AUTH_ERR;
- }
- /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */
-+/*
+--- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c 2013-06-18 16:11:21.000000000 +0200
++++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2013-12-21 18:30:19.000000000 +0100
+@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh,
static int
evaluate_innetgr(const char *host, const char *user, const char *group)
{
-@@ -237,7 +238,9 @@ evaluate_innetgr(const char *host, const
++#ifdef HAVE_INNETGR
+ if (innetgr(group, host, user, NULL) == 1)
return PAM_SUCCESS;
++#endif
return PAM_AUTH_ERR;
}
-+*/
/* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
-+/*
static int
evaluate_notinnetgr(const char *host, const char *user, const char *group)
{
-@@ -245,6 +248,7 @@ evaluate_notinnetgr(const char *host, co
++#ifdef HAVE_INNETGR
+ if (innetgr(group, host, user, NULL) == 0)
return PAM_SUCCESS;
++#endif
return PAM_AUTH_ERR;
}
-+*/
- /* Match a triple. */
- static int
-@@ -357,19 +361,23 @@ evaluate(pam_handle_t *pamh, int debug,
- return evaluate_notingroup(pamh, user, right);
- }
- /* (Rhost, user) is in this netgroup. */
-+ /*
- if (strcasecmp(qual, "innetgr") == 0) {
- const void *rhost;
- if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
- rhost = NULL;
- return evaluate_innetgr(rhost, user, right);
- }
-+ */
- /* (Rhost, user) is not in this group. */
-+ /*
- if (strcasecmp(qual, "notinnetgr") == 0) {
- const void *rhost;
- if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
- rhost = NULL;
- return evaluate_notinnetgr(rhost, user, right);
- }
-+ */
- /* Fail closed. */
- return PAM_SERVICE_ERR;
- }