sync 3.0 into HEAD for the last time

[obnox/samba/samba-obnox.git] / source3 / smbd / filename.c

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index ad107f9c3e13b814c7cde4f38819819a4cd6d346..643e315c0694f2890c8cbe86dfc354ce494f027d 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -125,7 +125,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
         * also trim trailing /'s.
         */
 
-       trim_string(name,"/","/");
+       trim_char(name,'/','/');
 
        /*
         * If we trimmed down to a single '\0' character
@@ -164,7 +164,7 @@ BOOL unix_convert(pstring name,connection_struct *conn,char *saved_last_componen
                return(True);
 
        start = name;
-       while (strncmp(start,"./",2) == 0)
+       while (start[0] == '.' && start[1] == '/')
                start += 2;
 
        pstrcpy(orig_path, name);