diff options
| author | Volker Lendecke <vlendec@samba.org> | 2002-09-27 16:20:09 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2002-09-27 16:20:09 +0000 |
| commit | ba754b57ddb78dadedcb7b5877cbee5bab08181e (patch) | |
| tree | 13da91dc58ddd01d316a9280ba0f2d9755487fc3 /source | |
| parent | c864edf4fbf8a6c37888a14b861d7c12cf503d4f (diff) | |
| download | samba-ba754b57ddb78dadedcb7b5877cbee5bab08181e.tar.gz | |
Sorry to touch such an internal function. But I was quite surprised that
'security = user', 'encrypt passwords = no' did not work anymore.
This is on quite a standard SuSE 7.3, ./configure.developer --with-tdbsam.
I can provide a config.log / config.h on demand.
Please re-check for consequences, I don't really oversee that file.
Thanks,
Volker
Diffstat (limited to 'source')
| -rw-r--r-- | source/auth/pass_check.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/auth/pass_check.c b/source/auth/pass_check.c index 63918796efb..d98ee96edd6 100644 --- a/source/auth/pass_check.c +++ b/source/auth/pass_check.c @@ -609,6 +609,8 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas if (((!*password) || (!pwlen)) && !lp_null_passwords()) return NT_STATUS_LOGON_FAILURE; + this_salt[0] = 0; + #if defined(WITH_PAM) /* @@ -645,8 +647,10 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas perhaps for IPC password changing requests */ spass = getspnam(pass->pw_name); - if (spass && spass->sp_pwdp) + if (spass && spass->sp_pwdp) { fstrcpy(this_crypted, spass->sp_pwdp); + fstrcpy(this_salt, spass->sp_pwdp); + } } #elif defined(IA_UINFO) { @@ -705,7 +709,8 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas #endif /* extract relevant info */ - fstrcpy(this_salt, pass->pw_passwd); + if (this_salt[0] == 0) + fstrcpy(this_salt, pass->pw_passwd); #if defined(HAVE_TRUNCATED_SALT) /* crypt on some platforms (HPUX in particular) |