diff options
| author | Jeremy Allison <jra@samba.org> | 1998-03-24 00:37:53 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-03-24 00:37:53 +0000 |
| commit | 5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12 (patch) | |
| tree | f899a5c26bd29c518a32b0f57988c1a3e0ab277d /source3/rpc_server | |
| parent | 4ddd855d706df5d3aacfcc0121a926d6f43cae02 (diff) | |
| download | samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.tar.gz samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.tar.bz2 samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.zip | |
clientgen.c ipc.c smbpasswd.c: Fixes for warnings (from Herb).
quotas.c: Linux quota fix.
util.c: Ensure smb_read_error is zero in all calls that can set it.
lib/rpc/include/rpc_misc.h lib/rpc/include/rpc_netlogon.h
lib/rpc/parse/parse_misc.c lib/rpc/parse/parse_net.c
lib/rpc/server/srv_netlog.c : Modify Luke's code to call
SamOEMhash().
Jeremy.
(This used to be commit 7f749708383b8b36c3f23a5fbc5cbdf39bc8e555)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_netlog.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c index f85330fd3c..d7a1b9e421 100644 --- a/source3/rpc_server/srv_netlog.c +++ b/source3/rpc_server/srv_netlog.c @@ -485,22 +485,22 @@ static uint32 net_login_interactive(NET_ID_INFO_1 *id1, { uint32 status = 0x0; -#ifdef USE_ARCFOUR - extern void arcfour(uint8 key[16], uint8 out[16], uint8 in[16]); char nt_pwd[16]; char lm_pwd[16]; - unsigned char arc4_key[16]; - memset(arc4_key, 0, 16); - memcpy(arc4_key, vuser->dc.sess_key, 8); + unsigned char key[16]; + memset(key, 0, 16); + memcpy(key, vuser->dc.sess_key, 8); - arcfour(arc4_key, lm_pwd, id1->arc4_lm_owf.data); - arcfour(arc4_key, nt_pwd, id1->arc4_nt_owf.data); + memcpy(lm_pwd, id1->lm_owf.data, 16); + memcpy(nt_pwd, id1->nt_owf.data, 16); + SamOEMhash(lm_pwd, key, False); + SamOEMhash(nt_pwd, key, False); #ifdef DEBUG_PASSWORD - DEBUG(100,("arcfour decrypt of lm owf password:")); + DEBUG(100,("decrypt of lm owf password:")); dump_data(100, lm_pwd, 16); - DEBUG(100,("arcfour decrypt of nt owf password:")); + DEBUG(100,("decrypt of nt owf password:")); dump_data(100, nt_pwd, 16); #endif @@ -509,13 +509,6 @@ static uint32 net_login_interactive(NET_ID_INFO_1 *id1, { status = 0xC0000000 | NT_STATUS_WRONG_PASSWORD; } -#else -/* sorry. have to assume that the password is always ok. - this _is_ ok, because the LSA SAM Logon is nothing to do - with SMB connections to shares. - */ -DEBUG(3,("SAM Logon. Password not being checked\n")); -#endif return status; } |