Commits

Zhang Huangbin committed 2f47fb4

Code cleanup: Move 'openssl passwd -1' to small function: gen_md5_passwd().

Comments (0)

Files changed (3)

iRedMail/conf/core

     fi
 }
 
+# Generate MD5 password
+gen_md5_passwd()
+{
+    # Usage: gen_sql_passwd 'plain_password'
+    openssl passwd -1 ${1}
+}
+
 gen_ldap_passwd()
 {
     if [ X"${DISTRO}" == X"FREEBSD" ]; then

iRedMail/functions/mysql.sh

 mysql_import_vmail_users()
 {
     ECHO_DEBUG "Generating SQL template for postfix virtual hosts: ${MYSQL_VMAIL_SQL}."
-    export DOMAIN_ADMIN_PASSWD="$(openssl passwd -1 ${DOMAIN_ADMIN_PASSWD})"
-    export FIRST_USER_PASSWD="$(openssl passwd -1 ${FIRST_USER_PASSWD})"
+    export DOMAIN_ADMIN_PASSWD="$(gen_md5_passwd ${DOMAIN_ADMIN_PASSWD})"
+    export FIRST_USER_PASSWD="$(gen_md5_passwd ${FIRST_USER_PASSWD})"
 
     # Generate SQL.
     # Modify default SQL template, set storagebasedirectory.

iRedMail/functions/postgresql.sh

 
 pgsql_import_vmail_users()
 {
-    export DOMAIN_ADMIN_PASSWD="$(openssl passwd -1 ${DOMAIN_ADMIN_PASSWD})"
-    export FIRST_USER_PASSWD="$(openssl passwd -1 ${FIRST_USER_PASSWD})"
+    export DOMAIN_ADMIN_PASSWD="$(gen_md5_passwd ${DOMAIN_ADMIN_PASSWD})"
+    export FIRST_USER_PASSWD="$(gen_md5_passwd ${FIRST_USER_PASSWD})"
 
     # Generate SQL.
     # Modify default SQL template, set storagebasedirectory, storagenode.