sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3:smbd: pass smbd_smb2_request to make_connection_smb2()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-09-15 03:47:41 +02:00 committed by Michael Adam
parent 21eee0ea05
commit 2dd215919d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/proto.h
View File

@ -968,7 +968,7 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir);
void load_registry_shares(void); void load_registry_shares(void);
int add_home_service(const char *service, const char *username, const char *homedir); int add_home_service(const char *service, const char *username, const char *homedir);
int find_service(TALLOC_CTX *ctx, const char *service, char **p_service_out); int find_service(TALLOC_CTX *ctx, const char *service, char **p_service_out);
connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, connection_struct *make_connection_smb2(struct smbd_smb2_request *req,
struct smbXsrv_tcon *tcon, struct smbXsrv_tcon *tcon,
int snum, int snum,
struct user_struct *vuser, struct user_struct *vuser,

3
source3/smbd/service.c
View File

@ -956,13 +956,14 @@ static connection_struct *make_connection_smb1(struct smbd_server_connection *sc
We must set cnum before claiming connection. We must set cnum before claiming connection.
****************************************************************************/ ****************************************************************************/
connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, connection_struct *make_connection_smb2(struct smbd_smb2_request *req,
struct smbXsrv_tcon *tcon, struct smbXsrv_tcon *tcon,
int snum, int snum,
struct user_struct *vuser, struct user_struct *vuser,
const char *pdev, const char *pdev,
NTSTATUS *pstatus) NTSTATUS *pstatus)
{ {
struct smbd_server_connection *sconn = req->sconn;
connection_struct *conn = conn_new(sconn); connection_struct *conn = conn_new(sconn);
if (!conn) { if (!conn) {
DEBUG(0,("make_connection_smb2: Couldn't find free connection.\n")); DEBUG(0,("make_connection_smb2: Couldn't find free connection.\n"));

2
source3/smbd/smb2_tcon.c
View File

@ -266,7 +266,7 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
tcon->global->encryption_required = encryption_required; tcon->global->encryption_required = encryption_required;
compat_conn = make_connection_smb2(req->sconn, compat_conn = make_connection_smb2(req,
tcon, snum, tcon, snum,
req->session->compat, req->session->compat,
"???", "???",