Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision dfa7a3a9

Von Moritz Bunkus vor fast 14 Jahren hinzugefügt

  • ID dfa7a3a99a0b1ba731d1d4f81768308c10ace0d3
  • Vorgänger 7b4699d8
  • Nachfolger 78740763

Konfigurationsdatei config/authentication.pl nach config/lx_office.conf(.default) gemerget

Unterschiede anzeigen:

SL/Auth/LDAP.pm
41 41
  $self->{ldap} = Net::LDAP->new($cfg->{host}, 'port' => $port);
42 42

  
43 43
  if (!$self->{ldap}) {
44
    $main::form->error($main::locale->text('The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.', $cfg->{host}, $port));
44
    $main::form->error($main::locale->text('The LDAP server "#1:#2" is unreachable. Please check config/lx_office.conf.', $cfg->{host}, $port));
45 45
  }
46 46

  
47 47
  if ($cfg->{tls}) {
48 48
    my $mesg = $self->{ldap}->start_tls('verify' => 'none');
49 49
    if ($mesg->is_error()) {
50
      $main::form->error($main::locale->text('The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/authentication.pl.'));
50
      $main::form->error($main::locale->text('The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/lx_office.conf.'));
51 51
    }
52 52
  }
53 53

  
54 54
  if ($cfg->{bind_dn}) {
55 55
    my $mesg = $self->{ldap}->bind($cfg->{bind_dn}, 'password' => $cfg->{bind_password});
56 56
    if ($mesg->is_error()) {
57
      $main::form->error($main::locale->text('Binding to the LDAP server as "#1" failed. Please check config/authentication.pl.', $cfg->{bind_dn}));
57
      $main::form->error($main::locale->text('Binding to the LDAP server as "#1" failed. Please check config/lx_office.conf.', $cfg->{bind_dn}));
58 58
    }
59 59
  }
60 60

  
......
192 192
  my $cfg  = $self->{auth}->{LDAP_config};
193 193

  
194 194
  if (!$cfg) {
195
    $form->error($locale->text('config/authentication.pl: Key "LDAP_config" is missing.'));
195
    $form->error($locale->text('config/lx_office.conf: Key "authentication/ldap" is missing.'));
196 196
  }
197 197

  
198 198
  if (!$cfg->{host} || !$cfg->{attribute} || !$cfg->{base_dn}) {
199
    $form->error($locale->text('config/authentication.pl: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".'));
199
    $form->error($locale->text('config/lx_office.conf: Missing parameters in "authentication/ldap". Required parameters are "host", "attribute" and "base_dn".'));
200 200
  }
201 201

  
202 202
  $main::lxdebug->leave_sub();

Auch abrufbar als: Unified diff