aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 548c2f98dd..b32350552b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10 Jon Trowbridge <trow@ximian.com>
+
+ * e-msg-composer.c (get_file_content): Only execute an executable
+ sig file if a magic environment variable is set.
+
2001-12-06 Jon Trowbridge <trow@ximian.com>
* e-msg-composer.c (executed_file_output): Added. Executes the
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index b52295314c..d9df329775 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -727,7 +727,8 @@ get_file_content (const char *file_name, gboolean convert, guint flags)
if (stat (file_name, &statbuf) == -1)
return g_strdup ("");
- if (statbuf.st_mode & S_IXUSR) {
+ if ((statbuf.st_mode & S_IXUSR)
+ && getenv ("EVOLUTION_PLEASE_EXECUTE_MY_SIGNATURE_FILE")) {
raw = executed_file_output (file_name);
if (raw == NULL) {