Merge from HEAD - remove silly 'NT or LM# as password' stuff from pam_smbpass.

Andrew Bartlett
(This used to be commit c9994ab7bb0ea96e1a2ddf78935306a7b8507f25)

diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index a55dcb0272d5b267ac61c731dc2681cb884c0f35..11de306d13406eb2dd2b00f04cf00131349dc0ea 100644 (file)
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -355,25 +355,6 @@ int _smb_verify_password( pam_handle_t * pamh, SAM_ACCOUNT *sampass,
     strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
     strncpy( data_name + sizeof(FAIL_PREFIX) - 1, name, strlen( name ) + 1 );
 
-    /* First we check whether we've been given the password in already
-       encrypted form. */
-    if (strlen( p ) == 16 || (strlen( p ) == 32
-         && pdb_gethexpwd( p, (char *) hash_pass ))) {
-
-        if (!memcmp( hash_pass, pdb_get_lanman_passwd(sampass), 16 )
-            || (pdb_get_nt_passwd(sampass)
-                && !memcmp( hash_pass, pdb_get_nt_passwd(sampass), 16 )))
-        {
-            retval = PAM_SUCCESS;
-            if (data_name) {   /* reset failures */
-                pam_set_data( pamh, data_name, NULL, _cleanup_failures );
-            }
-            _pam_delete( data_name );
-            memset( hash_pass, '\0', 16 );
-            return retval;
-        }
-    }
-
     /*
      * The password we were given wasn't an encrypted password, or it
      * didn't match the one we have.  We encrypt the password now and try