summaryrefslogtreecommitdiffstats
path: root/source3/libsmb
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-06-20 19:55:59 +0000
committerJeremy Allison <jra@samba.org>2001-06-20 19:55:59 +0000
commit3f1254bee1b3cc8cce1e17be6f0250090f579417 (patch)
tree931ea411eafa5e7f1f88c82b52f0eb9f2ac6ce53 /source3/libsmb
parent6fb063b4d5dfb1b201cb4531855662997ca02dbf (diff)
downloadsamba-3f1254bee1b3cc8cce1e17be6f0250090f579417.tar.gz
samba-3f1254bee1b3cc8cce1e17be6f0250090f579417.tar.xz
samba-3f1254bee1b3cc8cce1e17be6f0250090f579417.zip
Fixed W2K SP2 joining a Samba PDC hosted domain.
Jermey. (This used to be commit 05a2911403a0710d994a618e72743205a3b0b87a)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/smbdes.c2
-rw-r--r--source3/libsmb/smbencrypt.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index d0e1c6e85fb..7e8a9a5b89e 100644
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -381,7 +381,7 @@ void SamOEMhash( unsigned char *data, unsigned char *key, int val)
s_box[ind] = s_box[j];
s_box[j] = tc;
}
- for( ind = 0; ind < (val ? 516 : 16); ind++)
+ for( ind = 0; ind < val; ind++)
{
unsigned char tc;
unsigned char t;
diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c
index 68af1b4941b..b9827333d8b 100644
--- a/source3/libsmb/smbencrypt.c
+++ b/source3/libsmb/smbencrypt.c
@@ -223,7 +223,7 @@ BOOL make_oem_passwd_hash(char data[516], const char *passwd, uchar old_pw_hash[
DEBUG(100,("make_oem_passwd_hash\n"));
dump_data(100, data, 516);
#endif
- SamOEMhash( (unsigned char *)data, (unsigned char *)old_pw_hash, True);
+ SamOEMhash( (unsigned char *)data, (unsigned char *)old_pw_hash, 516);
return True;
}