summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-03-05 14:01:45 +0100
committerAleksander Machniak <alec@alec.pl>2014-03-05 14:01:45 +0100
commit18a9b4f2f1cbac734d2d16252b45d7ab11bc746f (patch)
treed1e8420730a58fa11a3a06afc12129f00770d8e8 /plugins
parent2b8f033bcbd5581ff7b27b396f308b77058c09dc (diff)
Fix dbmail driver (hints from https://github.com/roundcube/roundcubemail/pull/169)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/password/drivers/dbmail.php2
-rw-r--r--plugins/password/helpers/chgdbmailusers.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/password/drivers/dbmail.php b/plugins/password/drivers/dbmail.php
index 529027b8d..5cfe92cd7 100644
--- a/plugins/password/drivers/dbmail.php
+++ b/plugins/password/drivers/dbmail.php
@@ -17,7 +17,7 @@
class rcube_dbmail_password
{
- function password_save($currpass, $newpass)
+ function save($currpass, $newpass)
{
$curdir = RCUBE_PLUGINS_DIR . 'password/helpers';
$username = escapeshellcmd($_SESSION['username']);
diff --git a/plugins/password/helpers/chgdbmailusers.c b/plugins/password/helpers/chgdbmailusers.c
index 28f79c100..22793857d 100644
--- a/plugins/password/helpers/chgdbmailusers.c
+++ b/plugins/password/helpers/chgdbmailusers.c
@@ -5,7 +5,6 @@
// set the UID this script will run as (root user)
#define UID 0
#define CMD "/usr/sbin/dbmail-users"
-#define RCOK 0x100
/* INSTALLING:
gcc -o chgdbmailusers chgdbmailusers.c
@@ -38,7 +37,7 @@ main(int argc, char *argv[])
cc = setuid(UID);
rc = system(cmnd);
- if ((rc != RCOK) || (cc != 0))
+ if ((rc != 0) || (cc != 0))
{
fprintf(stderr, "__ %s: failed %d %d\n", argv[0], rc, cc);
return 1;