From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 06 Aug 2015 03:18:44 -0400 Subject: [PATCH] - don't set password via remoting if field is empty --- install/tpl/authmysqlrc.master | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install/tpl/authmysqlrc.master b/install/tpl/authmysqlrc.master index d44b4f2..c35aca8 100644 --- a/install/tpl/authmysqlrc.master +++ b/install/tpl/authmysqlrc.master @@ -1,7 +1,7 @@ MYSQL_SERVER {mysql_server_host} MYSQL_USERNAME {mysql_server_ispconfig_user} MYSQL_PASSWORD {mysql_server_ispconfig_password} -MYSQL_PORT 0 +MYSQL_PORT {mysql_server_port} MYSQL_DATABASE {mysql_server_database} MYSQL_USER_TABLE mail_user MYSQL_CRYPT_PWFIELD password @@ -15,4 +15,5 @@ MYSQL_QUOTA_FIELD quota #MYSQL_QUOTA_FIELD concat(quota,'S') #MYSQL_WHERE_CLAUSE access='y' -MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3) \ No newline at end of file +#MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3) +MYSQL_AUXOPTIONS_FIELD concat('disableimap=', if(disableimap = 'y', 1, 0), ',', 'disablepop3=', if(disablepop3 = 'y', 1, 0)) \ No newline at end of file -- Gitblit v1.9.1