From 4473dc558828a94e9e251c302235358af1d08712 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 25 Jan 2016 03:56:11 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
plugins/password/drivers/dbmail.php | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/plugins/password/drivers/dbmail.php b/plugins/password/drivers/dbmail.php
index 1207283..a1a0b3c 100644
--- a/plugins/password/drivers/dbmail.php
+++ b/plugins/password/drivers/dbmail.php
@@ -40,20 +40,9 @@
$args = rcmail::get_instance()->config->get('password_dbmail_args', '');
$command = "$curdir/chgdbmailusers -c $username -w $password $args";
- if (strlen($command) > 1024) {
- rcube::raise_error(array(
- 'code' => 600,
- 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Password plugin: The command is too long."
- ), true, false);
+ exec($command, $output, $return_value);
- return PASSWORD_ERROR;
- }
-
- exec($command, $output, $returnvalue);
-
- if ($returnvalue == 0) {
+ if ($return_value == 0) {
return PASSWORD_SUCCESS;
}
else {
--
Gitblit v1.9.1