sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f48708f18420f15801d439184c3d4b8b7e21961a)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f48708f18420f15801d439184c3d4b8b7e21961a)
- Date: Mon, 8 Dec 2008 05:16:06 -0600
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 3 +++
var/lib/sorcery/modules/libgrimoire | 15 +++++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit f48708f18420f15801d439184c3d4b8b7e21961a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libgrimoire: improved the real_rm_source_dir security check
diff --git a/ChangeLog b/ChangeLog
index f61f804..32843a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-12-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libgrimoire: improved the real_rm_source_dir security check
+
2008-12-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze, gaze.1: overhaul of export and import, changing semantics;
initial patch by Robert Figura #14661
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 5cf82b2..b1749a0 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -67,15 +67,14 @@ function real_rm_source_dir() {
debug "libgrimoire" "Running rm_source_dir() on $dead_dir"
- if [[ $dead_dir == $SOURCE_DIRECTORY ]] &&
- [[ ${SOURCE_DIRECTORY#$BUILD_DIRECTORY} == $SOURCE_DIRECTORY ]]; then
- error_message "The source directory ($SOURCE_DIRECTORY) is not under the
build"
- error_message "directory ($BUILD_DIRECTORY)! Refusing deletion for
safety reasons!"
- error_message "Please report this bug to http://bugs.sourcemage.org"
- return 1
- fi
-
if [[ -n $dead_dir ]] && [[ -d $dead_dir ]]; then
+ if [[ $dead_dir == $SOURCE_DIRECTORY ]] &&
+ [[ ${SOURCE_DIRECTORY#$BUILD_DIRECTORY} == $SOURCE_DIRECTORY ]]; then
+ error_message "The source directory ($SOURCE_DIRECTORY) is not under
the build"
+ error_message "directory ($BUILD_DIRECTORY)! Refusing deletion for
safety reasons!"
+ error_message "Please report this bug to http://bugs.sourcemage.org"
+ return 1
+ fi
pushd $BUILD_DIRECTORY 2>&1 > /dev/null
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f48708f18420f15801d439184c3d4b8b7e21961a), Jaka Kranjc, 12/08/2008
Archive powered by MHonArc 2.6.24.