Author: jra
Date: 2006-02-28 15:58:09 +0000 (Tue, 28 Feb 2006)
New Revision: 13759

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13759

Log:
As pointed out by Volker, it isn't much good creating
a new empty acl in remove_posix_acl if you don't bother
to set it on the file in question :-).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/posix_acls.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/posix_acls.c 2006-02-28 15:53:57 UTC (rev 
13758)
+++ branches/SAMBA_3_0/source/smbd/posix_acls.c 2006-02-28 15:58:09 UTC (rev 
13759)
@@ -3834,6 +3834,21 @@
                }
        }
 
+       /* Set the new empty file ACL. */
+       if (fsp && fsp->fh->fd != -1) {
+               if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, new_file_acl) == 
-1) {
+                       DEBUG(5,("remove_posix_acl: acl_set_file failed on %s 
(%s)\n",
+                               fname, strerror(errno) ));
+                       goto done;
+               }
+       } else {
+               if (SMB_VFS_SYS_ACL_SET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS, 
new_file_acl) == -1) {
+                       DEBUG(5,("remove_posix_acl: acl_set_file failed on %s 
(%s)\n",
+                               fname, strerror(errno) ));
+                       goto done;
+               }
+       }
+
        ret = True;
 
  done:

Reply via email to