ValidateMailRcpts removed for problems when could be enviromental

settings exported under wrong user.

diff --git a/src/cron.c b/src/cron.c
index fea297adafc88855704b80d773660f9be49f0588..c14aba58b8ef2e55663cd9b22b29c8a59d152ba2 100644 (file)
--- a/src/cron.c
+++ b/src/cron.c
@@ -177,9 +177,6 @@ int main(int argc, char *argv[]) {
                exit(1);
        }
 
-       if (getenv("CRON_VALIDATE_MAILRCPTS") != 0L)
-               ValidateMailRcpts = 1;
-
        /* Get the default locale character set for the mail 
         * "Content-Type: ...; charset=" header
         */

diff --git a/src/do_command.c b/src/do_command.c
index 6a7341067cd21290d3d88c38026005a8b864ba3f..b4917a17d1a24fdead4359f90793cb7021bc0788 100644 (file)
--- a/src/do_command.c
+++ b/src/do_command.c
@@ -369,9 +369,7 @@ static void child_process(entry * e, user * u) {
                         * up the mail command and subjects and stuff...
                         */
 
-                       if (mailto && ((ValidateMailRcpts == 0) || safe_p(usernm, mailto))
-                               /* Why validate the mail recipient name ? All mailers do this anyway... JVD */
-                               ) {
+                       if (mailto && safe_p(usernm, mailto)) {
                                char **env;
                                char mailcmd[MAX_COMMAND];
                                char hostname[MAXHOSTNAMELEN];

diff --git a/src/globals.h b/src/globals.h
index cdcf578a936c66e7e57ce95cf59763f92a776efe..82e69801bbe22f761cc918b955d4586a3018c336 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -64,7 +64,6 @@ XTRN int      LineNumber;
 XTRN time_t    StartTime;
 XTRN int       NoFork;
 XTRN int        PermitAnyCrontab;
-XTRN int        ValidateMailRcpts;
 XTRN char       MailCmd[MAX_COMMAND];
 XTRN char       cron_default_mail_charset[MAX_ENVSTR];