diff options
| -rw-r--r-- | plugins/password/config.inc.php | 6 | ||||
| -rw-r--r-- | plugins/password/drivers/sasl.php | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/plugins/password/config.inc.php b/plugins/password/config.inc.php index 8bce0cc69..1b964e3fc 100644 --- a/plugins/password/config.inc.php +++ b/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/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php index 0f762e50d..b1e9ba487 100644 --- a/plugins/password/drivers/sasl.php +++ b/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); |