s3:smbd: pass smbXsrv_connection to make_connection_snum()
authorStefan Metzmacher <metze@samba.org>
Mon, 15 Sep 2014 01:47:41 +0000 (03:47 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 19 Sep 2014 07:15:11 +0000 (09:15 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source3/smbd/service.c

index 5f7c7d056241d269bc4c0cf6cec596822c2c2ace..bb20e94b6dbc1de28c18c6cf0ff384c04a2b6b77 100644 (file)
@@ -517,12 +517,12 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum)
   connecting user if appropriate.
 ****************************************************************************/
 
-static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
+static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
                                        connection_struct *conn,
                                        int snum, struct user_struct *vuser,
                                        const char *pdev)
 {
-       struct smbXsrv_connection *xconn = sconn->conn;
+       struct smbd_server_connection *sconn = xconn->sconn;
        struct smb_filename *smb_fname_cpath = NULL;
        fstring dev;
        int ret;
@@ -918,7 +918,7 @@ static connection_struct *make_connection_smb1(struct smb_request *req,
        conn->cnum = tcon->global->tcon_wire_id;
        conn->tcon = tcon;
 
-       *pstatus = make_connection_snum(req->sconn,
+       *pstatus = make_connection_snum(req->xconn,
                                        conn,
                                        snum,
                                        vuser,
@@ -974,7 +974,7 @@ connection_struct *make_connection_smb2(struct smbd_smb2_request *req,
        conn->cnum = tcon->global->tcon_wire_id;
        conn->tcon = tcon;
 
-       *pstatus = make_connection_snum(sconn,
+       *pstatus = make_connection_snum(req->xconn,
                                        conn,
                                        snum,
                                        vuser,