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-plugins
Commits
85cbd036
Commit
85cbd036
authored
Mar 28, 2013
by
Côme Bernigaud
Committed by
Benoit Mortier
Mar 28, 2013
Browse files
Fixes:
#2170
sambaPwdCanChange is obsolete
parent
9387b5b8
Changes
1
Show whitespace changes
Inline
Side-by-side
samba/personal/samba/class_sambaAccount.inc
View file @
85cbd036
...
...
@@ -298,8 +298,7 @@ class sambaAccount extends simplePlugin
),
new
BooleanAttribute
(
_
(
'Cannot change password'
),
_
(
'Not allowed to change password'
),
'sambaPwdCanChange'
,
FALSE
,
FALSE
,
''
,
'4294967295'
,
''
'fd_pwdCantChange'
),
new
DateAttribute
(
_
(
'Account expiration'
),
_
(
'When does the account expire'
),
...
...
@@ -371,6 +370,15 @@ class sambaAccount extends simplePlugin
'erase'
=>
array
(
''
=>
array
(
'sambaHomePath'
))
)
);
$this
->
attributesAccess
[
'sambaPwdLastSet'
]
->
setManagedAttributes
(
array
(
'disable'
=>
array
(
TRUE
=>
array
(
'fd_pwdCantChange'
))
)
);
$this
->
attributesAccess
[
'fd_pwdCantChange'
]
->
setInLdap
(
FALSE
);
$value
=
(
isset
(
$this
->
attrs
[
'sambaPwdLastSet'
])
&&
(
$this
->
attrs
[
'sambaPwdLastSet'
][
0
]
==
'4294967295'
));
$this
->
attributesAccess
[
'fd_pwdCantChange'
]
->
setInitialValue
(
$value
);
$this
->
attributesAccess
[
'fd_pwdCantChange'
]
->
setValue
(
$value
);
// Get samba domain and its sid/rid base
if
(
$this
->
sambaSID
!=
""
)
{
...
...
@@ -492,11 +500,10 @@ class sambaAccount extends simplePlugin
}
/* Do not modify values if not needed */
if
(
!
$this
->
attributesAccess
[
'sambaPwdLastSet'
]
->
hasChanged
())
{
if
(
!
$this
->
attributesAccess
[
'sambaPwdLastSet'
]
->
hasChanged
()
&&
!
$this
->
attributesAccess
[
'fd_pwdCantChange'
]
->
hasChanged
()
)
{
unset
(
$this
->
attrs
[
'sambaPwdLastSet'
]);
}
if
(
!
$this
->
attributesAccess
[
'sambaPwdCanChange'
]
->
hasChanged
())
{
unset
(
$this
->
attrs
[
'sambaPwdCanChange'
]);
}
elseif
(
!
$this
->
sambaPwdLastSet
)
{
$this
->
attrs
[
'sambaPwdLastSet'
]
=
(
$this
->
fd_pwdCantChange
?
array
(
'4294967295'
)
:
''
);
}
// Handle "sambaKickoffTime"
...
...
dani
@dani
mentioned in issue
#695 (closed)
·
Sep 02, 2017
mentioned in issue
#695 (closed)
mentioned in issue #695
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