Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

Fix blowfish support

009-06-25  Thorsten Kukuk  <kukuk@thkukuk.de>

        * configure.in: Rename crypt_gensalt_rn to crypt_gensalt_r
        * modules/pam_unix/passverify.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index f3de7a8494745d0a55d7a229a4dc4274c7c68c6c..9842331fcb8545c36b1c2b9e6449bdd289d36dac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-25  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * configure.in: Rename crypt_gensalt_rn to crypt_gensalt_r
+       * modules/pam_unix/passverify.c: Likewise.
+
 2009-06-19  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * release version 1.1.0

diff --git a/configure.in b/configure.in
index ba522a5aedd92e87f0195e1574099c3dbf96b20e..3e03b5aabcd6a6a6bcff019b2f475214d12af95c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -363,8 +363,8 @@ AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS],
 AC_CHECK_HEADERS(xcrypt.h crypt.h)
 BACKUP_LIBS=$LIBS
 AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
-AC_CHECK_FUNCS(crypt_r crypt_gensalt_rn)
-LIBS=$BACKUP_LIBS
+AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
+Libs=$BACKUP_LIBS
 AC_SUBST(LIBCRYPT)
 if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
        AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.])

diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
index 8cf95c3331afef93f0bd90814f1034cafb92880d..489e856088d567582a7d0aca9d9247a93f0a31f9 100644 (file)
--- a/modules/pam_unix/passverify.c
+++ b/modules/pam_unix/passverify.c
@@ -274,7 +274,7 @@ PAMH_ARG_DECL(int check_shadow_expiry,
        }
        if ((curdays - spent->sp_lstchg < spent->sp_min)
            && (spent->sp_min != -1)) {
-               /* 
+               /*
                 * The last password change was too recent. This error will be ignored
                 * if no password change is attempted.
                 */
@@ -403,11 +403,11 @@ PAMH_ARG_DECL(char * create_password_hash,
                return crypted;
        }
 
-#ifdef HAVE_CRYPT_GENSALT_RN
+#ifdef HAVE_CRYPT_GENSALT_R
        if (on(UNIX_BLOWFISH_PASS, ctrl)) {
                char entropy[17];
                crypt_make_salt(entropy, sizeof(entropy) - 1);
-               sp = crypt_gensalt_rn(algoid, rounds,
+               sp = crypt_gensalt_r (algoid, rounds,
                                      entropy, sizeof(entropy),
                                      salt, sizeof(salt));
        } else {
@@ -420,7 +420,7 @@ PAMH_ARG_DECL(char * create_password_hash,
                /* For now be conservative so the resulting hashes
                 * are not too long. 8 bytes of salt prevents dictionary
                 * attacks well enough. */
-#ifdef HAVE_CRYPT_GENSALT_RN
+#ifdef HAVE_CRYPT_GENSALT_R
        }
 #endif
        sp = crypt(password, salt);
@@ -684,7 +684,7 @@ save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass,
        D(("fflush or fsync error writing entries to old passwords file: %m"));
        err = 1;
     }
-    
+
     if (fclose(pwfile)) {
        D(("fclose error writing entries to old passwords file: %m"));
        err = 1;
@@ -804,7 +804,7 @@ PAMH_ARG_DECL(int unix_update_passwd,
        D(("fflush or fsync error writing entries to password file: %m"));
        err = 1;
     }
-    
+
     if (fclose(pwfile)) {
        D(("fclose error writing entries to password file: %m"));
        err = 1;
@@ -930,7 +930,7 @@ PAMH_ARG_DECL(int unix_update_shadow,
        D(("fflush or fsync error writing entries to shadow file: %m"));
        err = 1;
     }
-    
+
     if (fclose(pwfile)) {
        D(("fclose error writing entries to shadow file: %m"));
        err = 1;