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

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

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

vendor/current/source3/smbd/dir.c

@@ -261 +261 @@
         }
 
+        if (sconn->using_smb2) {
+                goto done;
+        }
+
         DLIST_REMOVE(sconn->searches.dirptrs, dptr);
 
@@ -280 +284 @@
         /* Lanman 2 specific code */
         SAFE_FREE(dptr->wcard);
-        string_set(&dptr->path,"");
+        SAFE_FREE(dptr->path);
         SAFE_FREE(dptr);
 }
@@ -471 +475 @@
         ZERO_STRUCTP(dptr);
 
+        dptr->path = SMB_STRDUP(path);
+        if (!dptr->path) {
+                SAFE_FREE(dptr);
+                TALLOC_FREE(dir_hnd);
+                return NT_STATUS_NO_MEMORY;
+        }
+        dptr->conn = conn;
+        dptr->dir_hnd = dir_hnd;
+        dptr->spid = spid;
+        dptr->expect_close = expect_close;
+        dptr->wcard = SMB_STRDUP(wcard);
+        if (!dptr->wcard) {
+                SAFE_FREE(dptr->path);
+                SAFE_FREE(dptr);
+                TALLOC_FREE(dir_hnd);
+                return NT_STATUS_NO_MEMORY;
+        }
+        if (lp_posix_pathnames() || (wcard[0] == '.' && wcard[1] == 0)) {
+                dptr->has_wild = True;
+        } else {
+                dptr->has_wild = wcard_has_wild;
+        }
+
+        dptr->attr = attr;
+
+        if (sconn->using_smb2) {
+                goto done;
+        }
+
         if(old_handle) {
 
@@ -494 +527 @@
                         if(dptr->dnum == -1 || dptr->dnum > 254) {
                                 DEBUG(0,("dptr_create: returned %d: Error - all old dirptrs in use ?\n", dptr->dnum));
+                                SAFE_FREE(dptr->path);
+                                SAFE_FREE(dptr->wcard);
                                 SAFE_FREE(dptr);
                                 TALLOC_FREE(dir_hnd);
@@ -524 +559 @@
                         if(dptr->dnum == -1 || dptr->dnum < 255) {
                                 DEBUG(0,("dptr_create: returned %d: Error - all new dirptrs in use ?\n", dptr->dnum));
+                                SAFE_FREE(dptr->path);
+                                SAFE_FREE(dptr->wcard);
                                 SAFE_FREE(dptr);
                                 TALLOC_FREE(dir_hnd);
@@ -535 +572 @@
         dptr->dnum += 1; /* Always bias the dnum by one - no zero dnums allowed. */
 
-        string_set(&dptr->path,path);
-        dptr->conn = conn;
-        dptr->dir_hnd = dir_hnd;
-        dptr->spid = spid;
-        dptr->expect_close = expect_close;
-        dptr->wcard = SMB_STRDUP(wcard);
-        if (!dptr->wcard) {
-                bitmap_clear(sconn->searches.dptr_bmap, dptr->dnum - 1);
-                SAFE_FREE(dptr);
-                TALLOC_FREE(dir_hnd);
-                return NT_STATUS_NO_MEMORY;
-        }
-        if (lp_posix_pathnames() || (wcard[0] == '.' && wcard[1] == 0)) {
-                dptr->has_wild = True;
-        } else {
-                dptr->has_wild = wcard_has_wild;
-        }
-
-        dptr->attr = attr;
-
         DLIST_ADD(sconn->searches.dirptrs, dptr);
 
+done:
         DEBUG(3,("creating new dirptr %d for path %s, expect_close = %d\n",
                 dptr->dnum,path,expect_close));  
@@ -1328 +1346 @@
                 SMB_VFS_CLOSEDIR(dirp->conn,dirp->dir);
         }
-        if (dirp->conn->sconn) {
+        if (dirp->conn->sconn && !dirp->conn->sconn->using_smb2) {
                 dirp->conn->sconn->searches.dirhandles_open--;
         }
@@ -1359 +1377 @@
         }
 
-        if (sconn) {
+        if (sconn && !sconn->using_smb2) {
                 sconn->searches.dirhandles_open++;
         }
@@ -1403 +1421 @@
         }
 
-        if (sconn) {
+        if (sconn && !sconn->using_smb2) {
                 sconn->searches.dirhandles_open++;
         }