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>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index e85e2f5f71ce43a2f3c27386b17f6731d7b116c2..959ef7a74105bef5c7e0d645bc6812a034250152 100644 (file)
--- 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 6b9df854572dcdc7bafa293190e7df72d6347773..96b43f5cb6ed878dbb3861c1ffec22b3b26b8438 100644 (file)
--- 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 c39ed985d7f9106db278cd91d0358f15051124fe..278fb6fa3d1c5e119a3833029d7aab2822e45813 100644 (file)
--- 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,
                                        "???",