Changeset 140 for branches/samba-3.0/source/pam_smbpass/support.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/pam_smbpass/support.c (modified) (4 diffs)

branches/samba-3.0/source/pam_smbpass/support.c

@@ -326 +326 @@
 #endif
 
-    if (!pdb_get_lanman_passwd(sampass))
+    if (!pdb_get_nt_passwd(sampass))
     {
         _log_err( LOG_DEBUG, "user %s has null SMB password"
@@ -348 +348 @@
     if (data_name == NULL) {
         _log_err( LOG_CRIT, "no memory for data-name" );
+        return PAM_AUTH_ERR;
     }
     strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
@@ -416 +417 @@
                       service ? service : "**unknown**", name);
             }
-        } else {
-            _log_err(LOG_NOTICE,
-                      "failed auth request by %s for service %s as %s(%d)",
-                      uidtoname(getuid()),
-                      service ? service : "**unknown**", name);
-            retval = PAM_AUTH_ERR;
-        }
+        }
+        _log_err(LOG_NOTICE,
+                  "failed auth request by %s for service %s as %s(%d)",
+                  uidtoname(getuid()),
+                  service ? service : "**unknown**", name);
+        retval = PAM_AUTH_ERR;
     }
 
@@ -451 +451 @@
                 return 0;               /* will fail but don't let on yet */
 
-        if (pdb_get_lanman_passwd(sampass) == NULL)
+        if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ))
+                return 0;
+
+        if (pdb_get_nt_passwd(sampass) == NULL)
                 retval = 1;
         else