summaryrefslogtreecommitdiff
path: root/source3/lib/fault.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-04-23 15:12:35 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-04-23 15:12:35 +0200
commit53d491c9a4011a7d9ad69db52fb91d163f3f990a (patch)
tree9d0ed3130f35142da50c2e20e8addfe8909f459f /source3/lib/fault.c
parentaf6298a84dffb400551861c6dc34591f1473830c (diff)
parent1722859abd169f2949b5822f97c810f2b8d162da (diff)
downloadsamba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.gz
samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.bz2
samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/lib/fault.c')
-rw-r--r--source3/lib/fault.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index efd1dddfd4..51fc53bb0d 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -194,17 +194,18 @@ static char *get_freebsd_corepath(void)
*/
static char *get_corepath(const char *logbase, const char *progname)
{
- char *tmp_corepath = NULL;
+#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
/* @todo: Add support for the linux corepath. */
-#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
+
+ char *tmp_corepath = NULL;
tmp_corepath = get_freebsd_corepath();
-#endif
/* If this has been set correctly, we're done. */
if (tmp_corepath) {
return tmp_corepath;
}
+#endif
/* Fall back to the default. */
return get_default_corepath(logbase, progname);