Changeset 620 for trunk/server/source3/smbd

Timestamp:

Aug 6, 2011, 6:50:53 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.11

Location:

trunk/server/source3/smbd

Files:

• file_access.c (modified) (1 diff)
• negprot.c (modified) (1 diff)
• open.c (modified) (2 diffs)
• server.c (modified) (1 diff)

trunk/server/source3/smbd/file_access.c

@@ -76 +76 @@
         if (!CAN_WRITE(conn)) {
                 return False;
+        }
+
+        if (!lp_acl_check_permissions(SNUM(conn))) {
+                /* This option means don't check. */
+                return true;
         }
 

trunk/server/source3/smbd/negprot.c

@@ -383 +383 @@
                         return;
                 }
+                p += ret;
                 DEBUG(3,("not using SPNEGO\n"));
         } else {

trunk/server/source3/smbd/open.c

@@ -86 +86 @@
         NTSTATUS status;
         struct security_descriptor *sd = NULL;
+
+        if ((access_mask & DELETE_ACCESS) && !lp_acl_check_permissions(SNUM(conn))) {
+                *access_granted = access_mask;
+
+                DEBUG(10,("smbd_check_open_rights: not checking ACL "
+                        "on DELETE_ACCESS on file %s. Granting 0x%x\n",
+                        smb_fname_str_dbg(smb_fname),
+                        (unsigned int)*access_granted ));
+                return NT_STATUS_OK;
+        }
 
         status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
@@ -2968 +2978 @@
         /* Setting FILE_SHARE_DELETE is the hint. */
 
-        if (lp_acl_check_permissions(SNUM(conn))
-            && (create_disposition != FILE_CREATE)
+        if ((create_disposition != FILE_CREATE)
             && (access_mask & DELETE_ACCESS)
             && (!(can_delete_file_in_directory(conn, smb_fname) ||

trunk/server/source3/smbd/server.c

@@ -279 +279 @@
         }
 
-        DEBUG(0, ("Could not find child %d -- ignoring\n", (int)pid));
+        /* not all forked child processes are added to the children list */
+        DEBUG(1, ("Could not find child %d -- ignoring\n", (int)pid));
 }