* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme

- ldif-fix filter string accepting only ascii [SME: 12720]
- fix logrotate does not fill new log [SME: 12673]
- fix prestart script logs to messages [SME: 12693]
This commit is contained in:
2024-08-13 22:04:32 -04:00
parent 092b156b80
commit 4e744a3212
4 changed files with 13 additions and 5 deletions

View File

@@ -6,6 +6,6 @@
sharedscripts
postrotate
# OpenLDAP logs via syslog, restart syslog if running
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
/usr/bin/systemctl -s HUP kill rsyslog.service 2> /dev/null || true
endscript
}

View File

@@ -8,6 +8,8 @@ use Date::Parse;
use esmith::ConfigDB;
use esmith::AccountsDB;
use esmith::util;
use utf8;
use esmith::util::ldap;
use Getopt::Long qw(:config bundling);
$ENV{'PATH'} = '/bin:/usr/bin:/sbin:/usr/sbin';
@@ -97,8 +99,8 @@ foreach my $acct ($a->get('admin'), $a->users, $a->groups, $a->ibays, $a->get_al
push @{$data->{$dn}->{objectclass}}, 'inetOrgPerson';
$data->{$dn}->{mail} = "$key\@$domain";
@{$data->{$dn}}{qw/givenname sn telephonenumber o ou l street/} =
map { $acct->prop($_) || [] } qw/FirstName LastName Phone Company Dept City Street/;
$data->{$dn}->{cn} = $acct->prop('FirstName').' '.$acct->prop('LastName');
map { stringToASCII($acct->prop($_)) || [] } qw/FirstName LastName Phone Company Dept City Street/;
$data->{$dn}->{cn} = stringToASCII($acct->prop('FirstName').' '.$acct->prop('LastName'));
}
else {
push @{$data->{$dn}->{objectclass}}, 'account';

View File

@@ -21,6 +21,7 @@ TimeoutStartSec=300
Restart=always
ExecStopPost=/sbin/e-smith/systemd/ldap-finish
SyslogIdentifier=ldap
[Install]
WantedBy=sme-server.target