diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2015-03-21 11:11:23 +0000 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2015-03-22 07:32:02 +0000 |
| commit | a3ebc3aeb92ccf413253d934cf14169d1d36b15e (patch) | |
| tree | 79f8a9d1e49d188e0ce028c6a29577036e54bbd8 | |
| parent | 5fc77e3813456002d7f44308b69678b4981d23a3 (diff) | |
| download | linux-pam-baserock/v1.1.8-musl.tar.gz | |
Use HAVE_INNETGR before calling innetgr()baserock/v1.1.8-musl
| -rw-r--r-- | modules/pam_succeed_if/pam_succeed_if.c | 16 | ||||
| -rw-r--r-- | modules/pam_time/pam_time.c | 4 |
2 files changed, 16 insertions, 4 deletions
diff --git a/modules/pam_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c index 32a7373..9102a90 100644 --- a/modules/pam_succeed_if/pam_succeed_if.c +++ b/modules/pam_succeed_if/pam_succeed_if.c @@ -231,18 +231,26 @@ evaluate_notingroup(pam_handle_t *pamh, const char *user, const char *group) } /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */ static int -evaluate_innetgr(const char *host, const char *user, const char *group) +evaluate_innetgr(pam_handle_t *pamh, const char *host, const char *user, const char *group) { +#ifdef HAVE_INNETGR if (innetgr(group, host, user, NULL) == 1) return PAM_SUCCESS; +#else + pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support"); +#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) +evaluate_notinnetgr(pam_handle_t *pamh, const char *host, const char *user, const char *group) { +#ifdef HAVE_INNETGR if (innetgr(group, host, user, NULL) == 0) return PAM_SUCCESS; +#else + pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support"); +#endif return PAM_AUTH_ERR; } @@ -387,14 +395,14 @@ evaluate(pam_handle_t *pamh, int debug, const void *rhost; if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS) rhost = NULL; - return evaluate_innetgr(rhost, user, right); + return evaluate_innetgr(pamh, 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); + return evaluate_notinnetgr(pamh, rhost, user, right); } /* Fail closed. */ return PAM_SERVICE_ERR; diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c index c94737c..a4dd58b 100644 --- a/modules/pam_time/pam_time.c +++ b/modules/pam_time/pam_time.c @@ -555,7 +555,11 @@ check_account(pam_handle_t *pamh, const char *service, } /* If buffer starts with @, we are using netgroups */ if (buffer[0] == '@') +#ifdef HAVE_INNETGR good &= innetgr (&buffer[1], NULL, user, NULL); +#else + pam_syslog (pamh, LOG_ERR, "pam_time does not have netgroup support"); +#endif else good &= logic_field(pamh, user, buffer, count, is_same); D(("with user: %s", good ? "passes":"fails" )); |