From 0994d48b53c7a1473b56177c8b09b972bec55fd3 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 21 Jul 2013 15:03:08 +0300
Subject: [PATCH] aligned limit with mysql database name lengh

---
 func/main.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/func/main.sh b/func/main.sh
index a1f1198c4..ef40a3408 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -620,6 +620,16 @@ validate_format_domain_alias() {
 }
 
 # Database
+validate_format_database() {
+    exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]"
+    if [[ "$1" =~ $exclude ]] || [ 65 -le ${#1} ]; then
+        echo "Error: $2 $1 is not valid"
+        log_event "$E_INVALID" "$EVENT"
+        exit $E_INVALID
+    fi
+}
+
+# Database user
 validate_format_database() {
     exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|.|<|>|?|/|\|\"|'|;|%|\`| ]"
     if [[ "$1" =~ $exclude ]] || [ 17 -le ${#1} ]; then
@@ -761,7 +771,7 @@ validate_format(){
             database)       validate_format_database "$arg" 'database';;
             day)            validate_format_mhdmw "$arg" $arg_name ;;
             dbpass)         validate_format_password "$arg" ;;
-            dbuser)         validate_format_database "$arg" 'db_user';;
+            dbuser)         validate_format_duser "$arg" 'db_user';;
             dkim)           validate_format_boolean "$arg" 'dkim' ;;
             dkim_size)      validate_format_key_size "$arg" ;;
             domain)         validate_format_domain "$arg" 'domain';;