Revision: 7321
http://sourceforge.net/p/ipcop/svn/7321
Author: owes
Date: 2014-03-14 16:16:36 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Since we will be often asking for output of emailhelper -v in case of sendemail
trouble, help to poor user a little by obfuscating private information.
Modified Paths:
--------------
ipcop/trunk/src/misc-progs/emailhelper.c
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
Modified: ipcop/trunk/src/misc-progs/emailhelper.c
===================================================================
--- ipcop/trunk/src/misc-progs/emailhelper.c 2014-03-14 09:01:35 UTC (rev
7320)
+++ ipcop/trunk/src/misc-progs/emailhelper.c 2014-03-14 16:16:36 UTC (rev
7321)
@@ -57,6 +57,7 @@
static int flag_delete_messagefile = 0;
static int flag_attachment = 0;
static char command[STRING_SIZE_LARGE];
+static char command_p[STRING_SIZE_LARGE];
static char sed[STRING_SIZE_LARGE];
static char tmpEmailFile[STRING_SIZE] = "/tmp/email.msg.tmp";
@@ -400,15 +401,21 @@
snprintf(command, STRING_SIZE_LARGE,
- "/usr/bin/sendEmail -s %s%s %s %s -f %s -t %s %s %s %s -o tls=%s
-o message-charset=utf-8", server, port, user, password, from, to, subject,
message, attachment, tls);
+ "/usr/bin/sendEmail -s %s%s %s %s -f %s -t %s %s %s %s -o tls=%s
-o message-charset=utf-8",
+ server, port, user, password, from, to, subject, message,
attachment, tls);
+ snprintf(command_p, STRING_SIZE_LARGE,
+ "/usr/bin/sendEmail -s %s%s %s %s -f %s -t %s %s %s %s -o tls=%s
-o message-charset=utf-8",
+ server, port, "-xu <username>", "-xp <password>", "<email-from>",
"<email-to>", subject, message, attachment, tls);
if (flag_verbose >= 2) {
strcat(command, " -vv");
+ strcat(command_p, " -vv");
}
else if (flag_verbose) {
strcat(command, " -v");
+ strcat(command_p, " -v");
}
- verbose_printf(2, "Command: %s\n", command);
+ verbose_printf(1, "Command: %s\n", command_p);
rc = safe_system(command);
if (rc) {
fprintf(stdout, "Couldn't send Email, sendEmail exitcode: %d\n", rc);
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-14 09:01:35 UTC
(rev 7320)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-14 16:16:36 UTC
(rev 7321)
@@ -4,6 +4,7 @@
/home/httpd/cgi-bin/proxy.cgi
/home/httpd/cgi-bin/updates.cgi
/home/httpd/cgi-bin/urlfilter.cgi
+/usr/local/bin/emailhelper
/usr/local/bin/vpn-watch
/usr/share/locale/el_GR/LC_MESSAGES/ipcop.mo
/usr/share/locale/tr_TR/LC_MESSAGES/ipcop.mo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
