fixed wildcards bug and dns restart issue

This commit is contained in:
Serghey Rodin 2012-07-19 11:10:55 +03:00
commit d66f30117f
2 changed files with 12 additions and 2 deletions

View file

@ -562,6 +562,16 @@ validate_format_domain() {
fi
}
# Domain alias
validate_format_domain_alias() {
exclude="[!|@|#|$|^|&|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]"
if [[ "$1" =~ $exclude ]] || [[ "$1" =~ "^[0-9]+$" ]]; then
echo "Error: domain alias $1 is not valid"
log_event "$E_INVALID" "$EVENT"
exit $E_INVALID
fi
}
# Database
validate_format_database() {
exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]"
@ -698,7 +708,7 @@ validate_format(){
dkim) validate_format_boolean "$arg" 'dkim' ;;
dkim_size) validate_format_key_size "$arg" ;;
domain) validate_format_domain "$arg" ;;
dom_alias) validate_format_domain "$arg" ;;
dom_alias) validate_format_domain_alias "$arg" ;;
dvalue) validate_format_dvalue "$arg";;
email) validate_format_email "$arg" ;;
exp) validate_format_date "$arg" ;;