From 868f9052eb385c4c17aa638d3b44a28e2ebab82b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 11 Dec 2012 21:58:16 +0200 Subject: [PATCH] improved database validation --- func/main.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/func/main.sh b/func/main.sh index 94fbd742d..58fa924bf 100644 --- a/func/main.sh +++ b/func/main.sh @@ -590,9 +590,9 @@ validate_format_domain_alias() { # Database validate_format_database() { - exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]" + exclude="[!|@|#|$|^|&|*|(|)|+|-|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]" if [[ "$1" =~ $exclude ]] || [ 17 -le ${#1} ]; then - echo "Error: database $1 is not valid" + echo "Error: $2 $1 is not valid" log_event "$E_INVALID" "$EVENT" exit $E_INVALID fi @@ -717,10 +717,10 @@ validate_format(){ backup) validate_format_date "$arg" ;; charset) validate_format_username "$arg" "$arg_name" ;; charsets) validate_format_common "$arg" 'charsets' ;; - database) validate_format_database "$arg" ;; + database) validate_format_database "$arg" 'database';; day) validate_format_mhdmw "$arg" $arg_name ;; dbpass) validate_format_password "$arg" ;; - dbuser) validate_format_database "$arg" ;; + dbuser) validate_format_database "$arg" 'db_user';; dkim) validate_format_boolean "$arg" 'dkim' ;; dkim_size) validate_format_key_size "$arg" ;; domain) validate_format_domain "$arg" ;;