From 92d7044c59ed351501b35a7c5956f91009a390ad Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 21 Oct 2015 18:56:29 +0300
Subject: [PATCH] fix date/time format for fail2ban

---
 bin/v-check-user-password | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/v-check-user-password b/bin/v-check-user-password
index 460d8b012..6543333c9 100755
--- a/bin/v-check-user-password
+++ b/bin/v-check-user-password
@@ -11,7 +11,7 @@
 
 # Argument defenition
 user=$1
-password=$2
+password=$2; HIDE=2
 ip=${3-127.0.0.1}
 
 # Includes
@@ -29,7 +29,7 @@ validate_format 'user'
 # Checking user
 if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then
     echo "Error: password missmatch"
-    echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -39,7 +39,7 @@ is_password_valid
 # Checking empty password
 if [[ -z "$password" ]]; then
     echo "Error: password missmatch"
-    echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -60,7 +60,7 @@ fi
 
 if [ -z "$salt" ]; then
     echo "Error: password missmatch"
-    echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -68,7 +68,7 @@ fi
 hash=$($BIN/v-generate-password-hash $method $salt <<< $password)
 if [[ -z "$hash" ]]; then
     echo "Error: password missmatch"
-    echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -76,7 +76,7 @@ fi
 result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null)
 if [[ -z "$result" ]]; then
     echo "Error: password missmatch"
-    echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log
+    echo "$DATE $TIME $user $ip failed to login" >> $VESTA/log/auth.log
     exit 9
 fi
 
@@ -86,6 +86,6 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-echo "$DATE $user $ip successfully logged in" >> $VESTA/log/auth.log
+echo "$DATE $TIME $user $ip successfully logged in" >> $VESTA/log/auth.log
 
 exit