diff options
| author | Jeremy Allison <jra@samba.org> | 2007-03-27 21:13:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:58 -0500 |
| commit | 4a66d0e232271968ba96da50274428916a393975 (patch) | |
| tree | 89e40c8ad86d96458905940839a5ddba4f1bd747 /source3/smbd/trans2.c | |
| parent | 34dac35e48ca0c03d2744d9925566665285eb973 (diff) | |
| download | samba-4a66d0e232271968ba96da50274428916a393975.tar.gz samba-4a66d0e232271968ba96da50274428916a393975.tar.bz2 samba-4a66d0e232271968ba96da50274428916a393975.zip | |
r21991: I hate Steve French :-). Add support for encryption
contexts....
Jeremy.
(This used to be commit ae8f3649f773b8a8dcb55921536d038d3475322e)
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 007ad50b10..df713db564 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2765,6 +2765,7 @@ cap_low = 0x%x, cap_high = 0x%x\n", case SMB_REQUEST_TRANSPORT_ENCRYPTION: { NTSTATUS status; + size_t param_len = 0; size_t data_len = total_data; if (!lp_unix_extensions()) { @@ -2773,7 +2774,12 @@ cap_low = 0x%x, cap_high = 0x%x\n", DEBUG( 4,("call_trans2setfsinfo: request transport encrption.\n")); - status = srv_request_encryption_setup((unsigned char **)ppdata, &data_len); + status = srv_request_encryption_setup(conn, + (unsigned char **)ppdata, + &data_len, + (unsigned char **)pparams, + ¶m_len + ); if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { error_packet_set(outbuf, 0, 0, status, __LINE__,__FILE__); @@ -2781,11 +2787,11 @@ cap_low = 0x%x, cap_high = 0x%x\n", return ERROR_NT(status); } - send_trans2_replies( outbuf, bufsize, params, 0, *ppdata, data_len, max_data_bytes); + send_trans2_replies(outbuf, bufsize, *pparams, param_len, *ppdata, data_len, max_data_bytes); if (NT_STATUS_IS_OK(status)) { /* Server-side transport encryption is now *on*. */ - status = srv_encryption_start(); + status = srv_encryption_start(conn); if (!NT_STATUS_IS_OK(status)) { exit_server_cleanly("Failure in setting up encrypted transport"); } |