Ignore:
Timestamp:
Jul 11, 2008, 1:13:42 AM (17 years ago)
Author:
Paul Smedley
Message:

Update branch to 3.0.31 release

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/samba-3.0/source/pam_smbpass/support.c

    r1 r140  
    326326#endif
    327327
    328     if (!pdb_get_lanman_passwd(sampass))
     328    if (!pdb_get_nt_passwd(sampass))
    329329    {
    330330        _log_err( LOG_DEBUG, "user %s has null SMB password"
     
    348348    if (data_name == NULL) {
    349349        _log_err( LOG_CRIT, "no memory for data-name" );
     350        return PAM_AUTH_ERR;
    350351    }
    351352    strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
     
    416417                      service ? service : "**unknown**", name);
    417418            }
    418         } else {
    419             _log_err(LOG_NOTICE,
    420                       "failed auth request by %s for service %s as %s(%d)",
    421                       uidtoname(getuid()),
    422                       service ? service : "**unknown**", name);
    423             retval = PAM_AUTH_ERR;
    424         }
     419        }
     420        _log_err(LOG_NOTICE,
     421                  "failed auth request by %s for service %s as %s(%d)",
     422                  uidtoname(getuid()),
     423                  service ? service : "**unknown**", name);
     424        retval = PAM_AUTH_ERR;
    425425    }
    426426
     
    451451                return 0;               /* will fail but don't let on yet */
    452452
    453         if (pdb_get_lanman_passwd(sampass) == NULL)
     453        if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ))
     454                return 0;
     455
     456        if (pdb_get_nt_passwd(sampass) == NULL)
    454457                retval = 1;
    455458        else
Note: See TracChangeset for help on using the changeset viewer.