[Audit-test-developer] [PATCH] Don't look for vsftpd conf on a RHEL system

[Linda K. <lin...@hp...>]

Don't look for vsftpd conf on a RHEL system

Conditionalize the test setup so that we only look for the
vsftpd conf file if its not a RHEL system since we're not supporting
vsftpd on RHEL6.
---
 audit/libpam/tests/pam_functions.bash |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/audit/libpam/tests/pam_functions.bash b/audit/libpam/tests/pam_functions.bash
index 418adc5..37b87b6 100644
--- a/audit/libpam/tests/pam_functions.bash
+++ b/audit/libpam/tests/pam_functions.bash
@@ -21,15 +21,17 @@ source testcase.bash || exit 2
 # global variables
 ######################################################################
 
-if [ -f /etc/vsftpd/vsftpd.conf ]; then
-    vsftpd_conf=/etc/vsftpd/vsftpd.conf
-elif [ -f /etc/vsftpd.conf ]; then
-    vsftpd_conf=/etc/vsftpd.conf
-else
-    exit_error "Unable to find vsftpd.conf"
-fi
+if [[ $DISTRO != "RHEL" ]] ; then
+    if [ -f /etc/vsftpd/vsftpd.conf ]; then
+        vsftpd_conf=/etc/vsftpd/vsftpd.conf
+    elif [ -f /etc/vsftpd.conf ]; then
+        vsftpd_conf=/etc/vsftpd.conf
+    else
+        exit_error "Unable to find vsftpd.conf"
+    fi
 
-vsftpd_init=/etc/init.d/vsftpd
+    vsftpd_init=/etc/init.d/vsftpd
+fi
 
 # XXX should determine this from policy
 login_context=staff_u:lspp_test_r:local_login_t:s0-s15:c0.c1023
-- 
1.7.1