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 | 21eee0ea054d5963c58901ec272b01425f525ba5 (patch) | |
| tree | a4d5e33fd8ba51bc3e7d8afc9088fe2c2c08109a | |
| parent | 7408736d9d59be990f771239f3d57b45d49798ec (diff) | |
| download | samba-21eee0ea054d5963c58901ec272b01425f525ba5.tar.gz samba-21eee0ea054d5963c58901ec272b01425f525ba5.tar.xz samba-21eee0ea054d5963c58901ec272b01425f525ba5.zip | |
s3:smbd: pass smb_request to make_connection()
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/reply.c | 6 | ||||
| -rw-r--r-- | source3/smbd/service.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index f35bc61a7d..e85e2f5f71 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -974,7 +974,7 @@ connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, struct user_struct *vuser, const char *pdev, NTSTATUS *pstatus); -connection_struct *make_connection(struct smbd_server_connection *sconn, +connection_struct *make_connection(struct smb_request *req, NTTIME now, const char *service_in, const char *pdev, uint64_t vuid, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 2f22a2fa2d..e90f9dcf6f 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -693,7 +693,6 @@ void reply_tcon(struct smb_request *req) const char *p2; TALLOC_CTX *ctx = talloc_tos(); struct smbXsrv_connection *xconn = req->xconn; - struct smbd_server_connection *sconn = req->sconn; NTTIME now = timeval_to_nttime(&req->request_time); START_PROFILE(SMBtcon); @@ -724,7 +723,7 @@ void reply_tcon(struct smb_request *req) service = service_buf; } - conn = make_connection(sconn, now, service, dev, + conn = make_connection(req, now, service, dev, req->vuid,&nt_status); req->conn = conn; @@ -771,7 +770,6 @@ void reply_tcon_and_X(struct smb_request *req) bool session_key_updated = false; uint16_t optional_support = 0; struct smbXsrv_connection *xconn = req->xconn; - struct smbd_server_connection *sconn = req->sconn; START_PROFILE(SMBtconX); @@ -942,7 +940,7 @@ void reply_tcon_and_X(struct smb_request *req) session_key_updated = true; } - conn = make_connection(sconn, now, service, client_devicetype, + conn = make_connection(req, now, service, client_devicetype, req->vuid, &nt_status); req->conn =conn; diff --git a/source3/smbd/service.c b/source3/smbd/service.c index e7a55a483f..6b9df85457 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -991,12 +991,13 @@ connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, * @param service ****************************************************************************/ -connection_struct *make_connection(struct smbd_server_connection *sconn, +connection_struct *make_connection(struct smb_request *req, NTTIME now, const char *service_in, const char *pdev, uint64_t vuid, NTSTATUS *status) { + struct smbd_server_connection *sconn = req->sconn; uid_t euid; struct user_struct *vuser = NULL; char *service = NULL; |