diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-03-06 13:16:43 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-03-06 13:16:43 +0100 |
| commit | c70f26776ef2a539834caa04ca86a0f71ee80cee (patch) | |
| tree | 3ea53e276fc67509c8ca60b0a137aca34de9bccf /plugins/password | |
| parent | 2838b9ecb6a070c8693856668f0279d69e6e88d3 (diff) | |
| parent | f2e1b7a3e66b1a00369967d969ae482829068a44 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins/password')
| -rw-r--r-- | plugins/password/drivers/dbmail.php | 2 | ||||
| -rw-r--r-- | plugins/password/helpers/chgdbmailusers.c | 3 |
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; |