Changeset 860 for vendor/current/source3/smbd/dir.c

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

• vendor/current/source3/smbd/dir.c (modified) (10 diffs)

vendor/current/source3/smbd/dir.c

@@ -50 +50 @@
         unsigned int name_cache_index;
         unsigned int file_number;
+        files_struct *fsp; /* Back pointer to containing fsp, only
+                              set from OpenDir_fsp(). */
 };
 
@@ -591 +593 @@
 {
         if (fsp->dptr) {
-/*
- * Ugly hack. We have defined fdopendir to return ENOSYS if dirfd also isn't
- * present. I hate Solaris. JRA.
- */
-#ifdef HAVE_DIRFD
-                if (fsp->fh->fd != -1 &&
-                                fsp->dptr->dir_hnd &&
-                                dirfd(fsp->dptr->dir_hnd->dir)) {
-                        /* The call below closes the underlying fd. */
-                        fsp->fh->fd = -1;
-                }
-#endif
+                /*
+                 * The destructor for the struct smb_Dir
+                 * (fsp->dptr->dir_hnd) now handles
+                 * all resource deallocation.
+                 */
                 dptr_close_internal(fsp->dptr);
                 fsp->dptr = NULL;
@@ -942 +937 @@
 {
         connection_struct *conn = dirptr->conn;
-        bool needslash;
+        size_t slashlen;
+        size_t pathlen;
 
         *_smb_fname = NULL;
         *_mode = 0;
 
-        needslash = ( dirptr->path[strlen(dirptr->path) -1] != '/');
+        pathlen = strlen(dirptr->path);
+        slashlen = ( dirptr->path[pathlen-1] != '/') ? 1 : 0;
 
         while (true) {
@@ -991 +988 @@
                 }
 
-                pathreal = talloc_asprintf(ctx, "%s%s%s",
-                                           dirptr->path,
-                                           needslash?"/":"",
-                                           dname);
+                /*
+                 * This used to be
+                 * pathreal = talloc_asprintf(ctx, "%s%s%s", dirptr->path,
+                 *                            needslash?"/":"", dname);
+                 * but this was measurably slower than doing the memcpy.
+                 */
+
+                pathreal = talloc_array(
+                        ctx, char,
+                        pathlen + slashlen + talloc_get_size(dname));
                 if (!pathreal) {
                         TALLOC_FREE(dname);
@@ -1000 +1003 @@
                         return false;
                 }
+
+                memcpy(pathreal, dirptr->path, pathlen);
+                pathreal[pathlen] = '/';
+                memcpy(pathreal + slashlen + pathlen, dname,
+                       talloc_get_size(dname));
 
                 /* Create smb_fname with NULL stream_name. */
@@ -1333 +1341 @@
 static int smb_Dir_destructor(struct smb_Dir *dirp)
 {
-        if (dirp->dir) {
-#ifdef HAVE_DIRFD
-                if (dirp->conn->sconn) {
-                        files_struct *fsp = file_find_fd(dirp->conn->sconn,
-                                                dirfd(dirp->dir));
-                        if (fsp) {
-                                /* The call below closes the underlying fd. */
-                                fsp->fh->fd = -1;
+        if (dirp->dir != NULL) {
+                SMB_VFS_CLOSEDIR(dirp->conn,dirp->dir);
+                if (dirp->fsp != NULL) {
+                        /*
+                         * The SMB_VFS_CLOSEDIR above
+                         * closes the underlying fd inside
+                         * dirp->fsp.
+                         */
+                        dirp->fsp->fh->fd = -1;
+                        if (dirp->fsp->dptr != NULL) {
+                                SMB_ASSERT(dirp->fsp->dptr->dir_hnd == dirp);
+                                dirp->fsp->dptr->dir_hnd = NULL;
                         }
-                }
-#endif
-                SMB_VFS_CLOSEDIR(dirp->conn,dirp->dir);
+                        dirp->fsp = NULL;
+                }
         }
         if (dirp->conn->sconn && !dirp->conn->sconn->using_smb2) {
@@ -1428 +1439 @@
         if (fsp->is_directory && fsp->fh->fd != -1) {
                 dirp->dir = SMB_VFS_FDOPENDIR(fsp, mask, attr);
-                if (dirp->dir == NULL) {
+                if (dirp->dir != NULL) {
+                        dirp->fsp = fsp;
+                } else {
                         DEBUG(10,("OpenDir_fsp: SMB_VFS_FDOPENDIR on %s returned "
                                 "NULL (%s)\n",
@@ -1644 +1657 @@
 *****************************************************************/
 
-NTSTATUS can_delete_directory(struct connection_struct *conn,
-                                const char *dirname)
+NTSTATUS can_delete_directory_fsp(files_struct *fsp)
 {
         NTSTATUS status = NT_STATUS_OK;
@@ -1652 +1664 @@
         char *talloced = NULL;
         SMB_STRUCT_STAT st;
-        struct smb_Dir *dir_hnd = OpenDir(talloc_tos(), conn,
-                                        dirname, NULL, 0);
+        struct connection_struct *conn = fsp->conn;
+        struct smb_Dir *dir_hnd = OpenDir_fsp(talloc_tos(),
+                                        conn,
+                                        fsp,
+                                        NULL,
+                                        0);
 
         if (!dir_hnd) {
@@ -1668 +1684 @@
                 }
 
-                if (!is_visible_file(conn, dirname, dname, &st, True)) {
+                if (!is_visible_file(conn, fsp->fsp_name->base_name, dname, &st, True)) {
                         TALLOC_FREE(talloced);
                         continue;
                 }
 
-                DEBUG(10,("can_delete_directory: got name %s - can't delete\n",
+                DEBUG(10,("can_delete_directory_fsp: got name %s - can't delete\n",
                          dname ));
                 status = NT_STATUS_DIRECTORY_NOT_EMPTY;