Changeset 342 for branches/samba-3.3.x/source/smbd/reply.c

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

File:

• branches/samba-3.3.x/source/smbd/reply.c (modified) (5 diffs)

branches/samba-3.3.x/source/smbd/reply.c

@@ -958 +958 @@
         }
 
-        if (!VALID_STAT(sbuf) && (SMB_VFS_STAT(conn,name,&sbuf) != 0)) {
-                DEBUG(3,("reply_checkpath: stat of %s failed (%s)\n",name,strerror(errno)));
-                status = map_nt_error_from_unix(errno);
-                goto path_err;
+        if (!VALID_STAT(sbuf)) {
+                int ret;
+
+                if (lp_posix_pathnames()) {
+                        ret = SMB_VFS_LSTAT(conn,name,&sbuf);
+                } else {
+                        ret = SMB_VFS_STAT(conn,name,&sbuf);
+                }
+                if (ret != 0) {
+                        DEBUG(3,("reply_checkpath: stat of %s failed (%s)\n",name,strerror(errno)));
+                        status = map_nt_error_from_unix(errno);
+                        goto path_err;
+                }
         }
 
@@ -1068 +1077 @@
                         return;
                 }
-                if (!VALID_STAT(sbuf) && (SMB_VFS_STAT(conn,fname,&sbuf) != 0)) {
-                        DEBUG(3,("reply_getatr: stat of %s failed (%s)\n",fname,strerror(errno)));
-                        reply_unixerror(req, ERRDOS,ERRbadfile);
-                        END_PROFILE(SMBgetatr);
-                        return;
+                if (!VALID_STAT(sbuf)) {
+                        int ret;
+
+                        if (lp_posix_pathnames()) {
+                                ret = SMB_VFS_LSTAT(conn,fname,&sbuf);
+                        } else {
+                                ret = SMB_VFS_STAT(conn,fname,&sbuf);
+                        }
+                        if (ret != 0) {
+                                DEBUG(3,("reply_getatr: stat of %s failed (%s)\n",fname,strerror(errno)));
+                                reply_unixerror(req, ERRDOS,ERRbadfile);
+                                END_PROFILE(SMBgetatr);
+                                return;
+                        }
                 }
 
@@ -2302 +2320 @@
         files_struct *fsp;
         uint32 dirtype_orig = dirtype;
+        bool posix_paths = lp_posix_pathnames();
+        int ret;
         NTSTATUS status;
 
@@ -2310 +2330 @@
         }
 
-        if (SMB_VFS_LSTAT(conn,fname,&sbuf) != 0) {
+        if (posix_paths) {
+                ret = SMB_VFS_LSTAT(conn,fname,&sbuf);
+        } else {
+                ret = SMB_VFS_STAT(conn,fname,&sbuf);
+        }
+        if (ret != 0) {
                 return map_nt_error_from_unix(errno);
         }
@@ -2396 +2421 @@
                  FILE_OPEN,             /* create_disposition*/
                  FILE_NON_DIRECTORY_FILE, /* create_options */
-                 FILE_ATTRIBUTE_NORMAL, /* file_attributes */
+                                        /* file_attributes */
+                 posix_paths ? FILE_FLAG_POSIX_SEMANTICS|0777 :
+                                FILE_ATTRIBUTE_NORMAL,
                  0,                     /* oplock_request */
                  0,                     /* allocation_size */