Changeset 732 for branches/samba-3.5.x/source3/smbd/filename.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/smbd/filename.c (modified) (4 diffs)

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

@@ -296 +296 @@
         if((!conn->case_sensitive || !(conn->fs_capabilities &
                                        FILE_CASE_SENSITIVE_SEARCH)) &&
-            stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
+            stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start,
                               &smb_fname->st)) {
                 goto done;
@@ -840 +840 @@
 
 /****************************************************************************
+ Ensure a path is not vetod.
+****************************************************************************/
+
+NTSTATUS check_veto_path(connection_struct *conn, const char *name)
+{
+        if (IS_VETO_PATH(conn, name))  {
+                /* Is it not dot or dot dot. */
+                if (!(ISDOT(name) || ISDOTDOT(name))) {
+                        DEBUG(5,("check_veto_path: file path name %s vetoed\n",
+                                                name));
+                        return map_nt_error_from_unix(ENOENT);
+                }
+        }
+        return NT_STATUS_OK;
+}
+
+/****************************************************************************
  Check a filename - possibly calling check_reduced_name.
  This is called by every routine before it allows an operation on a filename.
@@ -848 +865 @@
 NTSTATUS check_name(connection_struct *conn, const char *name)
 {
-        if (IS_VETO_PATH(conn, name))  {
-                /* Is it not dot or dot dot. */
-                if (!((name[0] == '.') && (!name[1] ||
-                                        (name[1] == '.' && !name[2])))) {
-                        DEBUG(5,("check_name: file path name %s vetoed\n",
-                                                name));
-                        return map_nt_error_from_unix(ENOENT);
-                }
+        NTSTATUS status = check_veto_path(conn, name);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
         }
 
         if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
-                NTSTATUS status = check_reduced_name(conn,name);
+                status = check_reduced_name(conn,name);
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(5,("check_name: name %s failed with %s\n",name,
@@ -1177 +1190 @@
         }
 
+        if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) &&
+                        VALID_STAT((*pp_smb_fname)->st) &&
+                        S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) {
+                return check_veto_path(conn, (*pp_smb_fname)->base_name);
+        }
+
         status = check_name(conn, (*pp_smb_fname)->base_name);
         if (!NT_STATUS_IS_OK(status)) {