diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-21 15:42:18 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-21 15:42:18 +0200 |
| commit | 4136f61dbd4325a636b513513ee7c8f2cbbd3cef (patch) | |
| tree | e11f24718bb944206bbc2d27c24974167510801b | |
| parent | b0b62cb3270b842c1fbe37c8a29a02ac85b09d00 (diff) | |
| download | abrt-4136f61dbd4325a636b513513ee7c8f2cbbd3cef.tar.gz abrt-4136f61dbd4325a636b513513ee7c8f2cbbd3cef.tar.xz abrt-4136f61dbd4325a636b513513ee7c8f2cbbd3cef.zip | |
remove "rename(DEBUG_DUMPS_DIR_OLD, DEBUG_DUMPS_DIR)" compat kludge
It causes selinux problems by itself. Even though we ovn both dirs,
attempting to move them is not allowed...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Daemon/Daemon.cpp | 6 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 75860a9d..6f82e01f 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,6 @@ PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins' PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}' ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1' -DEBUG_DUMPS_DIR_OLD='${localstatedir}/cache/${PACKAGE_NAME}' DEBUG_DUMPS_DIR='${localstatedir}/spool/${PACKAGE_NAME}' DEBUG_INFO_DIR='${localstatedir}/cache/${PACKAGE_NAME}-di' @@ -91,7 +90,6 @@ AC_SUBST(CONF_DIR) AC_SUBST(VAR_RUN) AC_SUBST(PLUGINS_CONF_DIR) AC_SUBST(PLUGINS_LIB_DIR) -AC_SUBST(DEBUG_DUMPS_DIR_OLD) AC_SUBST(DEBUG_DUMPS_DIR) AC_SUBST(DEBUG_INFO_DIR) AC_SUBST(DL_LIBS, -ldl) diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 55bbcea8..f3ecb5f4 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -678,12 +678,6 @@ static void ensure_writable_dir(const char *dir, mode_t mode, const char *user) static void sanitize_dump_dir_rights() { - /* Compat kludge, remove after 1.3.0 - * (and remove DEBUG_DUMPS_DIR_OLD define everywhere) - */ - if (rename(DEBUG_DUMPS_DIR_OLD, DEBUG_DUMPS_DIR) == 0) - symlink(DEBUG_DUMPS_DIR, DEBUG_DUMPS_DIR_OLD); - /* We can't allow everyone to create dumps: otherwise users can flood * us with thousands of bogus or malicious dumps */ /* 07000 bits are setuid, setgit, and sticky, and they must be unset */ diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index 95415463..382f104f 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -17,7 +17,6 @@ abrtd_CPPFLAGS = \ -DBIN_DIR=\"$(bindir)\" \ -DVAR_RUN=\"$(VAR_RUN)\" \ -DCONF_DIR=\"$(CONF_DIR)\" \ - -DDEBUG_DUMPS_DIR_OLD=\"$(DEBUG_DUMPS_DIR_OLD)\" \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ |