ldap/admin/src/scripts/bak2db.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/db2bak.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/db2index.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/db2ldif.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/dbverify.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/dn2rdn.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/ldif2db.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/ldif2ldap.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/monitor.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/restart-dirsrv.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/restoreconfig.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/saveconfig.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/start-dirsrv.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/stop-dirsrv.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/suffix2instance.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/upgradedb.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/upgradednformat.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/vlvindex.in | 2 1 + 1 - 0 !
18 files changed, 18 insertions(+), 18 deletions(-)

---

ldap/admin/src/scripts/template-bak2db.pl.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/template-db2bak.pl.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/template-db2index.pl.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/template-db2ldif.pl.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/template-ldif2db.pl.in | 2 1 + 1 - 0 !
5 files changed, 5 insertions(+), 5 deletions(-)

---

m4/svrcore.m4 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix autoconf macro to detect svrcore properly
 configure bails out with a linking error against libsoftokn, which is according
 #473275 the correct behaviour. The patch modifies the m4 file to do not link
 against this lib.

ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 4 4 + 0 - 0 !
ldap/systools/idsktune.c | 5 5 + 0 - 0 !
2 files changed, 9 insertions(+)

 fix build on kfreebsd (and probably other bsd systems)
 1) ENODATA is no ISO C standard and is missing on BSD.
 2) The sysctl for the TCP keepalive interval is net.inet.tcp.keepintvl
    on BSD.

configure.ac | 40 40 + 0 - 0 !
include/base/systems.h | 2 1 + 1 - 0 !
include/public/base/systems.h | 2 1 + 1 - 0 !
ldap/include/portable.h | 6 3 + 3 - 0 !
ldap/servers/slapd/daemon.c | 6 3 + 3 - 0 !
ldap/servers/slapd/tools/pwenc.c | 2 1 + 1 - 0 !
ldap/systools/idsktune.c | 5 5 + 0 - 0 !
lib/base/dnsdmain.cpp | 4 2 + 2 - 0 !
lib/base/file.cpp | 2 1 + 1 - 0 !
9 files changed, 57 insertions(+), 12 deletions(-)

 add support for kfreebsd
 The configure script should check for available features of the host instead
 of assuming that specific hosts (e.g. Linux) have specific features.
 .
 This patch hacks the configure script and various source files to behave
 on kFreeBSD similar to Linux.

wrappers/systemd-snmp.service.in | 2 1 + 1 - 0 !
wrappers/systemd.group.in | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

---

ldap/servers/slapd/ldaputil.c | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

---

buildnum.pl | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

ldap/admin/src/scripts/start-dirsrv.in | 2 1 + 1 - 0 !
ldap/admin/src/scripts/stop-dirsrv.in | 4 2 + 2 - 0 !
2 files changed, 3 insertions(+), 3 deletions(-)

 fix the path to systemctl binary

ldap/servers/plugins/uiduniq/uid.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

  increase the size of the allocation to tmp_config->attrs.
    
    https://fedorahosted.org/389/ticket/48986
    

Makefile.am | 3 0 + 3 - 0 !
configure.ac | 49 32 + 17 - 0 !
ldap/servers/slapd/slapi_counter.c | 149 48 + 101 - 0 !
ldap/servers/slapd/slapi_counter_sunos_sparcv9.S | 105 0 + 105 - 0 !
test/libslapd/counters/atomic.c | 69 69 + 0 - 0 !
5 files changed, 149 insertions(+), 226 deletions(-)

---