From d86b229aac4cb6486623c883c43f3402e84e6923 Mon Sep 17 00:00:00 2001
From: Wytze van der Raay <wytze@cacert.org>
Date: Fri, 22 Jul 2011 14:11:14 +0000
Subject: [PATCH] Fix for https://bugs.cacert.org/view.php?id=948

---
 CommModule/client.pl      | 4 ++--
 includes/general.php      | 4 ++--
 includes/mysql.php.sample | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CommModule/client.pl b/CommModule/client.pl
index 7b417d1..4e09c46 100755
--- a/CommModule/client.pl
+++ b/CommModule/client.pl
@@ -670,13 +670,13 @@ sub sendmail($$$$$$$)
   SysLog "SMTP: ".<$smtp>;
   print $smtp "HELO hlin.cacert.org\r\n";
   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>;
  
   @bits = split(",", $to);
   foreach my $user (@bits)
   {
-    print $smtp "RCPT TO: <".trim($user).">\r\n";
+    print $smtp "RCPT TO:<".trim($user).">\r\n";
     SysLog "RCPT TO: ".<$smtp>;
   }
   print $smtp "DATA\r\n";
diff --git a/includes/general.php b/includes/general.php
index 5789875..16b75e4 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -673,12 +673,12 @@
 						$line = fgets($fp, 4096);
 					if(substr($line, 0, 3) != "250")
 						continue;
-					fputs($fp, "MAIL FROM: <returns@cacert.org>\r\n");
+					fputs($fp, "MAIL FROM:<returns@cacert.org>\r\n");
 					$line = fgets($fp, 4096);
 
 					if(substr($line, 0, 3) != "250")
 						continue;
-					fputs($fp, "RCPT TO: <$email>\r\n");
+					fputs($fp, "RCPT TO:<$email>\r\n");
 					$line = trim(fgets($fp, 4096));
 					fputs($fp, "QUIT\r\n");
 					fclose($fp);
diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample
index 1f477e4..ff5cfc3 100644
--- a/includes/mysql.php.sample
+++ b/includes/mysql.php.sample
@@ -55,11 +55,11 @@
 		$InputBuffer = fgets($smtp, 1024);
 		fputs($smtp, "HELO www.cacert.org\r\n");
 		$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);
 		$bits = explode(",", $to);
 		foreach($bits as $user)
-			fputs($smtp, "RCPT TO: <".trim($user).">\r\n");
+			fputs($smtp, "RCPT TO:<".trim($user).">\r\n");
 		$InputBuffer = fgets($smtp, 1024);
 		fputs($smtp, "DATA\r\n");
 		$InputBuffer = fgets($smtp, 1024);