Changeset 342 for branches/samba-3.3.x/source/smbd/posix_acls.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/posix_acls.c (modified) (10 diffs)

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

@@ -3179 +3179 @@
         SMB_ACL_T def_acl = NULL;
         struct pai_val *pal;
+        int ret;
 
         *ppdesc = NULL;
@@ -3185 +3186 @@
 
         /* Get the stat struct for the owner info. */
-        if(SMB_VFS_STAT(conn, name, &sbuf) != 0) {
+        if (lp_posix_pathnames()) {
+                ret = SMB_VFS_LSTAT(conn, name, &sbuf);
+        } else {
+                ret = SMB_VFS_STAT(conn, name, &sbuf);
+        }
+        if(ret != 0) {
                 return map_nt_error_from_unix(errno);
         }
@@ -3219 +3225 @@
         files_struct *fsp;
         SMB_STRUCT_STAT st;
+        bool posix_paths = lp_posix_pathnames();
 
         if(!CAN_WRITE(conn)) {
@@ -3226 +3233 @@
         /* Case (1). */
         /* try the direct way first */
-        ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+        if (posix_paths) {
+                ret = SMB_VFS_LCHOWN(conn, fname, uid, gid);
+        } else {
+                ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+        }
         if (ret == 0)
                 return 0;
@@ -3266 +3277 @@
         }
 
-        if (SMB_VFS_STAT(conn,fname,&st)) {
+        if (posix_paths) {
+                ret = SMB_VFS_LSTAT(conn,fname,&st);
+        } else {
+                ret = SMB_VFS_STAT(conn,fname,&st);
+        }
+        if (ret != 0) {
                 return -1;
         }
@@ -3498 +3514 @@
         bool acl_set_support = false;
         bool ret = false;
+        bool posix_paths = lp_posix_pathnames();
+        int sret;
 
         DEBUG(10,("set_nt_acl: called for file %s\n", fsp->fsp_name ));
@@ -3511 +3529 @@
 
         if(fsp->is_directory || fsp->fh->fd == -1) {
-                if(SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf) != 0)
+                if (posix_paths) {
+                        sret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf);
+                } else {
+                        sret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf);
+                }
+                if (sret != 0) {
                         return map_nt_error_from_unix(errno);
+                }
         } else {
                 if(SMB_VFS_FSTAT(fsp, &sbuf) != 0)
@@ -3556 +3580 @@
 
                 if(fsp->is_directory) {
-                        if(SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf) != 0) {
+                        if (posix_paths) {
+                                sret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name, &sbuf);
+                        } else {
+                                sret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
+                        }
+                        if (sret != 0) {
                                 return map_nt_error_from_unix(errno);
                         }
                 } else {
-
-                        int sret;
-
-                        if(fsp->fh->fd == -1)
-                                sret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
-                        else
+                        if(fsp->fh->fd == -1) {
+                                if (posix_paths) {
+                                        sret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name, &sbuf);
+                                } else {
+                                        sret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
+                                }
+                        } else {
                                 sret = SMB_VFS_FSTAT(fsp, &sbuf);
+                        }
 
                         if(sret != 0)
@@ -3645 +3676 @@
                         }
                 } else {
-                        int sret = -1;
-
                         /*
                          * No default ACL - delete one if it exists.
@@ -3706 +3735 @@
 
                 if (orig_mode != posix_perms) {
-                        int sret = -1;
-
                         DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
                                 fsp->fsp_name, (unsigned int)posix_perms ));