Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
3353fca4
Commit
3353fca4
authored
Oct 01, 2014
by
Côme Bernigaud
Committed by
Benoit Mortier
Oct 01, 2014
Browse files
Fixes
#3383
Fixed locking users
parent
1a14a48d
Changes
1
Show whitespace changes
Inline
Side-by-side
include/password-methods/class_password-methods.inc
View file @
3353fca4
...
...
@@ -133,7 +133,7 @@ class passwordMethod
}
/*!
* \brief Unlocks an account (gosaAccount) which was locked by 'lock_account()'.
* \brief
(
Un
)
locks an account (gosaAccount) which was locked by 'lock_account()'.
* For details about the locking mechanism see 'lock_account()'.
*/
private
function
generic_modify_account
(
$config
,
$dn
,
$mode
)
...
...
@@ -175,9 +175,6 @@ class passwordMethod
$modify
=
lock_samba_account
(
$mode
,
$attrs
);
// (Un)lock the account by modifying the password hash.
$pwdClass
=
new
password
(
$config
,
$dn
);
$pwdClass
->
callHook
(
$pwdClass
,
'PRE'
.
$mode
,
array
(),
$ret
);
if
(
$mode
==
'LOCK'
)
{
/* Lock entry */
$pwd
=
preg_replace
(
"/(^[^\}]+\})(.*$)/"
,
"
\\
1!
\\
2"
,
$pwd
);
...
...
@@ -189,10 +186,6 @@ class passwordMethod
$ldap
->
cd
(
$dn
);
$ldap
->
modify
(
$modify
);
// Call the password post-lock hook, if defined.
if
(
$ldap
->
success
())
{
$pwdClass
->
callHook
(
$pwdClass
,
'POST'
.
$mode
,
array
(),
$ret
);
}
return
$ldap
->
success
();
}
return
FALSE
;
...
...
Côme Chilliet
@cchilliet
mentioned in issue
#1126 (closed)
·
Sep 02, 2017
mentioned in issue
#1126 (closed)
mentioned in issue #1126
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment