diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-10-01 13:10:57 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-10-01 13:10:57 +0000 |
| commit | ad8a22e570c8970247dc76defc9be2b768bd102d (patch) | |
| tree | e672142a6c857da134cc893e5ebe7cef08791d19 /source3/auth/pass_check.c | |
| parent | 8147df0b6b4674670e70b45c603e8323e5c61c33 (diff) | |
| download | samba-ad8a22e570c8970247dc76defc9be2b768bd102d.tar.gz samba-ad8a22e570c8970247dc76defc9be2b768bd102d.tar.bz2 samba-ad8a22e570c8970247dc76defc9be2b768bd102d.zip | |
Updates from Samba HEAD:
- Fix segfaults in the 'net ads' commands when no password is provided
- Readd --with-ldapsam for 2.2 compatability. This conditionally compiles the
old options, but the actual code is available on all ldap systems.
- Fix shadow passwords (as per work with vl)
- Fix sending plaintext passwords to unicode servers (again vl)
- Add a bit of const to secrets.c functions
- Fix some spelling and grammer by vance.
- Document the -r option in smbgroupedit.
There are more changes in HEAD, I'm only merging the changes I've been involved
with.
Andrew Bartlett
(This used to be commit 83973c389355a5cc9ca74af467dfd8b5dabd2c8f)
Diffstat (limited to 'source3/auth/pass_check.c')
| -rw-r--r-- | source3/auth/pass_check.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c index 63918796ef..e1783bfd1e 100644 --- a/source3/auth/pass_check.c +++ b/source3/auth/pass_check.c @@ -634,6 +634,7 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas /* Also the place to keep the 'password' no matter what crazy struct it started in... */ fstrcpy(this_crypted, pass->pw_passwd); + fstrcpy(this_salt, pass->pw_passwd); #ifdef HAVE_GETSPNAM { @@ -645,8 +646,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) { @@ -704,9 +707,6 @@ NTSTATUS pass_check(const struct passwd *pass, const char *user, const char *pas } #endif - /* extract relevant info */ - fstrcpy(this_salt, pass->pw_passwd); - #if defined(HAVE_TRUNCATED_SALT) /* crypt on some platforms (HPUX in particular) won't work with more than 2 salt characters. */ |