From ff69d022b3f465ef721681ed9bf1460a31882155 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 12 Jan 2021 11:26:20 -0500 Subject: [PATCH] [fix] Correct function call --- setup/so-functions | 4 ++-- setup/so-whiptail | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 22bd514ac..3eeaee674 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -483,7 +483,7 @@ collect_helix_key() { collect_homenet_mngr() { whiptail_homenet_manager - while ! __validate_cidr_arr "$HNMANAGER"; do + while ! valid_cidr_lit "$HNMANAGER"; do whiptail_invalid_input whiptail_homenet_manager done @@ -495,7 +495,7 @@ collect_homenet_snsr() { else whiptail_homenet_sensor - while ! __validate_cidr_arr "$HNSENSOR"; do + while ! valid_cidr_list "$HNSENSOR"; do whiptail_invalid_input whiptail_homenet_sensor done diff --git a/setup/so-whiptail b/setup/so-whiptail index 78fd7b9c2..edb784b31 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -477,7 +477,7 @@ whiptail_homenet_manager() { [ -n "$TESTING" ] && return HNMANAGER=$(whiptail --title "Security Onion Setup" --inputbox \ - "Enter your HOME_NET, separating CIDR blocks with a comma (,):" 10 75 10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 3>&1 1>&2 2>&3) + "Enter your home network(s), separating CIDR blocks with a comma (,):" 10 75 "10.0.0.0/8,192.168.0.0/16,172.16.0.0/12" 3>&1 1>&2 2>&3) local exitstatus=$? whiptail_check_exitstatus $exitstatus @@ -495,7 +495,7 @@ whiptail_homenet_sensor() { [ -n "$TESTING" ] && return HNSENSOR=$(whiptail --title "Security Onion Setup" --inputbox \ - "Enter your HOME_NET, separating CIDR blocks with a comma (,):" 10 75 10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 3>&1 1>&2 2>&3) + "Enter your home network(s), separating CIDR blocks with a comma (,):" 10 75 "10.0.0.0/8,192.168.0.0/16,172.16.0.0/12" 3>&1 1>&2 2>&3) local exitstatus=$? whiptail_check_exitstatus $exitstatus