Changeset 594 for vendor/current/source3/libsmb

Timestamp:

Jul 1, 2011, 4:02:23 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.8

Location:

vendor/current/source3/libsmb

Files:

• async_smb.c (modified) (2 diffs)
• clidgram.c (modified) (9 diffs)
• clikrb5.c (modified) (4 diffs)
• clireadwrite.c (modified) (3 diffs)
• nmblib.c (modified) (1 diff)

vendor/current/source3/libsmb/async_smb.c

@@ -706 +706 @@
                 TALLOC_FREE(inbuf);
                 status = NT_STATUS_ACCESS_DENIED;
+                close(cli->fd);
+                cli->fd = -1;
                 goto fail;
         }
@@ -1070 +1072 @@
         return NT_STATUS_OK;
 }
+
+
+struct cli_session_request_state {
+        struct tevent_context *ev;
+        int sock;
+        uint32 len_hdr;
+        struct iovec iov[3];
+        uint8_t nb_session_response;
+};
+
+static void cli_session_request_sent(struct tevent_req *subreq);
+static void cli_session_request_recvd(struct tevent_req *subreq);
+
+struct tevent_req *cli_session_request_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            int sock,
+                                            const struct nmb_name *called,
+                                            const struct nmb_name *calling)
+{
+        struct tevent_req *req, *subreq;
+        struct cli_session_request_state *state;
+
+        req = tevent_req_create(mem_ctx, &state,
+                                struct cli_session_request_state);
+        if (req == NULL) {
+                return NULL;
+        }
+        state->ev = ev;
+        state->sock = sock;
+
+        state->iov[1].iov_base = name_mangle(
+                state, called->name, called->name_type);
+        if (tevent_req_nomem(state->iov[1].iov_base, req)) {
+                return tevent_req_post(req, ev);
+        }
+        state->iov[1].iov_len = name_len(
+                (unsigned char *)state->iov[1].iov_base,
+                talloc_get_size(state->iov[1].iov_base));
+
+        state->iov[2].iov_base = name_mangle(
+                state, calling->name, calling->name_type);
+        if (tevent_req_nomem(state->iov[2].iov_base, req)) {
+                return tevent_req_post(req, ev);
+        }
+        state->iov[2].iov_len = name_len(
+                (unsigned char *)state->iov[2].iov_base,
+                talloc_get_size(state->iov[2].iov_base));
+
+        _smb_setlen(((char *)&state->len_hdr),
+                    state->iov[1].iov_len + state->iov[2].iov_len);
+        SCVAL((char *)&state->len_hdr, 0, 0x81);
+
+        state->iov[0].iov_base = &state->len_hdr;
+        state->iov[0].iov_len = sizeof(state->len_hdr);
+
+        subreq = writev_send(state, ev, NULL, sock, true, state->iov, 3);
+        if (tevent_req_nomem(subreq, req)) {
+                return tevent_req_post(req, ev);
+        }
+        tevent_req_set_callback(subreq, cli_session_request_sent, req);
+        return req;
+}
+
+static void cli_session_request_sent(struct tevent_req *subreq)
+{
+        struct tevent_req *req = tevent_req_callback_data(
+                subreq, struct tevent_req);
+        struct cli_session_request_state *state = tevent_req_data(
+                req, struct cli_session_request_state);
+        ssize_t ret;
+        int err;
+
+        ret = writev_recv(subreq, &err);
+        TALLOC_FREE(subreq);
+        if (ret == -1) {
+                tevent_req_error(req, err);
+                return;
+        }
+        subreq = read_smb_send(state, state->ev, state->sock);
+        if (tevent_req_nomem(subreq, req)) {
+                return;
+        }
+        tevent_req_set_callback(subreq, cli_session_request_recvd, req);
+}
+
+static void cli_session_request_recvd(struct tevent_req *subreq)
+{
+        struct tevent_req *req = tevent_req_callback_data(
+                subreq, struct tevent_req);
+        struct cli_session_request_state *state = tevent_req_data(
+                req, struct cli_session_request_state);
+        uint8_t *buf;
+        ssize_t ret;
+        int err;
+
+        ret = read_smb_recv(subreq, talloc_tos(), &buf, &err);
+        TALLOC_FREE(subreq);
+
+        if (ret < 4) {
+                ret = -1;
+                err = EIO;
+        }
+        if (ret == -1) {
+                tevent_req_error(req, err);
+                return;
+        }
+        /*
+         * In case of an error there is more information in the data
+         * portion according to RFC1002. We're not subtle enough to
+         * respond to the different error conditions, so drop the
+         * error info here.
+         */
+        state->nb_session_response = CVAL(buf, 0);
+        tevent_req_done(req);
+}
+
+bool cli_session_request_recv(struct tevent_req *req, int *err, uint8_t *resp)
+{
+        struct cli_session_request_state *state = tevent_req_data(
+                req, struct cli_session_request_state);
+
+        if (tevent_req_is_unix_error(req, err)) {
+                return false;
+        }
+        *resp = state->nb_session_response;
+        return true;
+}

