Changeset 423 for branches/samba-3.3.x/source

Timestamp:

Mar 9, 2010, 7:58:12 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.12

Location:

branches/samba-3.3.x/source

Files:

• VERSION (modified) (1 diff)
• include/smb.h (modified) (1 diff)
• lib/system.c (modified) (4 diffs)
• smbd/server.c (modified) (1 diff)

branches/samba-3.3.x/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=3
-SAMBA_VERSION_RELEASE=11
+SAMBA_VERSION_RELEASE=12
 
 ########################################################

branches/samba-3.3.x/source/include/smb.h

@@ -1685 +1685 @@
     KERNEL_OPLOCK_CAPABILITY,
     DMAPI_ACCESS_CAPABILITY,
-    LEASE_CAPABILITY,
-    KILL_CAPABILITY
+    LEASE_CAPABILITY
 };
 

branches/samba-3.3.x/source/lib/system.c

@@ -708 +708 @@
 #if defined(HAVE_POSIX_CAPABILITIES)
 
-/* This define hasn't made it into the glibc capabilities header yet. */
-#ifndef SECURE_NO_SETUID_FIXUP
-#define SECURE_NO_SETUID_FIXUP          2
-#endif
-
 /**************************************************************************
  Try and abstract process capabilities (for systems that have them).
@@ -743 +738 @@
 #endif
 
-#if defined(HAVE_PRCTL) && defined(PR_SET_SECUREBITS) && defined(SECURE_NO_SETUID_FIXUP)
-        /* New way of setting capabilities as "sticky". */
-
-        /*
-         * Use PR_SET_SECUREBITS to prevent setresuid()
-         * atomically dropping effective capabilities on
-         * uid change. Only available in Linux kernels
-         * 2.6.26 and above.
-         *
-         * See here:
-         * http://www.kernel.org/doc/man-pages/online/pages/man7/capabilities.7.html
-         * for details.
-         *
-         * Specifically the CAP_KILL capability we need
-         * to allow Linux threads under different euids
-         * to send signals to each other.
-         */
-
-        if (prctl(PR_SET_SECUREBITS, 1 << SECURE_NO_SETUID_FIXUP)) {
-                DEBUG(0,("set_process_capability: "
-                        "prctl PR_SET_SECUREBITS failed with error %s\n",
-                        strerror(errno) ));
-                return false;
-        }
-#endif
-
         cap = cap_get_proc();
         if (cap == NULL) {
@@ -797 +766 @@
 #endif
                         break;
-                case KILL_CAPABILITY:
-#ifdef CAP_KILL
-                        cap_vals[num_cap_vals++] = CAP_KILL;
-#endif
-                        break;
         }
 
@@ -811 +775 @@
         }
 
-        /*
-         * Ensure the capability is effective. We assume that as a root
-         * process it's always permitted.
-         */
-
-        if (cap_set_flag(cap, CAP_EFFECTIVE, num_cap_vals, cap_vals,
-                        enable ? CAP_SET : CAP_CLEAR) == -1) {
-                DEBUG(0, ("set_process_capability: cap_set_flag effective "
-                        "failed (%d): %s\n",
-                        (int)capability,
-                        strerror(errno)));
-                cap_free(cap);
-                return false;
-        }
+        cap_set_flag(cap, CAP_EFFECTIVE, num_cap_vals, cap_vals,
+                enable ? CAP_SET : CAP_CLEAR);
 
         /* We never want to pass capabilities down to our children, so make
          * sure they are not inherited.
          */
-        if (cap_set_flag(cap, CAP_INHERITABLE, num_cap_vals,
-                        cap_vals, CAP_CLEAR) == -1) {
-                DEBUG(0, ("set_process_capability: cap_set_flag inheritable "
-                        "failed (%d): %s\n",
-                        (int)capability,
-                        strerror(errno)));
-                cap_free(cap);
-                return false;
-        }
+        cap_set_flag(cap, CAP_INHERITABLE, num_cap_vals, cap_vals, CAP_CLEAR);
 
         if (cap_set_proc(cap) == -1) {
-                DEBUG(0, ("set_process_capability: cap_set_flag (%d) failed: %s\n",
-                        (int)capability,
+                DEBUG(0, ("set_process_capability: cap_set_proc failed: %s\n",
                         strerror(errno)));
                 cap_free(cap);

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

@@ -1248 +1248 @@
         gain_root_group_privilege();
 
-        /*
-         * Ensure we have CAP_KILL capability set on Linux,
-         * where we need this to communicate with threads.
-         * This is inherited by new threads, but not by new
-         * processes across exec().
-         */
-        set_effective_capability(KILL_CAPABILITY);
-
         fault_setup((void (*)(void *))exit_server_fault);
         dump_core_setup("smbd");