From 3505d576412c64551dd1bc7d61ca892d576f88fb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 5 Mar 2014 14:01:45 +0100
Subject: Fix dbmail driver (hints from
 https://github.com/roundcube/roundcubemail/pull/169)

---
 plugins/password/drivers/dbmail.php       | 2 +-
 plugins/password/helpers/chgdbmailusers.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'plugins')

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;
-- 
cgit v1.2.3