From dee9dcc0946a99209d380e21b8c6f50757af9192 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 31 Jan 2013 22:22:35 +0200
Subject: [PATCH] changed uid for additional ftp account

---
 bin/v-add-web-domain-ftp    | 4 ++--
 bin/v-delete-web-domain     | 2 +-
 bin/v-delete-web-domain-ftp | 4 ++--
 bin/v-rebuild-web-domains   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp
index 5c273b221..67aa936c8 100755
--- a/bin/v-add-web-domain-ftp
+++ b/bin/v-add-web-domain-ftp
@@ -56,8 +56,8 @@ if [ ! -z "$FTP_USER" ]; then
 fi
 
 # Adding user
-/usr/sbin/adduser $ftp_user -g $user -s /sbin/nologin -M \
-    -d "$HOMEDIR/$user/web/$domain"  > /dev/null 2>&1
+/usr/sbin/adduser -o -u $(id -u $user) -g $user -s /sbin/nologin -M \
+    -d "$HOMEDIR/$user/web/$domain" $ftp_user > /dev/null 2>&1
 echo "$ftp_password" | /usr/bin/passwd "$ftp_user" --stdin &>/dev/null
 ftp_md5="$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)"
 
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
index eed4d1dc2..68c9f2ac1 100755
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@@ -90,7 +90,7 @@ fi
 
 # Deleting ftp account
 if [ ! -z "$FTP_USER" ]; then
-    /usr/sbin/userdel $FTP_USER
+    /usr/sbin/userdel -f $FTP_USER >> /dev/null 2>&1
 fi
 
 # Deleting directory
diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp
index ca71d31dc..cfe9061d6 100755
--- a/bin/v-delete-web-domain-ftp
+++ b/bin/v-delete-web-domain-ftp
@@ -38,9 +38,9 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$FTP_USER'
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Adding user
+# Deleting ftp user
 get_domain_values 'web'
-/usr/sbin/userdel $FTP_USER
+/usr/sbin/userdel -f  $FTP_USER >> /dev/null 2>&1
 
 
 #----------------------------------------------------------#
diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index 374af8a53..c8b6a9cc3 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -219,8 +219,8 @@ for domain in $(shell_list) ; do
     # Checking ftp
     if [ ! -z "$FTP_USER" ]; then
         if [ -z "$(grep ^$FTP_USER: /etc/passwd)" ]; then
-            /usr/sbin/adduser $FTP_USER -g $user -s /sbin/nologin -M \
-                -d "$HOMEDIR/$user/web/$domain"  > /dev/null 2>&1
+            /usr/sbin/adduser -o -u $(id -u $user) -g $user -s /sbin/nologin \
+                -M -d "$HOMEDIR/$user/web/$domain" $FTP_USER > /dev/null 2>&1
 
             shadow='/etc/shadow'
             shdw=$(grep "^$FTP_USER:" $shadow)