aboutsummaryrefslogtreecommitdiff
path: root/modules/pam_time/pam_time.c
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2019-01-22 15:01:39 -0800
committerSteve Langasek <vorlon@debian.org>2019-01-22 15:02:03 -0800
commit5cd7bb4511a7c2b355a615f19a9eca193320aa3e (patch)
treeceb3e40947d1f0f4712f473e410494177d5763e0 /modules/pam_time/pam_time.c
parentcfa575497a113d8da1a2c79ef028b5c9648dc136 (diff)
parentf00afb1ef201b2eef7f9ddbe5a0c6ca802cf49bb (diff)
downloadpam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.gz
pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.bz2
pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.zip
Merge upstream version 1.3.0
Diffstat (limited to 'modules/pam_time/pam_time.c')
-rw-r--r--modules/pam_time/pam_time.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c
index c94737ca..b67a4c24 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" ));
@@ -588,7 +592,7 @@ check_account(pam_handle_t *pamh, const char *service,
/* --- public account management functions --- */
-PAM_EXTERN int
+int
pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED,
int argc, const char **argv)
{
@@ -663,18 +667,3 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED,
}
/* end of module definition */
-
-#ifdef PAM_STATIC
-
-/* static module data */
-
-struct pam_module _pam_time_modstruct = {
- "pam_time",
- NULL,
- NULL,
- pam_sm_acct_mgmt,
- NULL,
- NULL,
- NULL
-};
-#endif