diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-06-29 18:47:06 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-06-29 18:47:06 +0000 |
| commit | ab1a6aa42db5217f025941fb5107436556bc23b7 (patch) | |
| tree | 1bc342852e54df8cbf73de89d49871b5c3d12091 /source/smbd/reply.c | |
| parent | de9a38b0bcb5adcb6e502f2200d3e84bdcbdfc48 (diff) | |
| download | samba-ab1a6aa42db5217f025941fb5107436556bc23b7.tar.gz samba-ab1a6aa42db5217f025941fb5107436556bc23b7.tar.xz samba-ab1a6aa42db5217f025941fb5107436556bc23b7.zip | |
improving authentication code (tidyup).
Diffstat (limited to 'source/smbd/reply.c')
| -rw-r--r-- | source/smbd/reply.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/smbd/reply.c b/source/smbd/reply.c index 58f327771d6..c44cf069a9a 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -441,7 +441,9 @@ static int session_trust_account(connection_struct *conn, char *inbuf, char *out return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE)); } - if (!smb_password_ok(smb_trust_acct, NULL, (unsigned char *)smb_passwd, (unsigned char *)smb_nt_passwd)) + if (!smb_password_ok(smb_trust_acct, NULL, NULL, NULL, + (unsigned char *)smb_passwd, smb_passlen, + (unsigned char *)smb_nt_passwd, smb_nt_passlen)) { DEBUG(0,("session_trust_account: Trust Account %s - password failed\n", user)); SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES); @@ -570,7 +572,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int set_remote_arch( RA_WIN95); } - if (passlen1 != 24 && passlen2 != 24) + if (passlen1 != 24 && passlen2 <= 24) doencrypt = False; if (passlen1 > MAX_PASS_LEN) { @@ -593,7 +595,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int setting passlen2 to some random value which really stuffs things up. we need to fix that one. */ - if (passlen1 > 0 && passlen2 > 0 && passlen2 != 24 && passlen2 != 1) + if (passlen1 > 0 && passlen2 > 0 && passlen2 <= 24 && passlen2 != 1) passlen2 = 0; } |