Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4bacfb02

Von Moritz Bunkus vor etwa 12 Jahren hinzugefügt

  • ID 4bacfb02354f2591cb7d750962109976a570233b
  • Vorgänger a2ffcc94
  • Nachfolger 5a23fdf6

Hinweise auf lx_office.conf in kivitendo.conf geändert

Fixt #2031.

Unterschiede anzeigen:

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

  
51 51
  if (!$self->{ldap}) {
52
    $main::form->error($main::locale->text('The LDAP server "#1:#2" is unreachable. Please check config/lx_office.conf.', $cfg->{host}, $port));
52
    $main::form->error($main::locale->text('The LDAP server "#1:#2" is unreachable. Please check config/kivitendo.conf.', $cfg->{host}, $port));
53 53
  }
54 54

  
55 55
  if ($cfg->{tls}) {
56 56
    my $mesg = $self->{ldap}->start_tls('verify' => 'none');
57 57
    if ($mesg->is_error()) {
58
      $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.'));
58
      $main::form->error($main::locale->text('The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/kivitendo.conf.'));
59 59
    }
60 60
  }
61 61

  
62 62
  if ($cfg->{bind_dn}) {
63 63
    my $mesg = $self->{ldap}->bind($cfg->{bind_dn}, 'password' => $cfg->{bind_password});
64 64
    if ($mesg->is_error()) {
65
      $main::form->error($main::locale->text('Binding to the LDAP server as "#1" failed. Please check config/lx_office.conf.', $cfg->{bind_dn}));
65
      $main::form->error($main::locale->text('Binding to the LDAP server as "#1" failed. Please check config/kivitendo.conf.', $cfg->{bind_dn}));
66 66
    }
67 67
  }
68 68

  
......
204 204
  my $cfg  = $self->{auth}->{LDAP_config};
205 205

  
206 206
  if (!$cfg) {
207
    $form->error($locale->text('config/lx_office.conf: Key "authentication/ldap" is missing.'));
207
    $form->error($locale->text('config/kivitendo.conf: Key "authentication/ldap" is missing.'));
208 208
  }
209 209

  
210 210
  if (!$cfg->{host} || !$cfg->{attribute} || !$cfg->{base_dn}) {
211
    $form->error($locale->text('config/lx_office.conf: Missing parameters in "authentication/ldap". Required parameters are "host", "attribute" and "base_dn".'));
211
    $form->error($locale->text('config/kivitendo.conf: Missing parameters in "authentication/ldap". Required parameters are "host", "attribute" and "base_dn".'));
212 212
  }
213 213

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

Auch abrufbar als: Unified diff