From 16df42b12395fca237e00a268c08ca5a0d1048cb Mon Sep 17 00:00:00 2001 From: thomasb Date: Wed, 1 Jul 2009 14:21:46 +0000 Subject: Allow to configure additional arguments for the saslpasswd2 call git-svn-id: https://svn.roundcube.net/trunk@2690 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/plugins/password/config.inc.php | 6 ++++++ roundcubemail/plugins/password/drivers/sasl.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roundcubemail/plugins/password/config.inc.php b/roundcubemail/plugins/password/config.inc.php index 8bce0cc69..1b964e3fc 100644 --- a/roundcubemail/plugins/password/config.inc.php +++ b/roundcubemail/plugins/password/config.inc.php @@ -38,6 +38,12 @@ $rcmail_config['password_pop_host'] = 'localhost'; $rcmail_config['password_pop_port'] = 106; +// SASL Driver options +// ------------------- +// Additional arguments for the saslpasswd2 call +$rcmail_config['password_saslpasswd_args'] = ''; + + // LDAP Driver options // ------------------- // LDAP server name to connect to. diff --git a/roundcubemail/plugins/password/drivers/sasl.php b/roundcubemail/plugins/password/drivers/sasl.php index 0f762e50d..b1e9ba487 100644 --- a/roundcubemail/plugins/password/drivers/sasl.php +++ b/roundcubemail/plugins/password/drivers/sasl.php @@ -20,8 +20,9 @@ function password_save($currpass, $newpass) { $curdir = realpath(dirname(__FILE__)); $username = escapeshellcmd($_SESSION['username']); + $args = rcmail::get_instance()->config->get('password_saslpasswd_args', ''); - if ($fh = popen("$curdir/chgsaslpasswd -p $username", 'w')) { + if ($fh = popen("$curdir/chgsaslpasswd -p $args $username", 'w')) { fwrite($fh, $newpass."\n"); $code = pclose($fh); -- cgit v1.2.3