From d77cb6ca82f459ea4fbac501f548d16ae7491c33 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 13 Mar 2014 00:06:28 +0200
Subject: [PATCH] fixed additional ftp account issue for username which starts
 with digits

---
 bin/v-add-web-domain-ftp | 2 +-
 func/rebuild.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp
index d3378007..2fe5ba52 100755
--- a/bin/v-add-web-domain-ftp
+++ b/bin/v-add-web-domain-ftp
@@ -65,7 +65,7 @@ fi
 /usr/sbin/useradd $ftp_user \
     -s $shell \
     -o -u $(id -u $user) \
-    -g $user \
+    -g $(id -u $user) \
     -M -d "$HOMEDIR/$user/web/$domain"  > /dev/null 2>&1
 echo "$ftp_user:$ftp_password" | /usr/sbin/chpasswd
 ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)"
diff --git a/func/rebuild.sh b/func/rebuild.sh
index f359bac3..f69efd48 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -328,7 +328,7 @@ rebuild_web_domain_conf() {
             /usr/sbin/useradd $FTP_USER \
                 -s $shell \
                 -o -u $(id -u $user) \
-                -g $user \
+                -g $(id -u $user) \
                 -M -d "$HOMEDIR/$user/web/$domain"  > /dev/null 2>&1
 
             # Update password