diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-26 12:33:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 12:33:38 +0300 |
| commit | 2ec0268692ed2a487f63d1d0ccfb6d6bef2af609 (patch) | |
| tree | 11ab7c52c086febaa86a7471b94f9dc66c170110 /include | |
| parent | ce8c9f44a09272f5e4208b09aa93767e19ade952 (diff) | |
| parent | b8a0190e82125a17eb82a36402cb7ae0321cd6b3 (diff) | |
Merge pull request #732 from Marzal/Marzal-FILE-7524
Changes for new profile format
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions | 4 | ||||
| -rw-r--r-- | include/tests_file_permissions | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/functions b/include/functions index fb82e319..4c363faa 100644 --- a/include/functions +++ b/include/functions @@ -208,10 +208,10 @@ # If 'file' is an directory, use -d if [ -d ${CHECKFILE} ]; then FILEVALUE=$(ls -d -l ${CHECKFILE} | cut -c 2-10) - PROFILEVALUE=$(grep '^permdir' ${PROFILE} | grep ":${CHECKFILE}:" | cut -d: -f3) + PROFILEVALUE=$(grep '^permdir' ${PROFILE} | grep "=${CHECKFILE}:" | cut -d: -f2) else FILEVALUE=$(ls -l ${CHECKFILE} | cut -c 2-10) - PROFILEVALUE=$(grep '^permfile' ${PROFILE} | grep ":${CHECKFILE}:" | cut -d: -f3) + PROFILEVALUE=$(grep '^permfile' ${PROFILE} | grep "=${CHECKFILE}:" | cut -d: -f2) fi if [ "${FILEVALUE}" = "${PROFILEVALUE}" ]; then PERMS="OK"; else PERMS="BAD"; fi fi diff --git a/include/tests_file_permissions b/include/tests_file_permissions index 2c43fc0e..108b830e 100644 --- a/include/tests_file_permissions +++ b/include/tests_file_permissions @@ -34,7 +34,7 @@ LogText "Test: Checking file permissions" for PROFILE in ${PROFILES}; do LogText "Using profile ${PROFILE} for baseline." - FIND=$(${EGREPBINARY} '^permfile=|^permdir=' ${PROFILE} | ${CUTBINARY} -d= -f2) + FIND=$(${EGREPBINARY} '^permfile=|^permdir=' ${PROFILE} | ${CUTBINARY} -d= -f2 | ${CUTBINARY} -d: -f1) for I in ${FIND}; do LogText "Checking ${I}" CheckFilePermissions "${I}" |