sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-28 03:33:13 +03:00
Code Activity

r26268: Avoid more use of global_loadparm - put lp_ctx in smb_server and wbsrv_connection.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-12-03 21:25:17 +01:00
committed by Stefan Metzmacher
parent fc824a5c45
commit 7c00866423
25 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/smb_server/smb_server.c
View File

@@ -42,7 +42,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
/* see if its a special NBT packet */
if (CVAL(blob.data,0) != 0) {
status = smbsrv_init_smb_connection(smb_conn, global_loadparm);
status = smbsrv_init_smb_connection(smb_conn, smb_conn->lp_ctx);
NT_STATUS_NOT_OK_RETURN(status);
packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request);
return smbsrv_recv_smb_request(smb_conn, blob);
@@ -58,12 +58,12 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
switch (protocol_version) {
case SMB_MAGIC:
status = smbsrv_init_smb_connection(smb_conn, global_loadparm);
status = smbsrv_init_smb_connection(smb_conn, smb_conn->lp_ctx);
NT_STATUS_NOT_OK_RETURN(status);
packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request);
return smbsrv_recv_smb_request(smb_conn, blob);
case SMB2_MAGIC:
if (lp_srv_maxprotocol(global_loadparm) < PROTOCOL_SMB2) break;
if (lp_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2) break;
status = smbsrv_init_smb2_connection(smb_conn);
NT_STATUS_NOT_OK_RETURN(status);
packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request);
@@ -149,6 +149,7 @@ static void smbsrv_accept(struct stream_connection *conn)
packet_set_fde(smb_conn->packet, conn->event.fde);
packet_set_serialise(smb_conn->packet);
smb_conn->lp_ctx = global_loadparm;
smb_conn->connection = conn;
conn->private = smb_conn;