Changeset 733 for branches/samba-3.5.x/source3/smbd/open.c

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

File:

• branches/samba-3.5.x/source3/smbd/open.c (modified) (3 diffs)

branches/samba-3.5.x/source3/smbd/open.c

@@ -94 +94 @@
                         smb_fname_str_dbg(smb_fname),
                         (unsigned int)*access_granted ));
+                return NT_STATUS_OK;
+        }
+
+        if (access_mask == DELETE_ACCESS &&
+                        VALID_STAT(smb_fname->st) &&
+                        S_ISLNK(smb_fname->st.st_ex_mode)) {
+                /* We can always delete a symlink. */
+                DEBUG(10,("smbd_check_open_rights: not checking ACL "
+                        "on DELETE_ACCESS on symlink %s.\n",
+                        smb_fname_str_dbg(smb_fname) ));
                 return NT_STATUS_OK;
         }
@@ -1432 +1442 @@
         }
 
-        status = check_name(conn, smb_fname->base_name);
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
         if (!posix_open) {
                 new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
@@ -3309 +3314 @@
         }
 
-        /* All file access must go through check_name() */
-
-        status = check_name(conn, smb_fname->base_name);
-        if (!NT_STATUS_IS_OK(status)) {
-                goto fail;
-        }
-
         status = create_file_unixpath(
                 conn, req, smb_fname, access_mask, share_access,