diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-04-05 14:27:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:06 -0500 |
| commit | 991112a73cf2abd1761c0680b737fa724666820b (patch) | |
| tree | c7ae15d01cb292acd072947ce5ba2e321f0f720b | |
| parent | 7226511eade844c98861b48b0d97336e66b5723e (diff) | |
| download | samba-991112a73cf2abd1761c0680b737fa724666820b.tar.gz samba-991112a73cf2abd1761c0680b737fa724666820b.tar.bz2 samba-991112a73cf2abd1761c0680b737fa724666820b.zip | |
r49: Support SMB signing on connections using only the
LANMAN password. This also corrects the 'session key'
for these connections.
(This used to be commit 26d8791ddedb7964c219067480cf4a7d61877765)
| -rw-r--r-- | source3/smbd/sesssetup.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index b8777be697..902db2d288 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -881,17 +881,12 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf, return ERROR_NT(nt_status_squash(nt_status)); } - if (server_info->nt_session_key.data) { - session_key = data_blob(server_info->nt_session_key.data, server_info->nt_session_key.length); - } else if (server_info->lm_session_key.length >= 8 && lm_resp.length == 24) { - session_key = data_blob(NULL, 16); - SMBsesskeygen_lmv1(server_info->lm_session_key.data, lm_resp.data, - session_key.data); + if (server_info->user_session_key.data) { + session_key = data_blob(server_info->user_session_key.data, server_info->user_session_key.length); } else { session_key = data_blob(NULL, 0); } - data_blob_free(&lm_resp); data_blob_clear_free(&plaintext_password); /* it's ok - setup a reply */ @@ -911,8 +906,9 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf, to a uid can get through without a password, on the same VC */ /* register_vuid keeps the server info */ - sess_vuid = register_vuid(server_info, session_key, nt_resp, sub_user); + sess_vuid = register_vuid(server_info, session_key, nt_resp.data ? nt_resp : lm_resp, sub_user); data_blob_free(&nt_resp); + data_blob_free(&lm_resp); if (sess_vuid == -1) { return ERROR_NT(NT_STATUS_LOGON_FAILURE); |