Changeset 988 for vendor/current/source3/libsmb/clirap.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/clirap.c (modified) (43 diffs)

vendor/current/source3/libsmb/clirap.c

@@ -29 +29 @@
 #include "libsmb/clirap.h"
 #include "trans2.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 #define PIPE_LANMAN   "\\PIPE\\LANMAN"
@@ -67 +68 @@
          */
 
-        *rparam = (char *)memdup(my_rparam, num_my_rparam);
+        *rparam = (char *)smb_memdup(my_rparam, num_my_rparam);
         if (*rparam == NULL) {
                 goto fail;
@@ -74 +75 @@
         TALLOC_FREE(my_rparam);
 
-        *rdata = (char *)memdup(my_rdata, num_my_rdata);
+        *rdata = (char *)smb_memdup(my_rdata, num_my_rdata);
         if (*rdata == NULL) {
                 goto fail;
@@ -117 +118 @@
         p += 2;
         strlcpy(p,user,sizeof(param)-PTR_DIFF(p,param));
-        strupper_m(p);
+        if (!strupper_m(p)) {
+                return false;
+        }
         p += 21;
         p++;
@@ -123 +126 @@
         p++;
         strlcpy(p, workstation,sizeof(param)-PTR_DIFF(p,param));
-        strupper_m(p);
+        if (!strupper_m(p)) {
+                return false;
+        }
         p += 16;
         SSVAL(p, 0, CLI_BUFFER_SIZE);
@@ -141 +146 @@
                 if (cli->rap_error == 0) {
                         DEBUG(4,("NetWkstaUserLogon success\n"));
-                        cli->privileges = SVAL(p, 24);
+                        /*
+                         * The cli->privileges = SVAL(p, 24); field was set here
+                         * but it was not use anywhere else.
+                         */
                         /* The cli->eff_name field used to be set here
                            but it wasn't used anywhere else. */
@@ -158 +166 @@
 ****************************************************************************/
 
-int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *, void *), void *state)
+int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32_t, const char *, void *), void *state)
 {
         char *rparam = NULL;
@@ -265 +273 @@
 ****************************************************************************/
 
-bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
-                       void (*fn)(const char *, uint32, const char *, void *),
+bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32_t stype,
+                       void (*fn)(const char *, uint32_t, const char *, void *),
                        void *state)
 {
@@ -277 +285 @@
         int uLevel = 1;
         size_t len;
-        uint32 func = RAP_NetServerEnum2;
+        uint32_t func = RAP_NetServerEnum2;
         char *last_entry = NULL;
         int total_cnt = 0;
@@ -575 +583 @@
 
 struct tevent_req *cli_qpathinfo1_send(TALLOC_CTX *mem_ctx,
-                                       struct event_context *ev,
+                                       struct tevent_context *ev,
                                        struct cli_state *cli,
                                        const char *fname)
@@ -588 +596 @@
         state->cli = cli;
         subreq = cli_qpathinfo_send(state, ev, cli, fname, SMB_INFO_STANDARD,
-                                    22, cli->max_xmit);
+                                    22, CLI_BUFFER_SIZE);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);
@@ -618 +626 @@
                              time_t *access_time,
                              time_t *write_time,
-                             SMB_OFF_T *size,
-                             uint16 *mode)
+                             off_t *size,
+                             uint16_t *mode)
 {
         struct cli_qpathinfo1_state *state = tevent_req_data(
@@ -638 +646 @@
 
         if (change_time) {
-                *change_time = date_fn(state->data+0, state->cli->serverzone);
+                *change_time = date_fn(state->data+0, smb1cli_conn_server_time_zone(state->cli->conn));
         }
         if (access_time) {
-                *access_time = date_fn(state->data+4, state->cli->serverzone);
+                *access_time = date_fn(state->data+4, smb1cli_conn_server_time_zone(state->cli->conn));
         }
         if (write_time) {
-                *write_time = date_fn(state->data+8, state->cli->serverzone);
+                *write_time = date_fn(state->data+8, smb1cli_conn_server_time_zone(state->cli->conn));
         }
         if (size) {
@@ -660 +668 @@
                         time_t *access_time,
                         time_t *write_time,
-                        SMB_OFF_T *size,
-                        uint16 *mode)
+                        off_t *size,
+                        uint16_t *mode)
 {
         TALLOC_CTX *frame = talloc_stackframe();
-        struct event_context *ev;
+        struct tevent_context *ev;
         struct tevent_req *req;
         NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-        if (cli_has_async_calls(cli)) {
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
                  * Can't use sync call while an async call is in flight
@@ -675 +683 @@
                 goto fail;
         }
-        ev = event_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 goto fail;
@@ -702 +710 @@
                                time_t write_time,
                                time_t change_time,
-                               uint16 mode)
+                               uint16_t mode)
 {
         unsigned int data_len = 0;
@@ -751 +759 @@
 
 struct tevent_req *cli_qpathinfo2_send(TALLOC_CTX *mem_ctx,
-                                       struct event_context *ev,
+                                       struct tevent_context *ev,
                                        struct cli_state *cli,
                                        const char *fname)
@@ -764 +772 @@
         subreq = cli_qpathinfo_send(state, ev, cli, fname,
                                     SMB_QUERY_FILE_ALL_INFO,
-                                    68, cli->max_xmit);
+                                    68, CLI_BUFFER_SIZE);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);
@@ -795 +803 @@
                              struct timespec *write_time,
                              struct timespec *change_time,
