Changeset 746 for vendor/current/source3/smbd/filename.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/filename.c (modified) (6 diffs)

vendor/current/source3/smbd/filename.c

@@ -384 +384 @@
         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;
@@ -978 +978 @@
 
 /****************************************************************************
+ 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.
@@ -986 +1003 @@
 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,
@@ -1171 +1184 @@
 {
         NTSTATUS status;
-        unsigned int i, num_streams;
+        unsigned int i, num_streams = 0;
         struct stream_struct *streams = NULL;
 
@@ -1186 +1199 @@
 
         /* Fall back to a case-insensitive scan of all streams on the file. */
-        status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname->base_name, mem_ctx,
-                                    &num_streams, &streams);
+        status = vfs_streaminfo(conn, NULL, smb_fname->base_name, mem_ctx,
+                                &num_streams, &streams);
 
         if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
@@ -1315 +1328 @@
         }
 
+        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)) {