mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-23 11:21:42 +02:00
fixed not working SyncML, if NTLM auth is enabled: now both working together
This commit is contained in:
parent
9374ade6f5
commit
95d15246b5
@ -162,7 +162,7 @@
|
|||||||
var $egw_domains;
|
var $egw_domains;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write debug messages about session verification to the error_log
|
* Write debug messages about session verification and creation to the error_log
|
||||||
*
|
*
|
||||||
* @var boolean
|
* @var boolean
|
||||||
*/
|
*/
|
||||||
@ -296,6 +296,7 @@
|
|||||||
*/
|
*/
|
||||||
function verify($sessionid='',$kp3='')
|
function verify($sessionid='',$kp3='')
|
||||||
{
|
{
|
||||||
|
if ($this->errorlog_debug) error_log(__METHOD__."('$sessionid','$kp3') ".function_backtrace());
|
||||||
$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
|
$fill_egw_info_and_repositories = !$GLOBALS['egw_info']['flags']['restored_from_session'];
|
||||||
if(empty($sessionid) || !$sessionid)
|
if(empty($sessionid) || !$sessionid)
|
||||||
{
|
{
|
||||||
@ -325,8 +326,9 @@
|
|||||||
$this->split_login_domain($session['session_lid'],$this->account_lid,$this->account_domain);
|
$this->split_login_domain($session['session_lid'],$this->account_lid,$this->account_domain);
|
||||||
|
|
||||||
/* This is to ensure that we authenticate to the correct domain (might not be default) */
|
/* This is to ensure that we authenticate to the correct domain (might not be default) */
|
||||||
if($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
|
if($GLOBALS['egw_info']['user']['domain'] && $this->account_domain != $GLOBALS['egw_info']['user']['domain'])
|
||||||
{
|
{
|
||||||
|
if ($this->errorlog_debug) error_log(__METHOD__."('$sessionid','$kp3') account_domain='$this->account_domain' != '{$GLOBALS['egw_info']['user']['domain']}'=egw_info[user][domain]");
|
||||||
$GLOBALS['egw']->ADOdb = null;
|
$GLOBALS['egw']->ADOdb = null;
|
||||||
$GLOBALS['egw_info']['user']['domain'] = $this->account_domain;
|
$GLOBALS['egw_info']['user']['domain'] = $this->account_domain;
|
||||||
// reset the db
|
// reset the db
|
||||||
@ -578,7 +580,7 @@
|
|||||||
$this->passwd = $passwd;
|
$this->passwd = $passwd;
|
||||||
$this->passwd_type = $passwd_type;
|
$this->passwd_type = $passwd_type;
|
||||||
}
|
}
|
||||||
//error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check)");
|
if ($this->errorlog_debug) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check)");
|
||||||
|
|
||||||
$this->clean_sessions();
|
$this->clean_sessions();
|
||||||
$this->split_login_domain($login,$this->account_lid,$this->account_domain);
|
$this->split_login_domain($login,$this->account_lid,$this->account_domain);
|
||||||
@ -705,6 +707,7 @@
|
|||||||
$GLOBALS['egw']->db->transaction_commit();
|
$GLOBALS['egw']->db->transaction_commit();
|
||||||
|
|
||||||
//if (!$this->sessionid) echo "<p>session::create(login='$login') = '$this->sessionid': lid='$this->account_lid', domain='$this->account_domain'</p>\n";
|
//if (!$this->sessionid) echo "<p>session::create(login='$login') = '$this->sessionid': lid='$this->account_lid', domain='$this->account_domain'</p>\n";
|
||||||
|
if ($this->errorlog_debug) error_log(__METHOD__."($this->login,$this->passwd,$this->passwd_type,$no_session,$auth_check) successfull sessionid=$this->sessionid");
|
||||||
|
|
||||||
return $this->sessionid;
|
return $this->sessionid;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user