Changeset 862 for trunk/server/source3/smbd/sesssetup.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/sesssetup.c (modified) (3 diffs)

trunk/server/source3/smbd/sesssetup.c

@@ -910 +910 @@
                         (unsigned int)pblob->length ));
 
+                if (pblob->length > pad->needed_len) {
+                        DEBUG(2, ("subsequent security token data length %u "
+                                  "exceeds expected length %u\n",
+                                  (unsigned int)pblob->length,
+                                  (unsigned int)pad->needed_len));
+                }
+
                 tmp_blob = data_blob(NULL,
                                 pad->partial_data.length + copy_len);
@@ -1170 +1177 @@
         status = check_spnego_blob_complete(sconn, smbpid, vuid, &blob1);
         if (!NT_STATUS_IS_OK(status)) {
+                /*
+                 * Pack error response, ensuring to fill NativeOS, NativeLanMan
+                 * & PrimaryDomain fields on NT_STATUS_MORE_PROCESSING_REQUIRED
+                 */
+                reply_outbuf(req, 4, 0);
+                reply_sesssetup_blob(req, data_blob_null, status);
                 if (!NT_STATUS_EQUAL(status,
                                 NT_STATUS_MORE_PROCESSING_REQUIRED)) {
@@ -1176 +1189 @@
                 }
                 data_blob_free(&blob1);
-                reply_nterror(req, nt_status_squash(status));
                 return;
         }