smeserver/smeserver-ldap
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 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:
Jean-Philippe Pialasse 2024-08-13 22:04:32 -04:00
parent 092b156b80
commit 4e744a3212
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/logrotate.d/ldap
View File

@ -6,6 +6,6 @@
sharedscripts sharedscripts
postrotate postrotate
# OpenLDAP logs via syslog, restart syslog if running # 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 endscript
} }

6
root/sbin/e-smith/ldif-fix
View File

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

1
root/usr/lib/systemd/system/ldap.service
View File

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

9
smeserver-ldap.spec
View File

@ -4,7 +4,7 @@ Summary: smeserver server and gateway - LDAP module
%define name smeserver-ldap %define name smeserver-ldap
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 7 %define release 8
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -14,7 +14,7 @@ Source: %{name}-%{version}.tar.xz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildArchitectures: noarch BuildArchitectures: noarch
Requires: smeserver-base Requires: smeserver-base
Requires: smeserver-lib >= 1.15.1-16 Requires: smeserver-lib >= 11.0.0-7
Requires: openldap >= 2.0.0 Requires: openldap >= 2.0.0
Requires: openldap-clients Requires: openldap-clients
Requires: openldap-servers Requires: openldap-servers
@ -29,6 +29,11 @@ Provides: e-smith-ldap
smeserver server and gateway software - LDAP module. smeserver server and gateway software - LDAP module.
%changelog %changelog
* 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]
* Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme * Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- fix ldap.init fails as starts before samba [SME: 12570] - fix ldap.init fails as starts before samba [SME: 12570]