Changeset 745 for trunk/server/source3/lib/fault.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/fault.c (modified) (8 diffs)

trunk/server/source3/lib/fault.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
@@ -56 +57 @@
 #ifndef __OS2__ /* don't use the built in signal capture stuff - prefer native handling of errors */
 #ifdef SIGSEGV
-                CatchSignal(SIGSEGV,SIGNAL_CAST SIG_DFL);
+                CatchSignal(SIGSEGV, SIG_DFL);
 #endif
 #ifdef SIGBUS
-                CatchSignal(SIGBUS,SIGNAL_CAST SIG_DFL);
+                CatchSignal(SIGBUS, SIG_DFL);
 #endif
 #ifdef SIGABRT
-                CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
+                CatchSignal(SIGABRT, SIG_DFL);
 #endif
 #endif
@@ -87 +88 @@
 #ifndef __OS2__ /* don't use the built in signal capture stuff - prefer native handling of errors */
 #ifdef SIGSEGV
-        CatchSignal(SIGSEGV,SIGNAL_CAST sig_fault);
+        CatchSignal(SIGSEGV, sig_fault);
 #endif
 #ifdef SIGBUS
-        CatchSignal(SIGBUS,SIGNAL_CAST sig_fault);
+        CatchSignal(SIGBUS, sig_fault);
 #endif
 #ifdef SIGABRT
-        CatchSignal(SIGABRT,SIGNAL_CAST sig_fault);
+        CatchSignal(SIGABRT, sig_fault);
 #endif
 #endif
@@ -197 +198 @@
 #endif
 
+#if defined(HAVE_SYS_KERNEL_PROC_CORE_PATTERN)
+
+/**
+ * Get the Linux corepath.
+ *
+ * On Linux the contents of /proc/sys/kernel/core_pattern indicates the
+ * location of the core path.
+ */
+static char *get_linux_corepath(void)
+{
+        char *end;
+        int fd;
+        char *result;
+
+        fd = open("/proc/sys/kernel/core_pattern", O_RDONLY, 0);
+        if (fd == -1) {
+                return NULL;
+        }
+
+        result = afdgets(fd, NULL, 0);
+        close(fd);
+
+        if (result == NULL) {
+                return NULL;
+        }
+
+        if (result[0] != '/') {
+                /*
+                 * No absolute path, use the default (cwd)
+                 */
+                TALLOC_FREE(result);
+                return NULL;
+        }
+        /* Strip off the common filename expansion */
+
+        end = strrchr_m(result, '/');
+
+        if ((end != result) /* this would be the only / */
+            && (end != NULL)) {
+                *end = '\0';
+        }
+        return result;
+}
+#endif
+
+
 /**
  * Try getting system-specific corepath if one exists.
@@ -205 +252 @@
 {
 #if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
-
-        /* @todo: Add support for the linux corepath. */
-
         char *tmp_corepath = NULL;
         tmp_corepath = get_freebsd_corepath();
+
+        /* If this has been set correctly, we're done. */
+        if (tmp_corepath) {
+                return tmp_corepath;
+        }
+#endif
+
+#if defined(HAVE_SYS_KERNEL_PROC_CORE_PATTERN)
+        char *tmp_corepath = NULL;
+        tmp_corepath = get_linux_corepath();
 
         /* If this has been set correctly, we're done. */
@@ -271 +325 @@
 #endif
 
-#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
-        /* On Linux we lose the ability to dump core when we change our user
-         * ID. We know how to dump core safely, so let's make sure we have our
-         * dumpable flag set.
-         */
-        prctl(PR_SET_DUMPABLE, 1);
-#endif
-
         /* FIXME: if we have a core-plus-pid facility, configurably set
          * this up here.
@@ -309 +355 @@
          * file to the corepath.  There must not be an unbecome_root() before
          * we call abort(). */
-        if (geteuid() != 0) {
+        if (geteuid() != sec_initial_uid()) {
                 become_root();
         }
@@ -334 +380 @@
         dbgflush();
 
+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
+        /* On Linux we lose the ability to dump core when we change our user
+         * ID. We know how to dump core safely, so let's make sure we have our
+         * dumpable flag set.
+         */
+        prctl(PR_SET_DUMPABLE, 1);
+#endif
+
         /* Ensure we don't have a signal handler for abort. */
 #ifdef SIGABRT
-        CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
+        CatchSignal(SIGABRT, SIG_DFL);
 #endif