Zhang Huangbin avatar 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.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.