cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

Fix for https://bugs.cacert.org/view.php?id=948

Browse source
This commit is contained in:
Wytze van der Raay 2011-07-22 14:11:14 +00:00
parent 6f50254e57
commit d86b229aac
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CommModule/client.pl
View file

@ -670,13 +670,13 @@ sub sendmail($$$$$$$)
SysLog "SMTP: ".<$smtp>; SysLog "SMTP: ".<$smtp>;
print $smtp "HELO hlin.cacert.org\r\n"; print $smtp "HELO hlin.cacert.org\r\n";
SysLog "SMTP: ".<$smtp>; SysLog "SMTP: ".<$smtp>;
print $smtp "MAIL FROM: <returns\@cacert.org>\r\n"; print $smtp "MAIL FROM:<returns\@cacert.org>\r\n";
SysLog "MAIL FROM: ".<$smtp>; SysLog "MAIL FROM: ".<$smtp>;
@bits = split(",", $to); @bits = split(",", $to);
foreach my $user (@bits) foreach my $user (@bits)
{ {
print $smtp "RCPT TO: <".trim($user).">\r\n"; print $smtp "RCPT TO:<".trim($user).">\r\n";
SysLog "RCPT TO: ".<$smtp>; SysLog "RCPT TO: ".<$smtp>;
} }
print $smtp "DATA\r\n"; print $smtp "DATA\r\n";

4
includes/general.php
View file

@ -673,12 +673,12 @@
$line = fgets($fp, 4096); $line = fgets($fp, 4096);
if(substr($line, 0, 3) != "250") if(substr($line, 0, 3) != "250")
continue; continue;
fputs($fp, "MAIL FROM: <returns@cacert.org>\r\n"); fputs($fp, "MAIL FROM:<returns@cacert.org>\r\n");
$line = fgets($fp, 4096); $line = fgets($fp, 4096);
if(substr($line, 0, 3) != "250") if(substr($line, 0, 3) != "250")
continue; continue;
fputs($fp, "RCPT TO: <$email>\r\n"); fputs($fp, "RCPT TO:<$email>\r\n");
$line = trim(fgets($fp, 4096)); $line = trim(fgets($fp, 4096));
fputs($fp, "QUIT\r\n"); fputs($fp, "QUIT\r\n");
fclose($fp); fclose($fp);

4
includes/mysql.php.sample
View file

@ -55,11 +55,11 @@
$InputBuffer = fgets($smtp, 1024); $InputBuffer = fgets($smtp, 1024);
fputs($smtp, "HELO www.cacert.org\r\n"); fputs($smtp, "HELO www.cacert.org\r\n");
$InputBuffer = fgets($smtp, 1024); $InputBuffer = fgets($smtp, 1024);
fputs($smtp, "MAIL FROM: <returns@cacert.org>\r\n"); fputs($smtp, "MAIL FROM:<returns@cacert.org>\r\n");
$InputBuffer = fgets($smtp, 1024); $InputBuffer = fgets($smtp, 1024);
$bits = explode(",", $to); $bits = explode(",", $to);
foreach($bits as $user) foreach($bits as $user)
fputs($smtp, "RCPT TO: <".trim($user).">\r\n"); fputs($smtp, "RCPT TO:<".trim($user).">\r\n");
$InputBuffer = fgets($smtp, 1024); $InputBuffer = fgets($smtp, 1024);
fputs($smtp, "DATA\r\n"); fputs($smtp, "DATA\r\n");
$InputBuffer = fgets($smtp, 1024); $InputBuffer = fgets($smtp, 1024);