The branch, v3-4-test has been updated
via a5bfbad... Fix bug 7005 - mangle method = hash truncates files with
dot '.' character
from 3439ae9... WHATSNEW: Start release notes for Samba 3.4.4.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit a5bfbad790870ff66d4b09f99f0835ccb61c10ed
Author: Jeremy Allison <j...@samba.org>
Date: Mon Dec 21 21:12:33 2009 -0800
Fix bug 7005 - mangle method = hash truncates files with dot '.' character
Don't change the contents of a const string via a pointer
alias (or if you do, change it back.....).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/mangle_hash.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index b582d19..6679b31 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -429,6 +429,13 @@ static void cache_mangled_name( const char
mangled_name[13],
if( !s1[i] && !s2[i] ) {
/* 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';
}
}
@@ -440,6 +447,8 @@ static void cache_mangled_name( const char mangled_name[13],
} else {
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 = '.';
}
/* **************************************************************************
**
--
Samba Shared Repository
