Changeset 745 for trunk/server/source3/smbd/mangle_hash.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

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

trunk/server/source3/smbd/mangle_hash.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "mangle.h"
+#include "util_tdb.h"
 
 /* -------------------------------------------------------------------------- **
@@ -371 +375 @@
         while( magic && magic[1] && magic[2] ) {         /* 3 chars, 1st is magic. */
                 if( ('.' == magic[3] || '/' == magic[3] || !(magic[3]))          /* Ends with '.' or nul or '/' ?  */
-                                && isbasechar( toupper_ascii(magic[1]) )           /* is 2nd char basechar?  */
-                                && isbasechar( toupper_ascii(magic[2]) ) )         /* is 3rd char basechar?  */
+                                && isbasechar( toupper_m(magic[1]) )           /* is 2nd char basechar?  */
+                                && isbasechar( toupper_m(magic[2]) ) )         /* is 3rd char basechar?  */
                         return( True );                           /* If all above, then true, */
                 magic = strchr_m( magic+1, magic_char );      /*    else seek next magic. */
@@ -426 +430 @@
         if( s1 && (s2 = strrchr( raw_name, '.' )) ) {
                 size_t i = 1;
-                while( s1[i] && (tolower_ascii( s1[i] ) == s2[i]) )
+                while( s1[i] && (tolower_m( s1[i] ) == s2[i]) )
                         i++;
                 if( !s1[i] && !s2[i] ) {