Changeset 590 for trunk/server/source3/libsmb/cliconnect.c

Timestamp:

Jul 1, 2011, 8:40:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.6

File:

• trunk/server/source3/libsmb/cliconnect.c (modified) (4 diffs)

trunk/server/source3/libsmb/cliconnect.c

@@ -1008 +1008 @@
          * negprot reply, but right now we do it. If we don't receive one,
          * we try to best guess, then fall back to NTLM.  */
-        if (!spnego_parse_negTokenInit(blob, OIDs, &principal)) {
+        if (!spnego_parse_negTokenInit(blob, OIDs, &principal) ||
+                        OIDs[0] == NULL) {
                 data_blob_free(&blob);
                 return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
@@ -1873 +1874 @@
         char *p;
         int len = 4;
+        int namelen = 0;
         char *tmp;
 
@@ -1891 +1893 @@
 
         p = cli->outbuf+len;
-        memcpy(p, tmp, name_len(tmp));
-        len += name_len(tmp);
+        namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
+        if (namelen > 0) {
+                memcpy(p, tmp, namelen);
+                len += namelen;
+        }
         TALLOC_FREE(tmp);
 
@@ -1904 +1909 @@
 
         p = cli->outbuf+len;
-        memcpy(p, tmp, name_len(tmp));
-        len += name_len(tmp);
+        namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
+        if (namelen > 0) {
+                memcpy(p, tmp, namelen);
+                len += namelen;
+        }
         TALLOC_FREE(tmp);