Changeset 370 for branches/samba-3.3.x/source/smbd/mangle_hash.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/smbd/mangle_hash.c (modified) (3 diffs)

branches/samba-3.3.x/source/smbd/mangle_hash.c

@@ -433 +433 @@
                         /* Truncate at the '.' */
                         *s1 = '\0';
+                        /*
+                         * DANGER WILL ROBINSON - this
+                         * is changing a const string via
+                         * an aliased pointer ! Remember to
+                         * put it back once we've used it.
+                         * JRA
+                         */
                         *s2 = '\0';
                 }
@@ -444 +451 @@
                 DEBUG(5,("cache_mangled_name: Stored entry %s -> %s\n", mangled_name_key, raw_name));
         }
+        /* Restore the change we made to the const string. */
+        *s2 = '.';
 }
 
@@ -614 +623 @@
         status = is_valid_name(name_ucs2, False, False);
         SAFE_FREE(name_ucs2);
-        return NT_STATUS_IS_OK(status);
+        /* We return true if we *must* mangle, so if it's
+         * a valid name (status == OK) then we must return
+         * false. Bug #6939. */
+        return !NT_STATUS_IS_OK(status);
 }