vendor/current/source3/libsmb/clidgram.c

@@ -239 +239 @@
         if (blob.length < 4) {
                 DEBUG(0,("invalid length: %d\n", (int)blob.length));
+                free_packet(packet);
                 return false;
         }
@@ -244 +245 @@
         if (RIVAL(blob.data,0) != DGRAM_SMB) {
                 DEBUG(0,("invalid packet\n"));
+                free_packet(packet);
                 return false;
         }
@@ -254 +256 @@
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 DEBUG(0,("failed to parse packet\n"));
+                free_packet(packet);
                 return false;
         }
@@ -259 +262 @@
         if (p.smb.smb_command != SMB_TRANSACTION) {
                 DEBUG(0,("invalid smb_command: %d\n", p.smb.smb_command));
+                free_packet(packet);
                 return false;
         }
@@ -272 +276 @@
         status = pull_netlogon_samlogon_response(&blob, mem_ctx, NULL, &r);
         if (!NT_STATUS_IS_OK(status)) {
+                free_packet(packet);
                 return false;
         }
@@ -286 +291 @@
                 DEBUG(3, ("GetDC: Expected domain %s, got %s\n",
                           domain_name, returned_domain));
+                free_packet(packet);
                 return false;
         }
@@ -291 +297 @@
         *dc_name = talloc_strdup(mem_ctx, returned_dc);
         if (!*dc_name) {
+                free_packet(packet);
                 return false;
         }
@@ -301 +308 @@
                         mem_ctx, &r, sizeof(struct netlogon_samlogon_response));
                 if (!*_r) {
+                free_packet(packet);
                         return false;
                 }
@@ -308 +316 @@
                    *dc_name, returned_domain));
 
+        free_packet(packet);
         return True;
 }

vendor/current/source3/libsmb/clikrb5.c

@@ -697 +697 @@
         SIVAL(gss_cksum, 0, GSSAPI_BNDLENGTH);
 
-        /* Precalculated MD5sum of NULL channel bindings (20 bytes) */
-        /* Channel bindings are: (all ints encoded as little endian)
-
-                [4 bytes] initiator_addrtype (255 for null bindings)
-                [4 bytes] initiator_address length
-                        [n bytes] .. initiator_address data - not present
-                                     in null bindings.
-                [4 bytes] acceptor_addrtype (255 for null bindings)
-                [4 bytes] acceptor_address length
-                        [n bytes] .. acceptor_address data - not present
-                                     in null bindings.
-                [4 bytes] application_data length
-                        [n bytes] .. application_ data - not present
-                                     in null bindings.
-                MD5 of this is ""\x14\x8f\x0c\xf7\xb1u\xdey*J\x9a%\xdfV\xc5\x18"
-        */
-
-        memcpy(&gss_cksum[4],
-                "\x14\x8f\x0c\xf7\xb1u\xdey*J\x9a%\xdfV\xc5\x18",
-                GSSAPI_BNDLENGTH);
+        /*
+         * GSS_C_NO_CHANNEL_BINDINGS means 16 zero bytes.
+         * This matches the behavior of heimdal and mit.
+         *
+         * And it is needed to work against some closed source
+         * SMB servers.
+         *
+         * See bug #7883
+         */
+        memset(&gss_cksum[4], 0x00, GSSAPI_BNDLENGTH);
 
         SIVAL(gss_cksum, 20, gss_flags);
@@ -833 +823 @@
         }
 
-#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY)
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
         if( credsp->ticket_flags & TKT_FLG_OK_AS_DELEGATE ) {
                 /* Fetch a forwarded TGT from the KDC so that we can hand off a 2nd ticket
@@ -895 +885 @@
                 }
         }
-#endif
 
         /* Frees and reallocates in_data into a GSS checksum blob. */
@@ -903 +892 @@
         }
 
-#if defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
         /* We always want GSS-checksum types. */
         retval = krb5_auth_con_set_req_cksumtype(context, *auth_context, GSSAPI_CHECKSUM );

vendor/current/source3/libsmb/clireadwrite.c

@@ -705 +705 @@
                                 uint16 mode,
                                 const char *buf,
-                                size_t size,
-                                int i)
+                                size_t size)
 {
         char *p;
@@ -780 +779 @@
         }
 
-        SSVAL(cli->outbuf,smb_mid,cli->mid + i);
-
         show_msg(cli->outbuf);
         if (direct_writes) {
@@ -830 +827 @@
                                         write_mode,
                                         buf + bsent,
-                                        size1, issued))
+                                        size1))
                                 return -1;
                         issued++;

vendor/current/source3/libsmb/nmblib.c

@@ -1294 +1294 @@
 ****************************************************************************/
 
-char *name_mangle(TALLOC_CTX *mem_ctx, char *In, char name_type)
+char *name_mangle(TALLOC_CTX *mem_ctx, const char *In, char name_type)
 {
         int   i;