From 65e2c9e92c8ef52fc6d47348ddd1bf255e069701 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Fri, 26 Jun 2009 19:20:19 +0000
Subject: Simplified diff checks.

---
 cron-sh/scripts/05_access.sh | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'cron-sh/scripts/05_access.sh')

diff --git a/cron-sh/scripts/05_access.sh b/cron-sh/scripts/05_access.sh
index e63a3c8..b66e87f 100755
--- a/cron-sh/scripts/05_access.sh
+++ b/cron-sh/scripts/05_access.sh
@@ -20,18 +20,8 @@ fi
 
 # check for changes in users
 if [[ ${CHECK_USERS} == yes ]]; then
-        getent passwd | cut -f 1 -d : | sort > ${USERS_LIST_TODAY}
-        if [[ -f ${USERS_LIST_YESTERDAY} ]]; then
-                if ! diff -u ${USERS_LIST_YESTERDAY} ${USERS_LIST_TODAY} > ${USERS_LIST_DIFF}; then
-                    printf "\nSecurity Warning: Changes in list of users found :\n" >> ${DIFF}
-                    grep '^+' ${USERS_LIST_DIFF} | grep -vw "^+++ " | sed 's|^.||'|sed -e 's/%/%%/g' | while read file; do
-                        printf "\t\t-       Newly added users : ${file}\n"
-                    done >> ${DIFF}
-                    grep '^-' ${USERS_LIST_DIFF} | grep -vw "^--- " | sed 's|^.||'|sed -e 's/%/%%/g' | while read file; do
-                        printf "\t\t- No longer present users : ${file}\n"
-                    done >> ${DIFF}
-                fi
-        fi
+    getent passwd | cut -f 1 -d : | sort > ${USERS_LIST_TODAY}
+    Diffcheck ${USERS_LIST_TODAY} ${USERS_LIST_YESTERDAY} ${USERS_LIST_DIFF} "local users"
 fi
 
 # check for changes in groups
@@ -45,18 +35,8 @@ fi
 
 # check for changes in groups
 if [[ ${CHECK_GROUPS} == yes ]]; then
-        getent passwd | cut -f 1 -d : | sort > ${GROUPS_LIST_TODAY}
-        if [[ -f ${GROUPS_LIST_YESTERDAY} ]]; then
-                if ! diff -u ${GROUPS_LIST_YESTERDAY} ${GROUPS_LIST_TODAY} > ${GROUPS_LIST_DIFF}; then
-                    printf "\nSecurity Warning: Changes in list of groups found :\n" >> ${DIFF}
-                    grep '^+' ${GROUPS_LIST_DIFF} | grep -vw "^+++ " | sed 's|^.||'|sed -e 's/%/%%/g' | while read file; do
-                        printf "\t\t-       Newly added groups : ${file}\n"
-                    done >> ${DIFF}
-                    grep '^-' ${GROUPS_LIST_DIFF} | grep -vw "^--- " | sed 's|^.||'|sed -e 's/%/%%/g' | while read file; do
-                        printf "\t\t- No longer present groups : ${file}\n"
-                    done >> ${DIFF}
-                fi
-        fi
+    getent passwd | cut -f 1 -d : | sort > ${GROUPS_LIST_TODAY}
+    Diffcheck ${GROUPS_LIST_TODAY} ${GROUPS_LIST_YESTERDAY} ${GROUPS_LIST_DIFF} "local groups"
 fi
 
 ### Passwd file check
-- 
cgit v1.2.1