-                             SMB_OFF_T *size, uint16 *mode,
+                             off_t *size, uint16_t *mode,
                              SMB_INO_T *ino)
 {
@@ -835 +843 @@
                         struct timespec *write_time,
                         struct timespec *change_time,
-                        SMB_OFF_T *size, uint16 *mode,
+                        off_t *size, uint16_t *mode,
                         SMB_INO_T *ino)
 {
-        TALLOC_CTX *frame = talloc_stackframe();
-        struct event_context *ev;
+        TALLOC_CTX *frame = NULL;
+        struct tevent_context *ev;
         struct tevent_req *req;
         NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-        if (cli_has_async_calls(cli)) {
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return cli_smb2_qpathinfo2(cli,
+                                        fname,
+                                        create_time,
+                                        access_time,
+                                        write_time,
+                                        change_time,
+                                        size,
+                                        mode,
+                                        ino);
+        }
+
+        frame = talloc_stackframe();
+
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
                  * Can't use sync call while an async call is in flight
@@ -850 +872 @@
                 goto fail;
         }
-        ev = event_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 goto fail;
@@ -872 +894 @@
 ****************************************************************************/
 
-static bool parse_streams_blob(TALLOC_CTX *mem_ctx, const uint8_t *data,
-                               size_t data_len,
-                               unsigned int *pnum_streams,
-                               struct stream_struct **pstreams);
-
 struct cli_qpathinfo_streams_state {
         uint32_t num_data;
@@ -899 +916 @@
         subreq = cli_qpathinfo_send(state, ev, cli, fname,
                                     SMB_FILE_STREAM_INFORMATION,
-                                    0, cli->max_xmit);
+                                    0, CLI_BUFFER_SIZE);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);
@@ -949 +966 @@
                                struct stream_struct **pstreams)
 {
-        TALLOC_CTX *frame = talloc_stackframe();
-        struct event_context *ev;
+        TALLOC_CTX *frame = NULL;
+        struct tevent_context *ev;
         struct tevent_req *req;
         NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-        if (cli_has_async_calls(cli)) {
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return cli_smb2_qpathinfo_streams(cli,
+                                        fname,
+                                        mem_ctx,
+                                        pnum_streams,
+                                        pstreams);
+        }
+
+        frame = talloc_stackframe();
+
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
                  * Can't use sync call while an async call is in flight
@@ -961 +988 @@
                 goto fail;
         }
-        ev = event_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 goto fail;
@@ -979 +1006 @@
 }
 
