aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-11-05 10:17:29 -0500
committerjim-p <jimp@pfsense.org>2013-11-05 10:18:30 -0500
commitd8e659b5118ef15dda8eed0f3edcc8a47b12e215 (patch)
treebd78e32da15ace03f49367f47abe5e1df4625b09 /config
parent3f18def7404d76dbfa10a4f1f0a317f2269805f3 (diff)
downloadpfsense-packages-d8e659b5118ef15dda8eed0f3edcc8a47b12e215.tar.gz
pfsense-packages-d8e659b5118ef15dda8eed0f3edcc8a47b12e215.tar.bz2
pfsense-packages-d8e659b5118ef15dda8eed0f3edcc8a47b12e215.zip
Fix sendmail formatting for arpwatch
Diffstat (limited to 'config')
-rw-r--r--config/arpwatch.xml2
-rw-r--r--config/sm.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/config/arpwatch.xml b/config/arpwatch.xml
index 64aadcea..bf163ad6 100644
--- a/config/arpwatch.xml
+++ b/config/arpwatch.xml
@@ -45,7 +45,7 @@
<requirements>None</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>arpwatch</name>
- <version>2.1.a14 pkg v1.1</version>
+ <version>2.1.a14 pkg v1.1.1</version>
<title>arpwatch: Settings</title>
<aftersaveredirect>pkg_edit.php?xml=arpwatch.xml&amp;id=0</aftersaveredirect>
<menu>
diff --git a/config/sm.php b/config/sm.php
index e2c56fc4..2e1cc4a0 100644
--- a/config/sm.php
+++ b/config/sm.php
@@ -23,6 +23,7 @@ if($options['s'] <> "") {
$in = file("php://stdin");
foreach($in as $line){
+ $line = trim($line);
if ( (substr($line, 0, 6) == "From: ")
|| (substr($line, 0, 6) == "Date: ")
|| (substr($line, 0, 4) == "To: "))
@@ -31,7 +32,7 @@ foreach($in as $line){
$subject = substr($line, 9);
continue;
}
- $message .= "$line";
+ $message .= "$line\n";
}
if (!empty($subject))