LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/ldap-password-change'

pull/13/head
Jean Raby 2013-08-29 15:15:07 -04:00
parent e9d8b729b6 d7e6648396
commit 6a68c255bd
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SoObjects/SOGo/LDAPSource.m
View File

@ -632,7 +632,25 @@ static Class NSStringK;
IDField, [login escapedForLDAPDN], baseDN];
if (userDN)
{
if (!passwordPolicy)
if ([bindConnection isADCompatible])
{
if ([bindConnection bindWithMethod: @"simple"
binddn: userDN
credentials: oldPassword])
{
didChange = [bindConnection changeADPasswordAtDn: userDN
oldPassword: oldPassword
newPassword: newPassword];
}
}
else if (passwordPolicy)
{
didChange = [bindConnection changePasswordAtDn: userDN
oldPassword: oldPassword
newPassword: newPassword
perr: (void *)perr];
}
else
{
// We don't use a password policy - we simply use
// a modify-op to change the password
@ -668,11 +686,6 @@ static Class NSStringK;
didChange = NO;
}
}
else
didChange = [bindConnection changePasswordAtDn: userDN
oldPassword: oldPassword
newPassword: newPassword
perr: (void *)perr];
}
}
}