Commit b04c7822 authored by Jeremy Allison's avatar Jeremy Allison Committed by Gerald (Jerry) Carter
Browse files

r1301: Fix bogus error message when using "mangling method = hash" rather 

than hash2. We are already calculating lengths so just use memcpy
not safe_strcpy().
Jeremy.
(This used to be commit a5a3df78531dc5400088e1746d6a7cd29f56a714)
parent 7310ba1b

source3/smbd/mangle_hash.c

+4 −2
Original line number Diff line number Diff line
@@ -546,8 +546,10 @@ static void cache_mangled_name( char *mangled_name, char *raw_name ) 
	/* Fill the new cache entry, and add it to the cache. */

	s1 = (char *)(new_entry + 1);

	s2 = (char *)&(s1[mangled_len + 1]);

	safe_strcpy( s1, mangled_name, mangled_len );

	safe_strcpy( s2, raw_name,     raw_len );

	memcpy( s1, mangled_name, mangled_len );

	s1[mangled_len] = '\0';

	memcpy( s2, raw_name, raw_len );

	s2[raw_len] = '\0';

	ubi_cachePut( mangled_cache, i, new_entry, s1 );

}