More patches by Sunil.

[~andy/fetchmail] / env.c

diff --git a/env.c b/env.c
index f83c0f02e84d39317290d64336f0d1d729d5d727..8fe2103d6548a1b271b1f06e94691b7eaffabe64 100644 (file)
--- a/env.c
+++ b/env.c
@@ -49,6 +49,35 @@ void envquery(int argc, char **argv)
        }
     }
 
+    if ((program_name = strrchr(argv[0], '/')) != NULL)
+       ++program_name;
+    else
+       program_name = argv[0];
+
+    if (getenv("QMAILINJECT") && strcmp(getenv("QMAILINJECT"), ""))
+    {
+       fprintf(stderr,
+               GT_("%s: The QMAILINJECT environment variable is set.\n"
+                   "This is dangerous as it can make qmail-inject or qmail's sendmail wrapper\n"  
+                   "tamper with your From: or Message-ID: headers.\n"
+                   "Try \"env QMAILINJECT= %s YOUR ARGUMENTS HERE\"\n"
+                   "%s: Abort.\n"), 
+               program_name, program_name, program_name);
+       exit(PS_UNDEFINED);
+    }
+
+    if (getenv("NULLMAILER_FLAGS") && strcmp(getenv("NULLMAILER_FLAGS"), ""))
+    {
+       fprintf(stderr,
+               GT_("%s: The NULLMAILER_FLAGS environment variable is set.\n"
+                   "This is dangerous as it can make nullmailer-inject or nullmailer's\n" 
+                   "sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+                   "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
+                   "%s: Abort.\n"), 
+               program_name, program_name, program_name);
+       exit(PS_UNDEFINED);
+    }
+
     if (!(pwp = getpwuid(getuid())))
     {
        fprintf(stderr,
@@ -85,11 +114,6 @@ void envquery(int argc, char **argv)
     if (!(fmhome = getenv("FETCHMAILHOME")))
        fmhome = home;
 
-    if ((program_name = strrchr(argv[0], '/')) != NULL)
-       ++program_name;
-    else
-       program_name = argv[0];
-
 #define RCFILE_NAME    "fetchmailrc"
     /*
      * The (fmhome==home) leaves an extra character for a . at the
@@ -189,12 +213,12 @@ char *rfc822timestamp(void)
      * weird multibyte i18n characters (such as kanji) from showing up
      * in your Received headers.
      */
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
+#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
     setlocale (LC_TIME, "C");
 #endif
     strftime(buf, sizeof(buf)-1, 
             "%a, %d %b %Y %H:%M:%S XXXXX (%Z)", localtime(&now));
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
+#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
     setlocale (LC_TIME, "");
 #endif
     strncpy(strstr(buf, "XXXXX"), tzoffset(&now), 5);