Changeset 77 for trunk/samba/source/smbd/dir.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/smbd/dir.c (modified) (23 diffs)

trunk/samba/source/smbd/dir.c

@@ -1 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Directory handling routines
    Copyright (C) Andrew Tridgell 1992-1998
-   
+   Copyright (C) Jeremy Allison 2007
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -74 +74 @@
 ****************************************************************************/
 
-void make_dir_struct(char *buf, const char *mask, const char *fname,SMB_OFF_T size,uint32 mode,time_t date, BOOL uc)
-{  
+BOOL make_dir_struct(TALLOC_CTX *ctx,
+                        char *buf,
+                        const char *mask,
+                        const char *fname,
+                        SMB_OFF_T size,
+                        uint32 mode,
+                        time_t date,
+                        BOOL uc)
+{
         char *p;
-        pstring mask2;
-
-        pstrcpy(mask2,mask);
-
-        if ((mode & aDIR) != 0)
+        char *mask2 = talloc_strdup(ctx, mask);
+
+        if (!mask2) {
+                return False;
+        }
+
+        if ((mode & aDIR) != 0) {
                 size = 0;
+        }
 
         memset(buf+1,' ',11);
@@ -90 +100 @@
                 push_ascii(buf+9,p+1,3, 0);
                 *p = '.';
-        } else
+        } else {
                 push_ascii(buf+1,mask2,11, 0);
+        }
 
         memset(buf+21,'\0',DIR_STRUCT_SIZE-21);
@@ -102 +113 @@
         push_ascii(buf+30,fname,12, uc ? STR_UPPER : 0);
         DEBUG(8,("put name [%s] from [%s] into dir struct\n",buf+30, fname));
+        return True;
 }
 
@@ -240 +252 @@
         DLIST_REMOVE(dirptrs, dptr);
 
-        /* 
+        /*
          * Free the dnum in the bitmap. Remember the dnum value is always 
          * biased by one with respect to the bitmap.
@@ -382 +394 @@
 ****************************************************************************/
 
