lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Can create user but not update user with activedirectory

Browse Source
This commit is contained in:
Regis Houssin 2020-06-21 19:52:15 +02:00
parent 438e884c01
commit d38c557fba
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/class/ldap.class.php
View File

@ -55,6 +55,10 @@ class Ldap
/** /**
* Version du protocole ldap * Version du protocole ldap
*/ */
public $ldapProtocolVersion;
/**
* Server DN
*/
public $domain; public $domain;
/** /**
* User administrateur Ldap * User administrateur Ldap
@ -466,8 +470,6 @@ class Ldap
*/ */
public function modify($dn, $info, $user) public function modify($dn, $info, $user)
{ {
global $conf;
dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info)); dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));
// Check parameters // Check parameters
@ -492,6 +494,10 @@ class Ldap
$this->dump($dn, $info); $this->dump($dn, $info);
//print_r($info); //print_r($info);
// For better compatibility with Samba4 AD
if ($this->serverType == "activedirectory") {
unset($info['cn']); // For avoid error : Operation not allowed on RDN (Code 67)
}
$result=@ldap_modify($this->connection, $dn, $info); $result=@ldap_modify($this->connection, $dn, $info);
if ($result) if ($result)
@ -520,8 +526,6 @@ class Ldap
*/ */
public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true) public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
{ {
global $conf;
dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn?1:0)); dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn?1:0));
// Check parameters // Check parameters
@ -571,8 +575,6 @@ class Ldap
*/ */
public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false) public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
{ {
global $conf;
dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn); dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
// Check parameters // Check parameters
@ -589,7 +591,7 @@ class Ldap
if (!$olddn || $olddn != $dn) if (!$olddn || $olddn != $dn)
{ {
if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $conf->global->LDAP_SERVER_PROTOCOLVERSION === '3') if (! empty($olddn) && ! empty($newrdn) && ! empty($newparent) && $this->ldapProtocolVersion === '3')
{ {
// This function currently only works with LDAPv3 // This function currently only works with LDAPv3
$result = $this->rename($olddn, $newrdn, $newparent, $user, true); $result = $this->rename($olddn, $newrdn, $newparent, $user, true);
@ -631,8 +633,6 @@ class Ldap
*/ */
public function delete($dn) public function delete($dn)
{ {
global $conf;
dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn); dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
// Check parameters // Check parameters