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
argonaut
Commits
6384d5b5
Commit
6384d5b5
authored
Feb 16, 2017
by
Côme Chilliet
Browse files
Fixes
#5379
Argonaut should use fdMode to work with FD 1.1
parent
f78148e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
argonaut-common/Argonaut/Libraries/Common.pm
View file @
6384d5b5
...
...
@@ -685,7 +685,9 @@ sub argonaut_get_generic_settings {
$settings
->
{'
dn
'}
=
(
$mesg
->
entries
)[
0
]
->
dn
();
$settings
->
{'
mac
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
macAddress
");
$settings
->
{'
ip
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
ipHostNumber
");
if
((
$mesg
->
entries
)[
0
]
->
exists
('
gotoMode
'))
{
if
((
$mesg
->
entries
)[
0
]
->
exists
('
fdMode
'))
{
$settings
->
{'
locked
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
fdMode
")
eq
'
locked
';
}
elsif
((
$mesg
->
entries
)[
0
]
->
exists
('
gotoMode
'))
{
$settings
->
{'
locked
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
gotoMode
")
eq
'
locked
';
}
else
{
$settings
->
{'
locked
'}
=
0
;
...
...
@@ -709,7 +711,7 @@ sub argonaut_get_generic_settings {
$mesg
=
$ldap
->
search
(
# perform a search
base
=>
$ldap_base
,
filter
=>
$filter
,
attrs
=>
[
'
dn
',
'
macAddress
',
'
gotoMode
'
]
attrs
=>
[
'
dn
',
'
macAddress
',
'
gotoMode
'
,
'
fdMode
'
]
);
if
(
scalar
(
$mesg
->
entries
)
>
1
)
{
die
"
Several computers matches
$filter
.
$die_endl
";
...
...
@@ -719,7 +721,9 @@ sub argonaut_get_generic_settings {
$settings
->
{'
dn
'}
=
(
$mesg
->
entries
)[
0
]
->
dn
();
$settings
->
{'
mac
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
macAddress
");
$settings
->
{'
ip
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
ipHostNumber
");
if
((
$mesg
->
entries
)[
0
]
->
exists
('
gotoMode
'))
{
if
((
$mesg
->
entries
)[
0
]
->
exists
('
fdMode
'))
{
$settings
->
{'
locked
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
fdMode
")
eq
'
locked
';
}
elsif
((
$mesg
->
entries
)[
0
]
->
exists
('
gotoMode
'))
{
$settings
->
{'
locked
'}
=
(
$mesg
->
entries
)[
0
]
->
get_value
("
gotoMode
")
eq
'
locked
';
}
else
{
$settings
->
{'
locked
'}
=
0
;
...
...
Write
Preview
Markdown
is supported
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