From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 4 Dec 2009 03:26:25 +0000 (+0000)
Subject: only add apache to trusted-users file if its not already in there
X-Git-Tag: MyPLC-4.3-33~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fe9648c46de34c2d98466349f8f73f610a93bbec;p=myplc.git

only add apache to trusted-users file if its not already in there
---

diff --git a/plc.d/mail b/plc.d/mail
index fba0973..01441b7 100755
--- a/plc.d/mail
+++ b/plc.d/mail
@@ -28,7 +28,10 @@ case "$1" in
 
 	# Add apache to list of users that can send mail as others
 	# without a warning, so that the API can send out mail.
-	echo "apache" >/etc/mail/trusted-users
+	count=$(grep ^apache /etc/mail/trusted-users|wc -l)
+	if [ $count -eq 0 ] ; then
+	        echo "apache" >>/etc/mail/trusted-users
+	fi
 
 	(exec 3>&- 4>&- ; service sendmail start)
 	check