Merge branch 'fix/ldap-password-change'
This commit is contained in:
commit
6a68c255bd
|
@ -632,7 +632,25 @@ static Class NSStringK;
|
||||||
IDField, [login escapedForLDAPDN], baseDN];
|
IDField, [login escapedForLDAPDN], baseDN];
|
||||||
if (userDN)
|
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
|
// We don't use a password policy - we simply use
|
||||||
// a modify-op to change the password
|
// a modify-op to change the password
|
||||||
|
@ -668,11 +686,6 @@ static Class NSStringK;
|
||||||
didChange = NO;
|
didChange = NO;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
didChange = [bindConnection changePasswordAtDn: userDN
|
|
||||||
oldPassword: oldPassword
|
|
||||||
newPassword: newPassword
|
|
||||||
perr: (void *)perr];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue