diff options
| -rw-r--r-- | plugins/password/README | 6 | ||||
| -rw-r--r-- | plugins/password/drivers/dbmail.php | 4 | ||||
| -rw-r--r-- | plugins/password/drivers/pw_usermod.php | 2 | ||||
| -rw-r--r-- | plugins/password/drivers/sasl.php | 4 | ||||
| -rw-r--r-- | plugins/password/drivers/virtualmin.php | 2 | ||||
| -rw-r--r-- | plugins/password/helpers/chgdbmailusers.c (renamed from plugins/password/drivers/chgdbmailusers.c) | 0 | ||||
| -rw-r--r-- | plugins/password/helpers/chgsaslpasswd.c (renamed from plugins/password/drivers/chgsaslpasswd.c) | 0 | ||||
| -rw-r--r-- | plugins/password/helpers/chgvirtualminpasswd.c (renamed from plugins/password/drivers/chgvirtualminpasswd.c) | 0 | ||||
| -rw-r--r-- | plugins/password/helpers/chpass-wrapper.py (renamed from plugins/password/drivers/chpass-wrapper.py) | 0 | ||||
| -rw-r--r-- | plugins/password/package.xml | 11 |
10 files changed, 17 insertions, 12 deletions
diff --git a/plugins/password/README b/plugins/password/README index 4fcbc4b21..eadf10742 100644 --- a/plugins/password/README +++ b/plugins/password/README @@ -136,7 +136,7 @@ Installation: - Change into the drivers directory. Edit the chgsaslpasswd.c file as is + Change into the helpers directory. Edit the chgsaslpasswd.c file as is documented within it. Compile the wrapper program: @@ -205,7 +205,7 @@ ---------------------------- As in sasl driver this one allows to change password using shell - utility called "virtualmin". See drivers/chgvirtualminpasswd.c for + utility called "virtualmin". See helpers/chgvirtualminpasswd.c for installation instructions. See also config.inc.php.dist file. @@ -230,7 +230,7 @@ Driver that adds functionality to change the systems user password via the 'chpasswd' command. See config.inc.php.dist file. - Attached wrapper script (chpass-wrapper.py) restricts password changes + Attached wrapper script (helpers/chpass-wrapper.py) restricts password changes to uids >= 1000 and can deny requests based on a blacklist. diff --git a/plugins/password/drivers/dbmail.php b/plugins/password/drivers/dbmail.php index a457fc27b..a7c2f46a3 100644 --- a/plugins/password/drivers/dbmail.php +++ b/plugins/password/drivers/dbmail.php @@ -19,9 +19,9 @@ class rcube_dbmail_password { function password_save($currpass, $newpass) { - $curdir = realpath(dirname(__FILE__)); + $curdir = INSTALL_PATH . 'plugins/password/helpers'; $username = escapeshellcmd($_SESSION['username']); - $args = rcmail::get_instance()->config->get('password_dbmail_args', ''); + $args = rcmail::get_instance()->config->get('password_dbmail_args', ''); exec("$curdir/chgdbmailusers -c $username -w $newpass $args", $output, $returnvalue); diff --git a/plugins/password/drivers/pw_usermod.php b/plugins/password/drivers/pw_usermod.php index ca3d068a7..5b92fcbfb 100644 --- a/plugins/password/drivers/pw_usermod.php +++ b/plugins/password/drivers/pw_usermod.php @@ -17,8 +17,8 @@ class rcube_pw_usermod_password { public function save($currpass, $newpass) { - $cmd = rcmail::get_instance()->config->get('password_pw_usermod_cmd'); $username = $_SESSION['username']; + $cmd = rcmail::get_instance()->config->get('password_pw_usermod_cmd'); $cmd .= " $username > /dev/null"; $handle = popen($cmd, "w"); diff --git a/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php index 3e6fe1c8b..957c1196c 100644 --- a/plugins/password/drivers/sasl.php +++ b/plugins/password/drivers/sasl.php @@ -20,9 +20,9 @@ class rcube_sasl_password { function save($currpass, $newpass) { - $curdir = realpath(dirname(__FILE__)); + $curdir = INSTALL_PATH . 'plugins/password/helpers'; $username = escapeshellcmd($_SESSION['username']); - $args = rcmail::get_instance()->config->get('password_saslpasswd_args', ''); + $args = rcmail::get_instance()->config->get('password_saslpasswd_args', ''); if ($fh = popen("$curdir/chgsaslpasswd -p $args $username", 'w')) { fwrite($fh, $newpass."\n"); diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php index 5a9d9c0ca..b2547e07f 100644 --- a/plugins/password/drivers/virtualmin.php +++ b/plugins/password/drivers/virtualmin.php @@ -55,7 +55,7 @@ class rcube_virtualmin_password $username = escapeshellcmd($username); $domain = escapeshellcmd($domain); $newpass = escapeshellcmd($newpass); - $curdir = realpath(dirname(__FILE__)); + $curdir = INSTALL_PATH . 'plugins/password/helpers'; exec("$curdir/chgvirtualminpasswd modify-user --domain $domain --user $username --pass $newpass", $output, $returnvalue); diff --git a/plugins/password/drivers/chgdbmailusers.c b/plugins/password/helpers/chgdbmailusers.c index 28f79c100..28f79c100 100644 --- a/plugins/password/drivers/chgdbmailusers.c +++ b/plugins/password/helpers/chgdbmailusers.c diff --git a/plugins/password/drivers/chgsaslpasswd.c b/plugins/password/helpers/chgsaslpasswd.c index bcdcb2e0d..bcdcb2e0d 100644 --- a/plugins/password/drivers/chgsaslpasswd.c +++ b/plugins/password/helpers/chgsaslpasswd.c diff --git a/plugins/password/drivers/chgvirtualminpasswd.c b/plugins/password/helpers/chgvirtualminpasswd.c index 4e2299c66..4e2299c66 100644 --- a/plugins/password/drivers/chgvirtualminpasswd.c +++ b/plugins/password/helpers/chgvirtualminpasswd.c diff --git a/plugins/password/drivers/chpass-wrapper.py b/plugins/password/helpers/chpass-wrapper.py index 61bba849e..61bba849e 100644 --- a/plugins/password/drivers/chpass-wrapper.py +++ b/plugins/password/helpers/chpass-wrapper.py diff --git a/plugins/password/package.xml b/plugins/password/package.xml index ddab35d7d..4b8652168 100644 --- a/plugins/password/package.xml +++ b/plugins/password/package.xml @@ -30,6 +30,7 @@ - Added option password_login_exceptions (#1487826) - Added domainfactory driver (#1487882) - Added DBMail driver (#1488281) +- Helper files moved to helpers/ directory from drivers/ </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -76,10 +77,10 @@ <file name="localization/tr_TR.inc" role="data"></file> <file name="localization/zh_TW.inc" role="data"></file> - <file name="drivers/chgsaslpasswd.c" role="data"></file> - <file name="drivers/chgvirtualminpasswd.c" role="data"></file> <file name="drivers/chpasswd.php" role="php"></file> + <file name="drivers/dbmail.php" role="php"></file> <file name="drivers/directadmin.php" role="php"></file> + <file name="drivers/domainfactory.php" role="php"></file> <file name="drivers/ldap.php" role="php"></file> <file name="drivers/ldap_simple.php" role="php"></file> <file name="drivers/poppassd.php" role="php"></file> @@ -93,7 +94,11 @@ <file name="drivers/virtualmin.php" role="php"></file> <file name="drivers/ximss.php" role="php"></file> <file name="drivers/xmail.php" role="php"></file> - <file name="drivers/chpass-wrapper.py" role="data"></file> + + <file name="helpers/chgdbmailusers.c" role="data"></file> + <file name="helpers/chgsaslpasswd.c" role="data"></file> + <file name="helpers/chgvirtualminpasswd.c" role="data"></file> + <file name="helpers/chpass-wrapper.py" role="data"></file> <file name="config.inc.php.disc" role="data"></file> </dir> |