Merge pull request #1421 from pi-hole/fix/accidental-password-reset

Add option to enter new password as command arg
This commit is contained in:
Dan Schaper 2017-05-04 03:11:54 -07:00 committed by GitHub
commit a290e01bdf

View file

@ -88,17 +88,23 @@ SetWebPassword(){
exit 1 exit 1
fi fi
read -s -p "Enter New Password (Blank for no password): " PASSWORD if (( ${#args[2]} > 0 )) ; then
echo "" readonly PASSWORD="${args[2]}"
readonly CONFIRM="${PASSWORD}"
else
read -s -p "Enter New Password (Blank for no password): " PASSWORD
echo ""
if [ "${PASSWORD}" == "" ]; then if [ "${PASSWORD}" == "" ]; then
change_setting "WEBPASSWORD" "" change_setting "WEBPASSWORD" ""
echo "Password Removed" echo "Password Removed"
exit 0 exit 0
fi fi
read -s -p "Confirm Password: " CONFIRM
echo ""
fi
read -s -p "Confirm Password: " CONFIRM
echo ""
if [ "${PASSWORD}" == "${CONFIRM}" ] ; then if [ "${PASSWORD}" == "${CONFIRM}" ] ; then
hash=$(HashPassword ${PASSWORD}) hash=$(HashPassword ${PASSWORD})
# Save hash to file # Save hash to file