diff options
author | Gerald Carter <jerry@samba.org> | 2003-01-15 18:57:41 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2003-01-15 18:57:41 +0000 |
commit | 99cdb462083381c88689a4e698ca48b6ed4cf5ac (patch) | |
tree | 7ea530c74c8fd1ef65eec52410b7843e63d89f8f /source3/smbd/chgpasswd.c | |
parent | 35fa2e5975f9b380e6e63471413df6f4182c164b (diff) | |
download | samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.gz samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.bz2 samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.zip |
*lots of small merges form HEAD
*sync up configure.in
*don't build torture tools in make all
*make sure to remove torture tools as part of make clean
(This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
Diffstat (limited to 'source3/smbd/chgpasswd.c')
-rw-r--r-- | source3/smbd/chgpasswd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index cf5a0fc142..1c31d9757a 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -249,9 +249,9 @@ static int expect(int master, char *issue, char *expected) nread = 0; buffer[nread] = 0; - while ((len = read_with_timeout(master, buffer + nread, 1, - sizeof(buffer) - nread - 1, - timeout)) > 0) { + while ((len = read_socket_with_timeout(master, buffer + nread, 1, + sizeof(buffer) - nread - 1, + timeout)) > 0) { nread += len; buffer[nread] = 0; @@ -862,6 +862,10 @@ static NTSTATUS check_oem_password(const char *user, */ new_pw_len = IVAL(lmdata, 512); + + DEBUG(0, ("** new_pw_len = %d, new_passwd_size = %d\n", + new_pw_len, new_passwd_size)); + if (new_pw_len < 0 || new_pw_len > new_passwd_size - 1) { DEBUG(0,("check_oem_password: incorrect password length (%d).\n", new_pw_len)); pdb_free_sam(&sampass); |