Changeset 596 for trunk/server/source3/libsmb

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

Location:

trunk/server/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)

trunk/server/source3/libsmb/async_smb.c

@@ -706 +706 @@
                 TALLOC_FREE(inbuf);
                 status = NT_STATUS_ACCESS_DENIED;
+
+
                 goto fail;
         }
@@ -1070 +1072 @@
         return NT_STATUS_OK;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/server/source3/libsmb/clidgram.c

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

trunk/server/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)
         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 );

trunk/server/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++;

trunk/server/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, char *In, char name_type)
 {
         int   i;