pam_unix: Use pam_syslog instead of helper_log_err.

* modules/pam_unix/passverify.c (verify_pwd_hash): Add pamh argument via
 PAMH_ARG_DECL. Call pam_syslog() instead of helper_log_err().
* modules/pam_unix/passverify.h: Adjust the declaration of verify_pwd_hash().
* modules/pam_unix/support.c (_unix_verify_password): Add the pamh argument
 to verify_pwd_hash() call.

diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
index 2c808eb5eac7527dd3e3b49d364126127784ccf7..80e327677003a94294b6d9f886a0b7463f08b29f 100644 (file)
--- a/modules/pam_unix/passverify.c
+++ b/modules/pam_unix/passverify.c
@@ -65,8 +65,8 @@ strip_hpux_aging(char *hash)
        }
 }
 
-int
-verify_pwd_hash(const char *p, char *hash, unsigned int nullok)
+PAMH_ARG_DECL(int verify_pwd_hash,
+       const char *p, char *hash, unsigned int nullok)
 {
        size_t hash_len;
        char *pp = NULL;
@@ -116,11 +116,10 @@ verify_pwd_hash(const char *p, char *hash, unsigned int nullok)
                                 * pam_syslog() needs a pam handle,
                                 * but that's not available here.
                                 */
-                               helper_log_err(LOG_ERR,
-                                 "pam_unix(verify_pwd_hash): The method "
-                                 "for computing the hash \"%.6s\" has been "
-                                 "disabled in libcrypt by the preset from "
-                                 "the system's vendor and/or administrator.",
+                               pam_syslog(pamh, LOG_ERR,
+                                 "The support for password hash \"%.6s\" "
+                                 "has been disabled in libcrypt "
+                                 "configuration.",
                                  hash);
                        }
                        /*
@@ -132,12 +131,15 @@ verify_pwd_hash(const char *p, char *hash, unsigned int nullok)
                         * recent implementations of libcrypt.
                         */
                        if (retval_checksalt == CRYPT_SALT_INVALID) {
-                               helper_log_err(LOG_ERR,
-                                 "pam_unix(verify_pwd_hash): The hash \"%.6s\""
-                                 "does not use a method known by the version "
-                                 "of libcrypt this system is supplied with.",
+                               pam_syslog(pamh, LOG_ERR,
+                                 "The password hash \"%.6s\" is unknown to "
+                                 "libcrypt.",
                                  hash);
                        }
+#else
+#ifndef HELPER_COMPILE
+                       (void)pamh;
+#endif
 #endif
 #ifdef HAVE_CRYPT_R
                        struct crypt_data *cdata;

diff --git a/modules/pam_unix/passverify.h b/modules/pam_unix/passverify.h
index 086c28ac7163a0094cb6969ec36187498bfe85a1..e9a88fbfaad5fc561c2bbcbed03be70dedbb4d69 100644 (file)
--- a/modules/pam_unix/passverify.h
+++ b/modules/pam_unix/passverify.h
@@ -12,9 +12,6 @@
 
 #define OLD_PASSWORDS_FILE      "/etc/security/opasswd"
 
-int
-verify_pwd_hash(const char *p, char *hash, unsigned int nullok);
-
 int
 is_pwd_shadowed(const struct passwd *pwd);
 
@@ -65,6 +62,9 @@ read_passwords(int fd, int npass, char **passwords);
 #define PAMH_ARG(...)                  pamh, __VA_ARGS__
 #endif
 
+PAMH_ARG_DECL(int verify_pwd_hash,
+       const char *p, char *hash, unsigned int nullok);
+
 PAMH_ARG_DECL(char * create_password_hash,
        const char *password, unsigned long long ctrl, int rounds);
 

diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c
index 6894288dab4ce8b835eb8b987c14cc3156d25fe6..ea5594d2052c41f45f586c3dc049f5acdbb6fdcc 100644 (file)
--- a/modules/pam_unix/support.c
+++ b/modules/pam_unix/support.c
@@ -770,7 +770,7 @@ int _unix_verify_password(pam_handle_t * pamh, const char *name
                        }
                }
        } else {
-               retval = verify_pwd_hash(p, salt, off(UNIX__NONULL, ctrl));
+               retval = verify_pwd_hash(pamh, p, salt, off(UNIX__NONULL, ctrl));
        }
 
        if (retval == PAM_SUCCESS) {