View | Details | Raw Unified | Return to bug 28385
Collapse All | Expand All

(-)a/C4/Auth_with_ldap.pm (-2 / +3 lines)
Lines 52-58 sub ldapserver_error { Link Here
52
use vars qw($mapping @ldaphosts $base $ldapname $ldappassword);
52
use vars qw($mapping @ldaphosts $base $ldapname $ldappassword);
53
my $ldap = C4::Context->config("ldapserver") or die 'No "ldapserver" in server hash from KOHA_CONF: ' . $ENV{KOHA_CONF};
53
my $ldap = C4::Context->config("ldapserver") or die 'No "ldapserver" in server hash from KOHA_CONF: ' . $ENV{KOHA_CONF};
54
# since Bug 28278 we need to skip id in <ldapserver id="ldapserver"> which generates additional hash level
54
# since Bug 28278 we need to skip id in <ldapserver id="ldapserver"> which generates additional hash level
55
$ldap = $ldap->{ldapserver}         or die ldapserver_error('id="ldapserver"');
55
if ( exists $ldap->{ldapserver} ) {
56
    $ldap = $ldap->{ldapserver}         or die ldapserver_error('id="ldapserver"');
57
}
56
my $prefhost  = $ldap->{hostname}	or die ldapserver_error('hostname');
58
my $prefhost  = $ldap->{hostname}	or die ldapserver_error('hostname');
57
my $base      = $ldap->{base}		or die ldapserver_error('base');
59
my $base      = $ldap->{base}		or die ldapserver_error('base');
58
$ldapname     = $ldap->{user}		;
60
$ldapname     = $ldap->{user}		;
59
- 

Return to bug 28385