diff --git a/ADconnection.sh b/ADconnection.sh index 155fcb9..222f231 100644 --- a/ADconnection.sh +++ b/ADconnection.sh @@ -92,26 +92,26 @@ sudo echo "administrator ALL=(ALL:ALL) ALL" >> /etc/sudoers.d/sudoers sudo echo "%domain^admins ALL=(ALL:ALL) ALL" >> /etc/sudoers.d/sudoers sudo echo "%$myhost""sudoers ALL=(ALL:ALL) ALL" >> /etc/sudoers.d/sudoers sudo echo "%DOMAIN\ admins@$DOMAIN ALL=(ALL) ALL" >> /etc/sudoers.d/domain_admins -therealm=$(realm discover | grep -i configured: | cut -d ':' -f2 | sed -e 's/^[[:space:]]*//') +therealm=$(realm discover $DOMAIN | grep -i configured: | cut -d ':' -f2 | sed -e 's/^[[:space:]]*//') if [ $therealm = no ] then echo Realm configured?.. "${RED_TEXT}"FAIL"${END}" else echo Realm configured?.. "${INTRO_TEXT}"OK"${END}" fi -if [ -f /etc/sudoers.d/sudoers ] +if [ -f /etc/sudoers.d/admins ] then echo Checking sudoers file.. "${INTRO_TEXT}"OK"${END}" -grouPs=$(cat /etc/sudoers.d/sudoers | grep -i $myhost | cut -d '%' -f2 | cut -d '=' -f1 | sed -e 's/\//g') +else +echo checking sudoers file.. "${RED_TEXT}"FAIL"${END}" +fi +grouPs=$(cat /etc/sudoers.d/admins | grep -i $myhost | cut -d '%' -f2 | cut -d '=' -f1 | sed -e 's/\//g') if [ $grouPs = "$myhost""sudoers" ] then echo Checking sudoers users.. "${INTRO_TEXT}"OK"${END}" else echo Checking sudoers users.. "${RED_TEXT}"FAIL"${END}" fi -else -echo checking sudoers file.. "${RED_TEXT}"FAIL"${END}" -fi homedir=$(cat /etc/pam.d/common-session | grep homedir | grep 0022 | cut -d '=' -f3) if [ $homedir = 0022 ] then @@ -126,13 +126,6 @@ echo Checking PAM auth configuration.. "${INTRO_TEXT}"OK"${END}" else echo Checking PAM auth configuration.. "${RED_TEXT}"FAIL"${END}" fi -guest=$(cat /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf | grep -i allow-guest | grep -i false | cut -d '=' -f2) -if [ "$guest" = false ] -then -echo Checking login configuration.. "${INTRO_TEXT}"OK"${END}" -else -echo Checking login configuration.. "${RED_TEXT}"FAIL"${END}" -fi exec sudo -u root /bin/sh - <//g') +grouPs=$(cat /etc/sudoers.d/admins | grep -i $myhost | cut -d '%' -f2 | cut -d '=' -f1 | sed -e 's/\//g') if [ $grouPs = "$myhost""sudoers" ] then echo Checking sudoers users.. "${INTRO_TEXT}"OK"${END}" @@ -421,13 +423,6 @@ echo Checking PAM auth configuration.. "${INTRO_TEXT}"OK"${END}" else echo Checking PAM auth configuration.. "${RED_TEXT}"FAIL"${END}" fi -guest=$(cat /usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf | grep -i allow-guest | grep -i false | cut -d '=' -f2) -if [ "$guest" = false ] -then -echo Checking login configuration.. "${INTRO_TEXT}"OK"${END}" -else -echo Checking login configuration.. "${RED_TEXT}"FAIL"${END}" -fi exit }