diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-11 13:36:34 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:13 +0200 |
| commit | 51590389052bb46a8f4dd015ba5ab7fdfcb0cd09 (patch) | |
| tree | 49f229f75dbb07d15b29c9b0c36b25e84ffd4f2c | |
| parent | 6e514e695a69fff10942893d2e85b7601ec2c9b0 (diff) | |
| download | samba-51590389052bb46a8f4dd015ba5ab7fdfcb0cd09.tar.gz samba-51590389052bb46a8f4dd015ba5ab7fdfcb0cd09.tar.xz samba-51590389052bb46a8f4dd015ba5ab7fdfcb0cd09.zip | |
s3:smbd: pass smbXsrv_connection to smbd_do_qfsinfo()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/smbd/globals.h | 3 | ||||
| -rw-r--r-- | source3/smbd/smb2_getinfo.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 3542951fbc..8a9af6c531 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -153,7 +153,8 @@ NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn, char **ppdata, int total_data, int *ret_data_size); -NTSTATUS smbd_do_qfsinfo(connection_struct *conn, +NTSTATUS smbd_do_qfsinfo(struct smbXsrv_connection *xconn, + connection_struct *conn, TALLOC_CTX *mem_ctx, uint16_t info_level, uint16_t flags2, diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 64669b8567..3139a32a8a 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -427,7 +427,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx, /* the levels directly map to the passthru levels */ file_info_level = in_file_info_class + 1000; - status = smbd_do_qfsinfo(conn, state, + status = smbd_do_qfsinfo(smb2req->xconn, conn, state, file_info_level, STR_UNICODE, in_output_buffer_length, diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index e6cb64f2a1..a1837944c5 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3064,7 +3064,8 @@ static void samba_extended_info_version(struct smb_extended_info *extended_info) "%s", samba_version_string()); } -NTSTATUS smbd_do_qfsinfo(connection_struct *conn, +NTSTATUS smbd_do_qfsinfo(struct smbXsrv_connection *xconn, + connection_struct *conn, TALLOC_CTX *mem_ctx, uint16_t info_level, uint16_t flags2, @@ -3074,7 +3075,6 @@ NTSTATUS smbd_do_qfsinfo(connection_struct *conn, char **ppdata, int *ret_data_len) { - struct smbXsrv_connection *xconn = conn->sconn->conn; char *pdata, *end_data; int data_len = 0, len; const char *vname = volume_label(talloc_tos(), SNUM(conn)); @@ -3677,7 +3677,7 @@ static void call_trans2qfsinfo(connection_struct *conn, DEBUG(3,("call_trans2qfsinfo: level = %d\n", info_level)); - status = smbd_do_qfsinfo(conn, req, + status = smbd_do_qfsinfo(req->xconn, conn, req, info_level, req->flags2, max_data_bytes, |