From a68d343ec1f092cfe2cf1dcf08366d80d931d64c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 28 Oct 2016 19:04:58 +0100
Subject: [PATCH] znc salt value

---
 src/freedombone-app-irc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 7ace8c79f..9a455272d 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -108,16 +108,14 @@ function add_user_irc_bouncer {
     stop_irc_bouncer
 
     ZNC_SALT_BASE="$(create_password 30)"
-    ZNC_SALT="$(echo \"${ZNC_SALT_BASE}\" | md5sum | awk '{print $1}')"
-    new_user_hash=$(echo "${new_user_password}${new_user_salt}" | sha256sum | awk -F ' ' '{print $1}')
+    ZNC_SALT="$(echo \"${ZNC_SALT_BASE}\" | md5sum | awk -F ' ' '{print $1}')"
+    new_user_hash=$(echo "${new_user_password}${ZNC_SALT}" | sha256sum | awk -F ' ' '{print $1}')
 
     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
-    #new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
-    #echo "    Pass       = ${new_user_pass}" >> /home/znc/.znc/configs/znc.conf
     echo '    <Pass password>' >> /home/znc/.znc/configs/znc.conf
     echo '        Method = sha256' >> /home/znc/.znc/configs/znc.conf
     echo "        Hash = ${new_user_hash}" >> /home/znc/.znc/configs/znc.conf
-    echo "        Salt = ${new_user_salt}" >> /home/znc/.znc/configs/znc.conf
+    echo "        Salt = ${ZNC_SALT}" >> /home/znc/.znc/configs/znc.conf
     echo '    </Pass>' >> /home/znc/.znc/configs/znc.conf
     echo "    Admin      = ${is_admin}" >> /home/znc/.znc/configs/znc.conf
     echo "    Nick       = ${new_username}" >> /home/znc/.znc/configs/znc.conf
-- 
GitLab