diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-09-27 23:56:20 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-27 23:56:20 +0000 |
| commit | 465d93b1c6dbd8547091a7dc4b114f48d4a79d40 (patch) | |
| tree | c15dd7eec4b98bcfbc6613a925dea25637062f02 | |
| parent | 543edfbeab9540cf819f09715b1bcf0fca9e99b1 (diff) | |
| download | samba-465d93b1c6dbd8547091a7dc4b114f48d4a79d40.tar.gz samba-465d93b1c6dbd8547091a7dc4b114f48d4a79d40.tar.bz2 samba-465d93b1c6dbd8547091a7dc4b114f48d4a79d40.zip | |
Back our volker's patch as was breaking the build.
Volker, I would like to understand what you are trying to do here...
I'll trust that it's broken (this code is certainly not well tested) but I do
want to keep a close eye on the fixes...
Andrew Bartlett
(This used to be commit 4b72f84cf9bc3f7583318d5dff97257f9dc5b87f)
| -rw-r--r-- | source3/auth/pass_check.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index d98ee96edd..63918796ef 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -609,8 +609,6 @@ 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) /* @@ -647,10 +645,8 @@ 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) { @@ -709,8 +705,7 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas #endif /* extract relevant info */ - if (this_salt[0] == 0) - fstrcpy(this_salt, pass->pw_passwd); + fstrcpy(this_salt, pass->pw_passwd); #if defined(HAVE_TRUNCATED_SALT) /* crypt on some platforms (HPUX in particular) |