diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-03-02 19:21:59 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-03-02 19:21:59 +0100 |
| commit | e0d4662523cde95c89d5374bf5eba70738606d1c (patch) | |
| tree | 99bc90df7492e7630dadfc4a0a9df9ed8dc45604 /plugins | |
| parent | 4310ce6c3e64008f3586d73e437d9c95718cd07c (diff) | |
Use rcube_utils::parse_host() for host config in smb driver (#1488784)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/password/config.inc.php.dist | 4 | ||||
| -rw-r--r-- | plugins/password/drivers/smb.php | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist index e960bbe00..16e3737d6 100644 --- a/plugins/password/config.inc.php.dist +++ b/plugins/password/config.inc.php.dist @@ -357,6 +357,10 @@ $rcmail_config['password_expect_params'] = ''; // smb Driver options // --------------------- // Samba host (default: localhost) +// Supported replacement variables: +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) $rcmail_config['password_smb_host'] = 'localhost'; // Location of smbpasswd binary $rcmail_config['password_smb_cmd'] = '/usr/bin/smbpasswd'; diff --git a/plugins/password/drivers/smb.php b/plugins/password/drivers/smb.php index d56924eee..9f2b96afa 100644 --- a/plugins/password/drivers/smb.php +++ b/plugins/password/drivers/smb.php @@ -26,13 +26,15 @@ class rcube_smb_password public function save($currpass, $newpass) { - $host = rcmail::get_instance()->config->get('password_smb_host','localhost'); - $bin = rcmail::get_instance()->config->get('password_smb_cmd','/usr/bin/smbpasswd'); + $host = rcmail::get_instance()->config->get('password_smb_host','localhost'); + $bin = rcmail::get_instance()->config->get('password_smb_cmd','/usr/bin/smbpasswd'); $username = $_SESSION['username']; - $tmpfile = tempnam(sys_get_temp_dir(),'smb'); - $cmd = $bin . ' -r ' . $host . ' -s -U "' . $username . '" > ' . $tmpfile . ' 2>&1'; - $handle = @popen($cmd, 'w'); + $host = rcube_utils::parse_host($host); + $tmpfile = tempnam(sys_get_temp_dir(),'smb'); + $cmd = $bin . ' -r ' . $host . ' -s -U "' . $username . '" > ' . $tmpfile . ' 2>&1'; + $handle = @popen($cmd, 'w'); + fputs($handle, $currpass."\n"); fputs($handle, $newpass."\n"); fputs($handle, $newpass."\n"); |