Implemented check of sudo/sup. Disabled "Load Configuration File" if

run under sudo/sup
origin
KatolaZ 8 years ago
parent 201c07b4e0
commit 87f692fd21
  1. 45
      setnet.sh

@ -295,6 +295,20 @@ unimplemented(){
}
##function
check_sudo(){
LABEL="$1"
if [ "${USING_SUDO}" = "1" ]; then
eval "${DIALOG} --msgbox '${LABEL}' ${INFO_HEIGHT} ${INFO_WIDTH} " 2>${TMPFILE}
return 1
else
return 0
fi
}
##########################################
@ -865,12 +879,22 @@ wifi_disable(){
##function
wifi_load_file(){
##local
DEVNAME=$1
MSG="You are running setnet through sudo or sup!!!\nLoad file is
disabled!" check_sudo "${MSG}"
if [ $? -eq 1 ]; then
return
fi
eval "${DIALOG} --fselect ${WPA_FILE} ${WINDOW_HEIGHT} ${WINDOW_WIDTH}" \
2>${TMPFILE}
@ -1724,6 +1748,26 @@ initialise(){
truncate -s 0 ${LOGFILE}
fi
log "setnet" "Starting afresh on $(date)"
EUID=$(id -ru)
if [ "${EUID}" = "0" ] &&
[ -n "${SUDO_UID}" ] &&
[ "${EUID}" != "${SUDO_UID}" ]; then
USING_SUDO="1"
elif [ "${EUID}" = "0" ] &&
[ -n "${SUP_UID}" ] &&
[ "${EUID}" != "${SUP_UID}" ]; then
USING_SUDO="1"
else
USING_SUDO="0"
fi
log "initialise" "EUID: ${EUID}"
log "initialise" "SUDO_UID: ${SUDO_UID}"
log "initialise" "SUP_UID: ${SUP_UID}"
log "initialise" "USING_SUDO: ${USING_SUDO}"
}
@ -1742,7 +1786,6 @@ main(){
show_disclaimer
log "setnet" "Starting afresh on $(date)"
SETNETRC=$(realpath ${SETNETRC})
log "main" "Using config file \"${SETNETRC}\""
WPA_FILE=$(realpath ${WPA_FILE})

Loading…
Cancel
Save