Relevant BUGIDs: none

Purpose of commit: new feature

Commit summary:
---------------
2005-09-21  Dmitry V. Levin  <ldv@altlinux.org>

	* modules/pam_nologin/pam_nologin.c: Include <syslog.h>.
	(parse_args): Add pam_handle_t* argument.  Log unrecognized
	options.
	(perform_check): Log pam_get_user() and malloc() failures.
	(pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt):
	Pass pam_handle_t* to parse_args().

diff --git a/ChangeLog b/ChangeLog
index ceae0fde93061d8aa3444bc79dc536e805a9eea8..2bb6512a8d9af6f76f58ec694e0eb24288364099 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-21  Dmitry V. Levin  <ldv@altlinux.org>
+
+       * modules/pam_nologin/pam_nologin.c: Include <syslog.h>.
+       (parse_args): Add pam_handle_t* argument.  Log unrecognized
+       options.
+       (perform_check): Log pam_get_user() and malloc() failures.
+       (pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt):
+       Pass pam_handle_t* to parse_args().
+
 2005-09-20  Thorsten Kukuk  <kukuk@suse.de>
 
        * configure.in: Add finish translation.

diff --git a/modules/pam_nologin/pam_nologin.c b/modules/pam_nologin/pam_nologin.c
index 1b6c0beeab895919474f498022be191457526fda..39577595d7c24b794ba151ff04123b1739fae4fb 100644 (file)
--- a/modules/pam_nologin/pam_nologin.c
+++ b/modules/pam_nologin/pam_nologin.c
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <syslog.h>
 #include <pwd.h>
 
 #include <security/_pam_macros.h>
@@ -41,7 +42,7 @@ struct opt_s {
 };
 
 static void
-parse_args(int argc, const char **argv, struct opt_s *opts)
+parse_args(pam_handle_t *pamh, int argc, const char **argv, struct opt_s *opts)
 {
     int i;
 
@@ -56,8 +57,7 @@ parse_args(int argc, const char **argv, struct opt_s *opts)
        } else if (!memcmp("file=", argv[i], 5)) {
            opts->nologin_file = argv[i] + 5;
        } else {
-           /* XXX - ignore for now. Later, we'll use the logging
-               function in pammodutils */
+           pam_syslog(pamh, LOG_ERR, "unknown option: %s", argv[i]);
        }
     }
 }
@@ -69,12 +69,11 @@ parse_args(int argc, const char **argv, struct opt_s *opts)
 static int perform_check(pam_handle_t *pamh, struct opt_s *opts)
 {
     const char *username;
-    int retval = PAM_SUCCESS;
+    int retval = opts->retval_when_nofile;
     int fd;
 
-    retval = opts->retval_when_nofile;
-
     if ((pam_get_user(pamh, &username, NULL) != PAM_SUCCESS) || !username) {
+       pam_syslog(pamh, LOG_WARNING, "cannot determine username");
        return PAM_USER_UNKNOWN;
     }
 
@@ -87,15 +86,11 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts)
 
        user_pwd = pam_modutil_getpwnam(pamh, username);
        if (user_pwd == NULL) {
-
            retval = PAM_USER_UNKNOWN;
            msg_style = PAM_ERROR_MSG;
-
        } else if (user_pwd->pw_uid) {
-
            retval = PAM_AUTH_ERR;
            msg_style = PAM_ERROR_MSG;
-
        }
 
        /* fill in message buffer with contents of /etc/nologin */
@@ -106,15 +101,14 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts)
 
        mtmp = malloc(st.st_size+1);
        if (!mtmp) {
-           /* if malloc failed... */
+           pam_syslog(pamh, LOG_ERR, "out of memory");
            retval = PAM_BUF_ERR;
            goto clean_up_fd;
        }
 
        if (pam_modutil_read(fd, mtmp, st.st_size) == st.st_size) {
-               mtmp[st.st_size] = '\000';
-
-               pam_prompt (pamh, msg_style, NULL, "%s", mtmp);
+               mtmp[st.st_size] = '\0';
+               (void) pam_prompt (pamh, msg_style, NULL, "%s", mtmp);
        }
        else
            retval = PAM_SYSTEM_ERR;
@@ -137,7 +131,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
 {
     struct opt_s opts;
 
-    parse_args(argc, argv, &opts);
+    parse_args(pamh, argc, argv, &opts);
 
     return perform_check(pamh, &opts);
 }
@@ -148,7 +142,7 @@ pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED,
 {
     struct opt_s opts;
 
-    parse_args(argc, argv, &opts);
+    parse_args(pamh, argc, argv, &opts);
 
     return opts.retval_when_nofile;
 }
@@ -161,7 +155,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags UNUSED,
 {
     struct opt_s opts;
 
-    parse_args(argc, argv, &opts);
+    parse_args(pamh, argc, argv, &opts);
 
     return perform_check(pamh, &opts);
 }