-NTSTATUS dptr_create(connection_struct *conn, pstring path, BOOL old_handle, BOOL expect_close,uint16 spid,
+NTSTATUS dptr_create(connection_struct *conn, const char *path, BOOL old_handle, BOOL expect_close,uint16 spid,
                 const char *wcard, BOOL wcard_has_wild, uint32 attr, struct dptr_struct **dptr_ret)
 {
         struct dptr_struct *dptr = NULL;
         struct smb_Dir *dir_hnd;
-        const char *dir2;
         NTSTATUS status;
 
@@ -401 +412 @@
         }
 
-        /* use a const pointer from here on */
-        dir2 = path;
-        if (!*dir2)
-                dir2 = ".";
-
-        dir_hnd = OpenDir(conn, dir2, wcard, attr);
+        dir_hnd = OpenDir(conn, path, wcard, attr);
         if (!dir_hnd) {
                 return map_nt_error_from_unix(errno);
         }
 
-        string_set(&conn->dirpath,dir2);
+        string_set(&conn->dirpath,path);
 
         if (dirhandles_open >= MAX_OPEN_DIRECTORIES) {
@@ -490 +496 @@
         dptr->dnum += 1; /* Always bias the dnum by one - no zero dnums allowed. */
 
-        string_set(&dptr->path,dir2);
+        string_set(&dptr->path,path);
         dptr->conn = conn;
         dptr->dir_hnd = dir_hnd;
@@ -571 +577 @@
 ****************************************************************************/
 
-const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT_STAT *pst)
+const char *dptr_ReadDirName(TALLOC_CTX *ctx,
+                        struct dptr_struct *dptr,
+                        long *poffset,
+                        SMB_STRUCT_STAT *pst)
 {
         SET_STAT_INVALID(*pst);
@@ -586 +595 @@
 
         if (!dptr->did_stat) {
-                pstring pathreal;
+                char *pathreal = NULL;
 
                 /* We know the stored wcard contains no wildcard characters. See if we can match
@@ -610 +619 @@
                 }
 
-                pstrcpy(pathreal,dptr->path);
-                pstrcat(pathreal,"/");
-                pstrcat(pathreal,dptr->wcard);
+                pathreal = talloc_asprintf(ctx,
+                                        "%s/%s",
+                                        dptr->path,
+                                        dptr->wcard);
+                if (!pathreal) {
+                        return NULL;
+                }
 
                 if (SMB_VFS_STAT(dptr->conn,pathreal,pst) == 0) {
@@ -618 +631 @@
                            this function is usually called with the output from TellDir. */
                         dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
+                        TALLOC_FREE(pathreal);
                         return dptr->wcard;
                 } else {
@@ -626 +640 @@
                                    this function is usually called with the output from TellDir. */
                                 dptr->dir_hnd->offset = *poffset = END_OF_DIRECTORY_OFFSET;
+                                TALLOC_FREE(pathreal);
                                 return dptr->wcard;
                         }
                 }
+
+                TALLOC_FREE(pathreal);
 
                 /* In case sensitive mode we don't search - we know if it doesn't exist 
@@ -760 +777 @@
 }
 
-static BOOL mangle_mask_match(connection_struct *conn, fstring filename, char *mask)
-{
-        mangle_map(filename,True,False,conn->params);
-        return mask_match_search(filename,mask,False);
+static BOOL mangle_mask_match(connection_struct *conn,
+                const char *filename,
+                const char *mask)
+{
+        char mname[13];
+
+        if (!name_to_8_3(filename,mname,False,conn->params)) {
+                return False;
+        }
+        return mask_match_search(mname,mask,False);
 }
 
@@ -770 +793 @@
 ****************************************************************************/
 
-BOOL get_dir_entry(connection_struct *conn,char *mask,uint32 dirtype, pstring fname,
-                   SMB_OFF_T *size,uint32 *mode,time_t *date,BOOL check_descend)
-{
-        const char *dname;
+BOOL get_dir_entry(TALLOC_CTX *ctx,
+                connection_struct *conn,
+                const char *mask,
+                uint32 dirtype,
+                char **pp_fname_out,
+                SMB_OFF_T *size,
+                uint32 *mode,
+                time_t *date,
+                BOOL check_descend)
+{
+        const char *dname = NULL;
         BOOL found = False;
         SMB_STRUCT_STAT sbuf;
-        pstring path;
-        pstring pathreal;
-        pstring filename;
+        char *pathreal = NULL;
+        const char *filename = NULL;
         BOOL needslash;
 
-        *path = *pathreal = *filename = 0;
+        *pp_fname_out = NULL;
 
         needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
 
-        if (!conn->dirptr)
+        if (!conn->dirptr) {
                 return(False);
+        }
 
         while (!found) {
                 long curoff = dptr_TellDir(conn->dirptr);
-                dname = dptr_ReadDirName(conn->dirptr, &curoff, &sbuf);
+                dname = dptr_ReadDirName(ctx, conn->dirptr, &curoff, &sbuf);
 
                 DEBUG(6,("readdir on dirptr 0x%lx now at offset %ld\n",
                         (long)conn->dirptr,TellDir(conn->dirptr->dir_hnd)));
-      
-                if (dname == NULL) 
+
+                if (dname == NULL) {
                         return(False);
-      
-                pstrcpy(filename,dname);      
+                }
+
+                filename = dname;
 
                 /* notice the special *.* handling. This appears to be the only difference
@@ -807 +838 @@
                     mask_match_search(filename,mask,False) ||
                     mangle_mask_match(conn,filename,mask)) {
-
-                        if (!mangle_is_8_3(filename, False, conn->params))
-                                mangle_map(filename,True,False,
-                                           conn->params);
-
-                        pstrcpy(fname,filename);
-                        *path = 0;
-                        pstrcpy(path,conn->dirpath);
-                        if(needslash)
-                                pstrcat(path,"/");
-                        pstrcpy(pathreal,path);
-                        pstrcat(path,fname);
-                        pstrcat(pathreal,dname);
+                        char mname[13];
+
+                        if (!mangle_is_8_3(filename, False, conn->params)) {
+                                if (!name_to_8_3(filename,mname,False,
+                                           conn->params)) {
+                                        continue;
+                                }
+                                filename = mname;
+                        }
+
+                        if (needslash) {
+                                pathreal = talloc_asprintf(ctx,
+                                                "%s/%s",
+                                                conn->dirpath,
+                                                dname);
+                        } else {
+                                pathreal = talloc_asprintf(ctx,
+                                                "%s%s",
+                                                conn->dirpath,
+                                                dname);
+                        }
+                        if (!pathreal) {
+                                return False;
+                        }
+
                         if (!VALID_STAT(sbuf) && (SMB_VFS_STAT(conn, pathreal, &sbuf)) != 0) {
-                                DEBUG(5,("Couldn't stat 1 [%s]. Error = %s\n",path, strerror(errno) ));
+                                DEBUG(5,("Couldn't stat 1 [%s]. Error = %s\n",
+                                        pathreal, strerror(errno) ));
+                                TALLOC_FREE(pathreal);
                                 continue;
                         }
-          
+
                         *mode = dos_mode(conn,pathreal,&sbuf);
 
                         if (!dir_check_ftype(conn,*mode,dirtype)) {
                                 DEBUG(5,("[%s] attribs 0x%x didn't match 0x%x\n",filename,(unsigned int)*mode,(unsigned int)dirtype));
+                                TALLOC_FREE(pathreal);
                                 continue;
                         }
@@ -835 +881 @@
                         *date = sbuf.st_mtime;
 
-                        DEBUG(3,("get_dir_entry mask=[%s] found %s fname=%s\n",mask, pathreal,fname));
+                        DEBUG(3,("get_dir_entry mask=[%s] found %s "
+                                "fname=%s (%s)\n",
+                                mask,
+                                pathreal,
+                                dname,
+                                filename));
 
                         found = True;
 
+                        *pp_fname_out = talloc_strdup(ctx, filename);
+                        if (!*pp_fname_out) {
+                                return False;
+                        }
+
                         DirCacheAdd(conn->dirptr->dir_hnd, dname, curoff);
+                        TALLOC_FREE(pathreal);
                 }
         }
@@ -879 +936 @@
 
         if(S_ISDIR(pst->st_mode)) {
-                 status = open_directory(conn, name, pst,
+                 status = open_directory(conn, NULL, name, pst,
                         READ_CONTROL_ACCESS,
                         FILE_SHARE_READ|FILE_SHARE_WRITE,
@@ -887 +944 @@
                         NULL, &fsp);
         } else {
-                status = open_file_stat(conn, name, pst, &fsp);
+                status = open_file_stat(conn, NULL, name, pst, &fsp);
         }
 
@@ -943 +1000 @@
                 return True;
         } else {
-                status = open_file_ntcreate(conn, name, pst,
+                status = open_file_ntcreate(conn, NULL, name, pst,
                         FILE_WRITE_ATTRIBUTES,
                         FILE_SHARE_READ|FILE_SHARE_WRITE,
@@ -1017 +1074 @@
 
         if (hide_unreadable || hide_unwriteable || hide_special) {
-                pstring link_target;
                 char *entry = NULL;
 
@@ -1027 +1083 @@
                 if (lp_host_msdfs() &&
                                 lp_msdfs_root(SNUM(conn)) &&
-                                is_msdfs_link(conn, entry, link_target, NULL)) {
+                                is_msdfs_link(conn, entry, NULL)) {
                         SAFE_FREE(entry);
                         return True;
@@ -1196 +1252 @@
                 if (offset == START_OF_DIRECTORY_OFFSET) {
                         RewindDir(dirp, &offset);
-                        /* 
+                        /*
                          * Ok we should really set the file number here
                          * to 1 to enable ".." to be returned next. Trouble