-static bool parse_streams_blob(TALLOC_CTX *mem_ctx, const uint8_t *rdata,
+bool parse_streams_blob(TALLOC_CTX *mem_ctx, const uint8_t *rdata,
                                size_t data_len,
                                unsigned int *pnum_streams,
@@ -999 +1026 @@
                 uint8_t *tmp_buf;
 
-                tmp = TALLOC_REALLOC_ARRAY(mem_ctx, streams,
+                tmp = talloc_realloc(mem_ctx, streams,
                                            struct stream_struct,
                                            num_streams+1);
@@ -1024 +1051 @@
                  */
 
-                tmp_buf = TALLOC_ARRAY(streams, uint8_t, nlen+2);
+                tmp_buf = talloc_array(streams, uint8_t, nlen+2);
                 if (tmp_buf == NULL) {
                         goto fail;
@@ -1034 +1061 @@
 
                 if (!convert_string_talloc(streams, CH_UTF16, CH_UNIX, tmp_buf,
-                                           nlen+2, &vstr, &size, false))
+                                           nlen+2, &vstr, &size))
                 {
                         TALLOC_FREE(tmp_buf);
@@ -1065 +1092 @@
 ****************************************************************************/
 
-NTSTATUS cli_qfilename(struct cli_state *cli, uint16_t fnum, char *name,
-                       size_t namelen)
-{
+NTSTATUS cli_qfilename(struct cli_state *cli, uint16_t fnum,
+                       TALLOC_CTX *mem_ctx, char **_name)
+{
+        uint16_t recv_flags2;
         uint8_t *rdata;
         uint32_t num_rdata;
         NTSTATUS status;
+        char *name = NULL;
+        uint32_t namelen;
 
         status = cli_qfileinfo(talloc_tos(), cli, fnum,
                                SMB_QUERY_FILE_NAME_INFO,
-                               4, cli->max_xmit,
+                               4, CLI_BUFFER_SIZE, &recv_flags2,
                                &rdata, &num_rdata);
         if (!NT_STATUS_IS_OK(status)) {
@@ -1080 +1110 @@
         }
 
-        clistr_pull(cli->inbuf, name, rdata+4, namelen, IVAL(rdata, 0),
-                    STR_UNICODE);
+        namelen = IVAL(rdata, 0);
+        if (namelen > (num_rdata - 4)) {
+                TALLOC_FREE(rdata);
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
+        clistr_pull_talloc(mem_ctx,
+                           (const char *)rdata,
+                           recv_flags2,
+                           &name,
+                           rdata + 4,
+                           namelen,
+                           STR_UNICODE);
+        if (name == NULL) {
+                status = map_nt_error_from_unix(errno);
+                TALLOC_FREE(rdata);
+                return status;
+        }
+
+        *_name = name;
         TALLOC_FREE(rdata);
         return NT_STATUS_OK;
@@ -1091 +1139 @@
 
 NTSTATUS cli_qfileinfo_basic(struct cli_state *cli, uint16_t fnum,
-                             uint16 *mode, SMB_OFF_T *size,
+                             uint16_t *mode, off_t *size,
                              struct timespec *create_time,
                              struct timespec *access_time,
@@ -1102 +1150 @@
         NTSTATUS status;
 
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return cli_smb2_qfileinfo_basic(cli,
+                                                fnum,
+                                                mode,
+                                                size,
+                                                create_time,
+                                                access_time,
+                                                write_time,
+                                                change_time,
+                                                ino);
+        }
+
         /* if its a win95 server then fail this - win95 totally screws it
            up */
@@ -1110 +1170 @@
         status = cli_qfileinfo(talloc_tos(), cli, fnum,
                                SMB_QUERY_FILE_ALL_INFO,
-                               68, MIN(cli->max_xmit, 0xffff),
+                               68, CLI_BUFFER_SIZE,
+                               NULL,
                                &rdata, &num_rdata);
         if (!NT_STATUS_IS_OK(status)) {
@@ -1154 +1215 @@
 
 struct tevent_req *cli_qpathinfo_basic_send(TALLOC_CTX *mem_ctx,
-                                            struct event_context *ev,
+                                            struct tevent_context *ev,
                                             struct cli_state *cli,
                                             const char *fname)
@@ -1168 +1229 @@
         subreq = cli_qpathinfo_send(state, ev, cli, fname,
                                     SMB_QUERY_FILE_BASIC_INFO,
-                                    36, cli->max_xmit);
+                                    36, CLI_BUFFER_SIZE);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, ev);
@@ -1195 +1256 @@
 
 NTSTATUS cli_qpathinfo_basic_recv(struct tevent_req *req,
-                                  SMB_STRUCT_STAT *sbuf, uint32 *attributes)
+                                  SMB_STRUCT_STAT *sbuf, uint32_t *attributes)
 {
         struct cli_qpathinfo_basic_state *state = tevent_req_data(
@@ -1205 +1266 @@
         }
 
+        sbuf->st_ex_btime = interpret_long_date((char *)state->data);
         sbuf->st_ex_atime = interpret_long_date((char *)state->data+8);
         sbuf->st_ex_mtime = interpret_long_date((char *)state->data+16);
@@ -1213 +1275 @@
 
 NTSTATUS cli_qpathinfo_basic(struct cli_state *cli, const char *name,
-                             SMB_STRUCT_STAT *sbuf, uint32 *attributes)
-{
-        TALLOC_CTX *frame = talloc_stackframe();
-        struct event_context *ev;
+                             SMB_STRUCT_STAT *sbuf, uint32_t *attributes)
+{
+        TALLOC_CTX *frame = NULL;
+        struct tevent_context *ev;
         struct tevent_req *req;
         NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-        if (cli_has_async_calls(cli)) {
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return cli_smb2_qpathinfo_basic(cli,
+                                                name,
+                                                sbuf,
+                                                attributes);
+        }
+
+        frame = talloc_stackframe();
+
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
                  * Can't use sync call while an async call is in flight
@@ -1227 +1298 @@
                 goto fail;
         }
-        ev = event_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 goto fail;
@@ -1257 +1328 @@
         NTSTATUS status;
 
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return cli_smb2_qpathinfo_alt_name(cli,
+                                                fname,
+                                                alt_name);
+        }
+
         status = cli_qpathinfo(talloc_tos(), cli, fname,
                                SMB_QUERY_FILE_ALT_NAME_INFO,
-                               4, cli->max_xmit, &rdata, &num_rdata);
+                               4, CLI_BUFFER_SIZE, &rdata, &num_rdata);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -1272 +1349 @@
         /* The returned data is a pushed string, not raw data. */
         if (!convert_string_talloc(talloc_tos(),
-                                   cli_ucs2(cli) ? CH_UTF16LE : CH_DOS,
+                                   smbXcli_conn_use_unicode(cli->conn) ? CH_UTF16LE : CH_DOS,
                                    CH_UNIX,
                                    rdata + 4,
                                    len,
                                    &converted,
-                                   &converted_size,
-                                   true)) {
+                                   &converted_size)) {
                 return NT_STATUS_NO_MEMORY;
         }
@@ -1288 +1364 @@
         return NT_STATUS_OK;
 }
+
+/****************************************************************************
+ Send a qpathinfo SMB_QUERY_FILE_STADNDARD_INFO call.
+****************************************************************************/
+
+NTSTATUS cli_qpathinfo_standard(struct cli_state *cli, const char *fname,
+                                uint64_t *allocated, uint64_t *size,
+                                uint32_t *nlinks,
+                                bool *is_del_pending, bool *is_dir)
+{
+        uint8_t *rdata;
+        uint32_t num_rdata;
+        NTSTATUS status;
+
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return NT_STATUS_NOT_IMPLEMENTED;
+        }
+
+        status = cli_qpathinfo(talloc_tos(), cli, fname,
+                               SMB_QUERY_FILE_STANDARD_INFO,
+                               24, CLI_BUFFER_SIZE, &rdata, &num_rdata);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        if (allocated) {
+                *allocated = BVAL(rdata, 0);
+        }
+
+        if (size) {
+                *size = BVAL(rdata, 8);
+        }
+
+        if (nlinks) {
+                *nlinks = IVAL(rdata, 16);
+        }
+
+        if (is_del_pending) {
+                *is_del_pending = CVAL(rdata, 20);
+        }
+
+        if (is_dir) {
+                *is_dir = CVAL(rdata, 20);
+        }
+
+        TALLOC_FREE(rdata);
+
+        return NT_STATUS_OK;
+}
+
+
+/* like cli_qpathinfo2 but do not use SMB_QUERY_FILE_ALL_INFO with smb1 */
+NTSTATUS cli_qpathinfo3(struct cli_state *cli, const char *fname,
+                        struct timespec *create_time,
+                        struct timespec *access_time,
+                        struct timespec *write_time,
+                        struct timespec *change_time,
+                        off_t *size, uint16_t *mode,
+                        SMB_INO_T *ino)
+{
+        NTSTATUS status = NT_STATUS_OK;
+        SMB_STRUCT_STAT st = { 0 };
+        uint32_t attr;
+        uint64_t pos;
+
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+                return cli_qpathinfo2(cli, fname,
+                                      create_time, access_time, write_time, change_time,
+                                      size, mode, ino);
+        }
+
+        if (create_time || access_time || write_time || change_time || mode) {
+                status = cli_qpathinfo_basic(cli, fname, &st, &attr);
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
+                }
+        }
+
+        if (size) {
+                status = cli_qpathinfo_standard(cli, fname,
+                                                NULL, &pos, NULL, NULL, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
+                }
+
+                *size = pos;
+        }
+
+        if (create_time) {
+                *create_time = st.st_ex_btime;
+        }
+        if (access_time) {
+                *access_time = st.st_ex_atime;
+        }
+        if (write_time) {
+                *write_time = st.st_ex_mtime;
+        }
+        if (change_time) {
+                *change_time = st.st_ex_ctime;
+        }
+        if (mode) {
+                *mode = attr;
+        }
+        if (ino) {
+                *ino = 0;
+        }
+
+        return NT_STATUS_OK;
+}