From f944d2a73bc89b68054fd7f72c08b76bc40692b3 Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Aug 09 2013 15:32:11 +0000
Subject: test is now self contained, fixed variables


---

diff --git a/tests/p_postfix/40_postfix_sasl.sh b/tests/p_postfix/40_postfix_sasl.sh
index 76f50e5..70fd565 100755
--- a/tests/p_postfix/40_postfix_sasl.sh
+++ b/tests/p_postfix/40_postfix_sasl.sh
@@ -8,38 +8,47 @@ t_InstallPackage dovecot nc
 
 if [ $centos_ver = 6 ]
   then
+  #creating backups of changed files
+  cp -a /etc/postfix/main.cf /etc/postfix/main.cf_testing
+  cp -a /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf_testing
+
   #adding parameters to postfix
   cat >> /etc/postfix/main.cf <<EOF
-  smtpd_sasl_auth_enable = yes
-  broken_sasl_auth_clients = yes
-  smtpd_sasl_type = dovecot
-  smtpd_sasl_path = private/auth
-  smtpd_sasl_security_options = noanonymous
+smtpd_sasl_auth_enable = yes
+broken_sasl_auth_clients = yes
+smtpd_sasl_type = dovecot
+smtpd_sasl_path = private/auth
+smtpd_sasl_security_options = noanonymous
 
-  smtpd_recipient_restrictions =
+smtpd_recipient_restrictions =
       permit_mynetworks,
       permit_sasl_authenticated,
       reject_unauth_destination
-  EOF
+EOF
+
   #adding parameters to dovecot
   cat >> /etc/dovecot/dovecot.conf <<EOF
-  service auth {
-    unix_listener /var/spool/postfix/private/auth {
-      mode = 0660
-      user = postfix
-      group = postfix        
-    }
+service auth {
+  unix_listener /var/spool/postfix/private/auth {
+    mode = 0660
+    user = postfix
+    group = postfix
   }
-  EOF
+}
+EOF
   #restarting services
   t_ServiceControl postfix restart
   t_ServiceControl dovecot restart
 
   #Running test
   echo "ehlo test" | nc -w 3 localhost 25 | grep -q 'AUTH PLAIN'
-  ret_val = $?
+  ret_val=$?
 else
   t_Log 'C5 System, test not yet working, skipping'
-  ret_val = 0
+  ret_val=0
 fi
+# restoring changed files
+mv -f /etc/postfix/main.cf_testing /etc/postfix/main.cf
+mv -f /etc/dovecot/dovecot.conf_testing /etc/dovecot/dovecot.conf
+
 t_CheckExitStatus $ret_val