Commit 33f2a685 authored by Côme Chilliet's avatar Côme Chilliet

Merge branch '6093-read-fdppolicydefaultdn-option-instead-of-fdppolicydefaultcn' into '1.4-dev'

Resolve "Read fdPpolicyDefaultDn option instead of fdPpolicyDefaultCn"

See merge request fusiondirectory/fd!771
parents c118cd43 48eb87f1
......@@ -419,10 +419,7 @@ class user extends simplePlugin
if (isset($attrs['pwdPolicySubentry'][0])) {
$ppolicydn = $attrs['pwdPolicySubentry'][0];
} else {
$ppolicydn = $config->get_cfg_value('ppolicyDefaultCn', '');
if (!empty($ppolicydn)) {
$ppolicydn = 'cn='.$ppolicydn.','.get_ou('ppolicyRDN').$config->current['BASE'];
}
$ppolicydn = $config->get_cfg_value('ppolicyDefaultDn', '');
}
$policy = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment