diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-09-15 03:47:41 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-09-19 09:15:11 +0200 |
| commit | 2dd215919dff3085a532b32d5da45a629a6924c1 (patch) | |
| tree | 3fb936427c667ddd754c69975547a0a90f118b0c | |
| parent | 21eee0ea054d5963c58901ec272b01425f525ba5 (diff) | |
| download | samba-2dd215919dff3085a532b32d5da45a629a6924c1.tar.gz samba-2dd215919dff3085a532b32d5da45a629a6924c1.tar.xz samba-2dd215919dff3085a532b32d5da45a629a6924c1.zip | |
s3:smbd: pass smbd_smb2_request to make_connection_smb2()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/smbd/proto.h | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 3 | ||||
| -rw-r--r-- | source3/smbd/smb2_tcon.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index e85e2f5f71..959ef7a741 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -968,7 +968,7 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir); void load_registry_shares(void); 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); -connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, +connection_struct *make_connection_smb2(struct smbd_smb2_request *req, struct smbXsrv_tcon *tcon, int snum, struct user_struct *vuser, diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 6b9df85457..96b43f5cb6 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -956,13 +956,14 @@ static connection_struct *make_connection_smb1(struct smbd_server_connection *sc 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, int snum, struct user_struct *vuser, const char *pdev, NTSTATUS *pstatus) { + struct smbd_server_connection *sconn = req->sconn; connection_struct *conn = conn_new(sconn); if (!conn) { DEBUG(0,("make_connection_smb2: Couldn't find free connection.\n")); diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index c39ed985d7..278fb6fa3d 100644 --- a/source3/smbd/smb2_tcon.c +++ b/source3/smbd/smb2_tcon.c @@ -266,7 +266,7 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, tcon->global->encryption_required = encryption_required; - compat_conn = make_connection_smb2(req->sconn, + compat_conn = make_connection_smb2(req, tcon, snum, req->session->compat, "???", |