Add const.

(This used to be commit 5371720971bc60a4cfba0460614306f322aa10b8)

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 95acf4a2621883dd9a0e940d2bea0d72f06720be..ec570d3a18018c2cb087a3068af3861d30de6f51 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -578,7 +578,7 @@ BOOL dir_check_ftype(connection_struct *conn,int mode,SMB_STRUCT_STAT *st,int di
        return True;
 }
 
-static BOOL mangle_mask_match(connection_struct *conn, char *filename, char *mask)
+static BOOL mangle_mask_match(connection_struct *conn, fstring filename, char *mask)
 {
        mangle_map(filename,True,False,SNUM(conn));
        return mask_match(filename,mask,False);
@@ -588,10 +588,10 @@ static BOOL mangle_mask_match(connection_struct *conn, char *filename, char *mas
  Get an 8.3 directory entry.
 ****************************************************************************/
 
-BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,
+BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype, pstring fname,
                    SMB_OFF_T *size,int *mode,time_t *date,BOOL check_descend)
 {
-       char *dname;
+       const char *dname;
        BOOL found = False;
        SMB_STRUCT_STAT sbuf;
        pstring path;
@@ -627,8 +627,8 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype,char *fname,
                        see masktest for a demo
                */
                if ((strcmp(mask,"*.*") == 0) ||
-                               mask_match(filename,mask,False) ||
-                               mangle_mask_match(conn,filename,mask)) {
+                   mask_match(filename,mask,False) ||
+                   mangle_mask_match(conn,filename,mask)) {
                        if (isrootdir && (strequal(filename,"..") || strequal(filename,".")))
                                continue;
 
@@ -907,7 +907,7 @@ void *OpenDir(connection_struct *conn, const char *name, BOOL use_veto)
                        dirp->current = dirp->data;
                }
 
-               safe_strcpy(dirp->data+used,n, dirp->mallocsize - used - 1);
+               safe_strcpy_base(dirp->data+used,n, dirp->data, dirp->mallocsize);
                used += l;
                dirp->numentries++;
        }
@@ -933,7 +933,7 @@ void CloseDir(void *p)
  Read from a directory.
 ********************************************************************/
 
-char *ReadDirName(void *p)
+const char *ReadDirName(void *p)
 {
        char *ret;
        Dir *dirp = (Dir *)p;