Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-03 23:39:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename query_globals() --> count_do_variables()

Browse Source 
.. and fix one problem instroduced with last patch (testssl.sh
din't work correclty if only an URI was supplied)
This commit is contained in:
Dirk Wetter 2020-01-30 22:25:10 +01:00
parent 073d383f76
commit c4920f61e4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testssl.sh
View File

@ -19280,7 +19280,7 @@ set_scanning_defaults() {
} }
# returns number of $do variables set = number of run_funcs() to perform # returns number of $do variables set = number of run_funcs() to perform
query_globals() { count_do_variables() {
local gbl local gbl
local true_nr=0 local true_nr=0
@ -19379,7 +19379,7 @@ parse_cmd_line() {
esac esac
# initializing # initializing
set_scanning_defaults initialize_globals
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case $1 in case $1 in
@ -19884,8 +19884,9 @@ parse_cmd_line() {
done done
[[ "$DEBUG" -ge 5 ]] && debug_globals [[ "$DEBUG" -ge 5 ]] && debug_globals
set_scanning_defaults
query_globals count_do_variables
[[ $? -eq 0 ]] && set_scanning_defaults
CMDLINE_PARSED=true CMDLINE_PARSED=true
} }
@ -20128,9 +20129,10 @@ lets_roll() {
#TODO: there shouldn't be the need for a special case for --mx, only the ip addresses we would need upfront and the do-parser #TODO: there shouldn't be the need for a special case for --mx, only the ip addresses we would need upfront and the do-parser
if "$do_mx_all_ips"; then if "$do_mx_all_ips"; then
query_globals # if we have just 1x "do_*" --> we do a standard run -- otherwise just the one specified #FIXME: do we need this really here?
count_do_variables # if we have just 1x "do_*" --> we do a standard run -- otherwise just the one specified
[[ $? -eq 1 ]] && set_scanning_defaults [[ $? -eq 1 ]] && set_scanning_defaults
run_mx_all_ips "${URI}" $PORT # we should reduce run_mx_all_ips to the stuff necessary as ~15 lines later we have similar code run_mx_all_ips "${URI}" $PORT # we should reduce run_mx_all_ips to what's necessary as below we have similar code
exit $? exit $?
fi fi