From e2a818773f96d12fc9f91bf2792a5a216c3b9aa4 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 7 Feb 2013 17:06:57 +0100 Subject: pam_userdb: Allow also modern password hashes supported by crypt(). modules/pam_userdb/pam_userdb.c (user_lookup): Allow password hashes longer than 13 characters and long salt. --- modules/pam_userdb/pam_userdb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'modules/pam_userdb') diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c index c075c4b5..de8b5b1e 100644 --- a/modules/pam_userdb/pam_userdb.c +++ b/modules/pam_userdb/pam_userdb.c @@ -214,17 +214,13 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode, /* crypt(3) password storage */ char *cryptpw; - char salt[2]; - if (data.dsize != 13) { + if (data.dsize < 13) { compare = -2; } else if (ctrl & PAM_ICASE_ARG) { compare = -2; } else { - salt[0] = *data.dptr; - salt[1] = *(data.dptr + 1); - - cryptpw = crypt (pass, salt); + cryptpw = crypt (pass, data.dptr); if (cryptpw) { compare = strncasecmp (data.dptr, cryptpw, data.dsize); -- cgit v1.2.3