Adding the patch using the "diff -u" instead of "diff" command.

$ diff -u sendmail.php sendmail-pacthed.php
--- sendmail.php        2009-05-07 11:19:43.000000000 -0300
+++ sendmail-pacthed.php        2009-05-07 12:05:11.000000000 -0300
@@ -59,7 +59,6 @@

 // Create a new log object
 $log = new Log(array('Account' => "$atmail->usern...@$atmail->pop3host"));
-
 $num = $log->logcheck('SendMail', $_SERVER['REMOTE_ADDR'],
"{$atmail->userna...@{$atmail->pop3host}");

 if ( $num > $pref['filter_max_msgs'] && $pref['filter_max_msgs'] > 1 )
@@ -116,6 +115,19 @@
        $var['msgbox'] = 'Sent';


+/**
+ * Changed by Arthur Furlan <arthur.fur...@gmail.com> on 2009-04-27
+ *
+ * Enable SMTP authentication using the POP username and password.
+ */
+if ($pref['smtpauth_use_pop3user'] == true) {
+       $pref['smtpauth_username'] = $atmail->username;
+       if ($pref['mailserver_auth'])
+               $pref['smtpauth_username'] .= '@' . $atmail->pop3host;
+       $pref['smtpauth_password'] = $auth->password;
+}
+
 // Build the message to send . Add the headers, message body and UIDL
 $sendmsg = new SendMsg(array(
   'Account'       => "$atmail->usern...@$atmail->pop3host",


$ diff -u Config.php Config-patched.php
--- Config.php  2009-05-07 11:24:05.000000000 -0300
+++ Config-patched.php  2009-05-07 11:23:56.000000000 -0300
@@ -42,6 +42,7 @@
   'filter_spf_support' => '1',
   'smtpauth_password' => '',
   'smtpauth_username' => '',
+  'smtpauth_use_pop3user' => true,
   'pop3imap_authdaemons' => '5',
   'login_rememberme' => 1,
   'allowed_domains' => '',


-- 
Regards,

Arthur Furlan
arthur.fur...@gmail.com



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to