Changeset 140 for branches/samba-3.0/source/smbd

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

Location:

branches/samba-3.0/source/smbd

Files:

• oplock_linux.c (modified) (3 diffs)
• posix_acls.c (modified) (5 diffs)

branches/samba-3.0/source/smbd/oplock_linux.c

@@ -24 +24 @@
 #if HAVE_KERNEL_OPLOCKS_LINUX
 
-/* these can be removed when they are in glibc headers */
-struct  cap_user_header {
-        uint32 version;
-        int pid;
-} header;
-struct cap_user_data {
-        uint32 effective;
-        uint32 permitted;
-        uint32 inheritable;
-} data;
-
-extern int capget(struct cap_user_header * hdrp,
-                  struct cap_user_data * datap);
-extern int capset(struct cap_user_header * hdrp,
-                  const struct cap_user_data * datap);
-
 static SIG_ATOMIC_T signals_received;
 #define FD_PENDING_SIZE 100
@@ -77 +61 @@
 }
 
-/****************************************************************************
- Try to gain a linux capability.
-****************************************************************************/
-
-static void set_capability(unsigned capability)
-{
-#ifndef _LINUX_CAPABILITY_VERSION
-#define _LINUX_CAPABILITY_VERSION 0x19980330
-#endif
-        header.version = _LINUX_CAPABILITY_VERSION;
-        header.pid = 0;
-
-        if (capget(&header, &data) == -1) {
-                DEBUG(3,("Unable to get kernel capabilities (%s)\n",
-                         strerror(errno)));
-                return;
-        }
-
-        data.effective |= (1<<capability);
-
-        if (capset(&header, &data) == -1) {
-                DEBUG(3,("Unable to set %d capability (%s)\n", 
-                         capability, strerror(errno)));
-        }
-}
-
 /*
  Call to set the kernel lease signal handler
@@ -128 +86 @@
         ret = fcntl(fd, F_SETLEASE, leasetype);
         if (ret == -1 && errno == EACCES) {
-                set_capability(CAP_LEASE);
+                set_effective_capability(LEASE_CAPABILITY);
                 ret = fcntl(fd, F_SETLEASE, leasetype);
         }

branches/samba-3.0/source/smbd/posix_acls.c

@@ -2290 +2290 @@
 
 /****************************************************************************
- Should we override a deny ?  Check deprecated 'acl group control'
- and 'dos filemode'
-****************************************************************************/
-
-static BOOL acl_group_override(connection_struct *conn, gid_t prim_gid)
-{
-        if ( (errno == EACCES || errno == EPERM) 
-                && (lp_acl_group_control(SNUM(conn)) || lp_dos_filemode(SNUM(conn)))
-                && current_user_in_group(prim_gid)) 
-        {
+ Should we override a deny ?  Check 'acl group control' and 'dos filemode'
+****************************************************************************/
+
+static BOOL acl_group_override(connection_struct *conn, gid_t prim_gid, const char *fname)
+{
+        SMB_STRUCT_STAT sbuf;
+
+        if ((errno != EPERM) && (errno != EACCES)) {
+                return False;
+        }
+
+        /* file primary group == user primary or supplementary group */
+        if (lp_acl_group_control(SNUM(conn)) && current_user_in_group(prim_gid)) {
                 return True;
-        } 
+        }
+
+        /* user has writeable permission */
+        if (lp_dos_filemode(SNUM(conn)) && can_write_to_file(conn, fname, &sbuf)) {
+                return True;
+        }
 
         return False;
@@ -2489 +2497 @@
                         }
 
-                        if (acl_group_override(conn, prim_gid)) {
+                        if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
                                 int sret;
 
@@ -2520 +2528 @@
                         }
 
-                        if (acl_group_override(conn, prim_gid)) {
+                        if (acl_group_override(conn, prim_gid, fsp->fsp_name)) {
                                 int sret;
 
@@ -3478 +3486 @@
                                                 int sret = -1;
 
-                                                if (acl_group_override(conn, sbuf.st_gid)) {
+                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
                                                         DEBUG(5,("set_nt_acl: acl group control on and "
                                                                 "current user in file %s primary group. Override delete_def_acl\n",
@@ -3525 +3533 @@
                                         if(SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms) == -1) {
                                                 int sret = -1;
-                                                if (acl_group_override(conn, sbuf.st_gid)) {
+                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
                                                         DEBUG(5,("set_nt_acl: acl group control on and "
                                                                 "current user in file %s primary group. Override chmod\n",