summaryrefslogtreecommitdiff
path: root/modules/pam_nologin/pam_nologin.c
diff options
context:
space:
mode:
authorTomas Mraz <tm@t8m.info>2010-08-26 19:16:18 +0000
committerTomas Mraz <tm@t8m.info>2010-08-26 19:16:18 +0000
commite9e593f6ddeaf975b7fe8446d184e6bc387d450b (patch)
tree29926b2b1ef14b70e63af8ee6c150472b9a667b3 /modules/pam_nologin/pam_nologin.c
parent75961e09da633883e0bbc6ba5cbde46404180b15 (diff)
Relevant BUGIDs:
Purpose of commit: new feature Commit summary: --------------- 2010-08-26 Tomas Mraz <t8m@centrum.cz> * modules/pam_nologin/pam_nologin.c (perform_check): Try first /var/run/nologin if the nologin file is not explicitly specified. * modules/pam_nologin/pam_nologin.8.xml: Document that /var/run/nologin is tried first.
Diffstat (limited to 'modules/pam_nologin/pam_nologin.c')
-rw-r--r--modules/pam_nologin/pam_nologin.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/modules/pam_nologin/pam_nologin.c b/modules/pam_nologin/pam_nologin.c
index 54ecc82b..f047c324 100644
--- a/modules/pam_nologin/pam_nologin.c
+++ b/modules/pam_nologin/pam_nologin.c
@@ -33,6 +33,9 @@
#include <security/pam_modutil.h>
#include <security/pam_ext.h>
+#define DEFAULT_NOLOGIN_PATH "/var/run/nologin"
+#define COMPAT_NOLOGIN_PATH "/etc/nologin"
+
/*
* parse some command line options
*/
@@ -49,7 +52,6 @@ parse_args(pam_handle_t *pamh, int argc, const char **argv, struct opt_s *opts)
memset(opts, 0, sizeof(*opts));
opts->retval_when_nofile = PAM_IGNORE;
- opts->nologin_file = "/etc/nologin";
for (i=0; i<argc; ++i) {
if (!strcmp("successok", argv[i])) {
@@ -70,14 +72,22 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts)
{
const char *username;
int retval = opts->retval_when_nofile;
- int fd;
+ int fd = -1;
if ((pam_get_user(pamh, &username, NULL) != PAM_SUCCESS) || !username) {
pam_syslog(pamh, LOG_WARNING, "cannot determine username");
return PAM_USER_UNKNOWN;
}
- if ((fd = open(opts->nologin_file, O_RDONLY, 0)) >= 0) {
+ if (opts->nologin_file == NULL) {
+ if ((fd = open(DEFAULT_NOLOGIN_PATH, O_RDONLY, 0)) < 0) {
+ fd = open(COMPAT_NOLOGIN_PATH, O_RDONLY, 0);
+ }
+ } else {
+ fd = open(opts->nologin_file, O_RDONLY, 0);
+ }
+
+ if (fd >= 0) {
char *mtmp=NULL;
int msg_style = PAM_TEXT_INFO;