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 | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install/tpl/authmysqlrc.master b/install/tpl/authmysqlrc.master index 9e50a4a..c35aca8 100644 --- a/install/tpl/authmysqlrc.master +++ b/install/tpl/authmysqlrc.master @@ -1,17 +1,19 @@ 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 #MYSQL_CLEAR_PWFIELD password MYSQL_UID_FIELD uid MYSQL_GID_FIELD gid -MYSQL_LOGIN_FIELD email +MYSQL_LOGIN_FIELD login MYSQL_HOME_FIELD homedir MYSQL_MAILDIR_FIELD maildir #MYSQL_NAME_FIELD -#MYSQL_QUOTA_FIELD quota -MYSQL_QUOTA_FIELD concat(quota,'S') -MYSQL_WHERE_CLAUSE access='y' \ No newline at end of file +MYSQL_QUOTA_FIELD quota +#MYSQL_QUOTA_FIELD concat(quota,'S') +#MYSQL_WHERE_CLAUSE access='y' +#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