Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
bccee0be
Commit
bccee0be
authored
Dec 19, 2019
by
Olm
Committed by
Francesc Guasch
Dec 19, 2019
Browse files
Using the eventual ldap.field configuration option, uid as default (#1206)
parent
0875b65d
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/Ravada/Auth/LDAP.pm
View file @
bccee0be
...
...
@@ -189,7 +189,7 @@ sub search_user {
my
$username
=
delete
$args
{
name
}
or
confess
"
Missing user name
";
my
$retry
=
(
delete
$args
{
retry
}
or
0
);
my
$field
=
(
delete
$args
{
field
}
or
'
uid
');
my
$field
=
(
delete
$args
{
field
}
or
$$CONFIG
->
{
ldap
}
->
{
field
}
or
'
uid
');
my
$ldap
=
(
delete
$args
{
ldap
}
or
_init_ldap_admin
());
my
$base
=
(
delete
$args
{
base
}
or
_dc_base
());
my
$typesonly
=
(
delete
$args
{
typesonly
}
or
0
);
...
...
@@ -415,8 +415,7 @@ sub _login_bind {
my
(
$username
,
$password
)
=
(
$self
->
name
,
$self
->
password
);
my
$found
=
0
;
for
my
$user
(
search_user
(
name
=>
$self
->
name
,
field
=>
'
uid
'
)
,
search_user
(
name
=>
$self
->
name
,
field
=>
'
cn
'))
{
for
my
$user
(
search_user
(
name
=>
$self
->
name
))
{
my
$dn
=
$user
->
dn
;
$found
++
;
my
$mesg
=
$LDAP_ADMIN
->
bind
(
$dn
,
password
=>
$password
);
...
...
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