s3: libsmb: Change cli_smb2_qpathinfo2() to return a 32 bit attribute.

Fix all callers. All libsmb SMB2 calls now return 32 bit attributes.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index f42fd2e7c71294c5c99f4965257e9c9c69b10cf8..1aa50c3110725caa5b0e10b0c62c2bbc94d9d828 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -1285,7 +1285,7 @@ static bool windows_parent_dirname(TALLOC_CTX *mem_ctx,
 
 NTSTATUS cli_smb2_list(struct cli_state *cli,
                        const char *pathname,
-                       uint16_t attribute,
+                       uint32_t attribute,
                        NTSTATUS (*fn)(const char *,
                                struct file_info *,
                                const char *,
@@ -1418,8 +1418,7 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
                                goto fail;
                        }
 
-                       if (dir_check_ftype(
-                                   finfo->attr, (uint32_t)attribute)) {
+                       if (dir_check_ftype(finfo->attr, attribute)) {
                                /*
                                 * Only process if attributes match.
                                 * On SMB1 server does this, so on
@@ -2218,13 +2217,12 @@ NTSTATUS cli_smb2_qpathinfo2(struct cli_state *cli,
                        struct timespec *write_time,
                        struct timespec *change_time,
                        off_t *size,
-                       uint16_t *pattr,
+                       uint32_t *pattr,
                        SMB_INO_T *ino)
 {
        NTSTATUS status;
        struct smb2_hnd *ph = NULL;
        uint16_t fnum = 0xffff;
-       uint32_t attr = 0;
        TALLOC_CTX *frame = talloc_stackframe();
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
@@ -2258,7 +2256,7 @@ NTSTATUS cli_smb2_qpathinfo2(struct cli_state *cli,
 
        status = cli_smb2_qfileinfo_basic(cli,
                                        fnum,
-                                       &attr,
+                                       pattr,
                                        size,
                                        create_time,
                                        access_time,
@@ -2268,12 +2266,6 @@ NTSTATUS cli_smb2_qpathinfo2(struct cli_state *cli,
 
   fail:
 
-       if (NT_STATUS_IS_OK(status)) {
-               if (pattr != NULL) {
-                       *pattr = attr;
-               }
-       }
-
        if (fnum != 0xffff) {
                cli_smb2_close_fnum(cli, fnum);
        }

diff --git a/source3/libsmb/cli_smb2_fnum.h b/source3/libsmb/cli_smb2_fnum.h
index 171e7729d3c1ee76095e71d3cb753b49e961f578..7a983f5266c26108366459ded8ae4997088c868c 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.h
+++ b/source3/libsmb/cli_smb2_fnum.h
@@ -95,7 +95,7 @@ struct tevent_req *cli_smb2_unlink_send(
 NTSTATUS cli_smb2_unlink_recv(struct tevent_req *req);
 NTSTATUS cli_smb2_list(struct cli_state *cli,
                        const char *pathname,
-                       uint16_t attribute,
+                       uint32_t attribute,
                        NTSTATUS (*fn)(const char *,
                                struct file_info *,
                                const char *,
@@ -183,7 +183,7 @@ NTSTATUS cli_smb2_qpathinfo2(struct cli_state *cli,
                        struct timespec *write_time,
                        struct timespec *change_time,
                        off_t *size,
-                       uint16_t *pattr,
+                       uint32_t *pattr,
                        SMB_INO_T *ino);
 NTSTATUS cli_smb2_qpathinfo_streams(struct cli_state *cli,
                        const char *name,

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 7ba0c90e418c91116a03b1465a3f5e3cce4bbad0..06954b0e69e95d666f3f16b8b25b43d7a6478090 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -1015,15 +1015,23 @@ NTSTATUS cli_qpathinfo2(struct cli_state *cli, const char *fname,
        NTSTATUS status = NT_STATUS_NO_MEMORY;
 
        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
-               return cli_smb2_qpathinfo2(cli,
+               uint32_t attr = 0;
+               status = cli_smb2_qpathinfo2(cli,
                                        fname,
                                        create_time,
                                        access_time,
                                        write_time,
                                        change_time,
                                        size,
-                                       pattr,
+                                       &attr,
                                        ino);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
+               if (pattr != NULL) {
+                       *pattr = attr;
+               }
+               return status;
        }
 
        frame = talloc_stackframe();