Make session auth cookie name configurable

2 files changed, 7 insertions, 0 deletions

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 64f3643e3..fe1880565 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -253,6 +253,9 @@ $rcmail_config['session_domain'] = '';
 // Session name. Default: 'roundcube_sessid'
 $rcmail_config['session_name'] = null;
 
+// Session authentication cookie name. Default: 'roundcube_sessauth'
+$rcmail_config['session_auth_name'] = null;
+
 // Session path. Defaults to PHP session.cookie_path setting.
 $rcmail_config['session_path'] = null;
 
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index b681f0531..af24b0e85 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -436,6 +436,10 @@ class rcube
         $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
         $this->session->set_ip_check($this->config->get('ip_check'));
 
+        if ($this->config->get('session_auth_name')) {
+            $this->session->set_cookiename($this->config->get('session_auth_name'));
+        }
+
         // start PHP session (if not in CLI mode)
         if ($_SERVER['REMOTE_ADDR']) {
             session_start();