ldap/servers/plugins/retrocl/retrocl_trim.c | 3 +- ldap/servers/slapd/daemon.c | 2 - ldap/servers/slapd/tools/ldclt/ldapfct.c | 4 +-- rpm/389-ds-base.spec.in | 32 ++++++++++++++++++++++++---- 4 files changed, 33 insertions(+), 8 deletions(-)
New commits: commit df132105a255a96e31064e21cfa151384d060d42 Author: Noriko Hosoi nhosoi@redhat.com Date: Tue Jun 23 13:47:28 2015 -0700
Updating 389-ds-base.spec.in for the better nunc-stans support.
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index d0bbb7a..64541f1 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -11,11 +11,16 @@ %global use_db4 0 # If perl-Socket-2.000 or newer is available, set 0 to use_Socket6. %global use_Socket6 0 +# nunc-stans only builds on x86_64 for now +%ifarch x86_64 # To build without nunc-stans, set 0 to use_nunc_stans. %global use_nunc_stans 1 +%else +%global use_nunc_stans 0 +%endif
%if %{use_nunc_stans} -%global nunc_stans_ver 0.1.3 +%global nunc_stans_ver 0.1.5 %endif
# fedora 15 and later uses tmpfiles.d @@ -148,6 +153,11 @@ BuildRequires: libdb-devel BuildRequires: cyrus-sasl-devel BuildRequires: libicu-devel BuildRequires: pcre-devel +%if %{use_nunc_stans} +BuildRequires: libtalloc-devel +BuildRequires: libevent-devel +BuildRequires: libtevent-devel +%endif
%description libs Core libraries for the 389 Directory Server base package. These libraries @@ -167,6 +177,11 @@ Requires: openldap-devel %else Requires: mozldap-devel %endif +%if %{use_nunc_stans} +Requires: libtalloc +Requires: libevent +Requires: libtevent +%endif
%description devel Development Libraries and headers for the 389 Directory Server base package. @@ -184,9 +199,9 @@ pushd ../nunc-stans-%{nunc_stans_ver} %configure --with-fhs --libdir=%{_libdir}/%{pkgname} make %{?_smp_mflags} mkdir lib -ln -s .libs/libnunc-stans.so.0.0.0 lib/libnunc-stans.so -mkdir nunc-stans -ln -s nunc-stans.h nunc-stans/nunc-stans.h +cp .libs/libnunc-stans.so.0.0.0 lib/libnunc-stans.so +mkdir -p include/nunc-stans +cp nunc-stans.h include/nunc-stans/nunc-stans.h popd %endif
@@ -349,6 +364,9 @@ fi %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel %{_includedir}/%{pkgname} %{_libdir}/%{pkgname}/libslapd.so +%if %{use_nunc_stans} +%{_libdir}/%{pkgname}/libnunc-stans.so +%endif %{_libdir}/pkgconfig/*
%files libs @@ -362,6 +380,12 @@ fi %endif
%changelog +* Tue Jun 23 2015 Noriko Hosoi nhosoi@redhat.com - 1.3.4.1-1 +- Release 1.3.4.1-1 + +* Fri Jun 19 2015 Noriko Hosoi nhosoi@redhat.com - 1.3.4.0-1 +- Release 1.3.4.0-1 (rebase) + * Wed Feb 25 2015 Noriko Hosoi nhosoi@redhat.com - 1.3.3.8-2 - Ticket 48030 - DNS errors after IPA upgrade due to broken ReplSync Fixes spec file to make sure all the server instances are stopped before upgrade
commit 32d45c74231545ad91934147962bfb676dcdd391 Author: Noriko Hosoi nhosoi@redhat.com Date: Tue Jun 23 14:48:13 2015 -0700
Ticket #48203 - Fix coverity issues - 06/22/2015
Description: 13294 Uninitialized scalar variable -- retrocl_init_trimming (introduced by #47669) 13293 Resource leak -- retrocl_init_trimming (introduced by #47669)
2. Defect type: CHECKED_RETURN 50. ldap/servers/slapd/tools/ldclt/ldapfct.c:1945: 9. ldap/servers/slapd/tools/ldclt/ldapfct.c:952: check_return: Calling "addErrorStat" without checking return value (as is done elsewhere 26 out of 28 times).
1. Defect type: COMPILER_WARNING 2. ldap/servers/slapd/daemon.c:1412:21: warning: 'tp' may be used uninitialized in this function [-Wmaybe-uninitialized]
https://fedorahosted.org/389/ticket/48203
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c index 65f3015..b09f669 100644 --- a/ldap/servers/plugins/retrocl/retrocl_trim.c +++ b/ldap/servers/plugins/retrocl/retrocl_trim.c @@ -412,7 +412,7 @@ void retrocl_housekeeping ( time_t cur_time, void *noarg ) void retrocl_init_trimming (void) { const char *cl_maxage; - time_t ageval; + time_t ageval = 0; /* Don't trim, by default */ const char *cl_trim_interval;
cl_maxage = retrocl_get_config_str(CONFIG_CHANGELOG_MAXAGE_ATTRIBUTE); @@ -425,6 +425,7 @@ void retrocl_init_trimming (void) "retrocl_init_trimming: ignoring invalid %s value %s; " "not trimming retro changelog.\n", CONFIG_CHANGELOG_MAXAGE_ATTRIBUTE, cl_maxage); + slapi_ch_free_string((char **)&cl_maxage); return; } } diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c index 436f3d5..ba73da3 100644 --- a/ldap/servers/slapd/daemon.c +++ b/ldap/servers/slapd/daemon.c @@ -1026,7 +1026,7 @@ void slapd_daemon( daemon_ports_t *ports ) int threads; int in_referral_mode = config_check_referral_mode(); #ifdef ENABLE_NUNC_STANS - ns_thrpool_t *tp; + ns_thrpool_t *tp = NULL; struct ns_thrpool_config tp_config; #endif int connection_table_size = get_configured_connection_table_size(); diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c b/ldap/servers/slapd/tools/ldclt/ldapfct.c index bc8c89d..f906c5a 100644 --- a/ldap/servers/slapd/tools/ldclt/ldapfct.c +++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c @@ -949,7 +949,7 @@ connectToServer ( fprintf (stderr, "ldclt[%d]: T%03d: cannot ldap_unbind(), error=%d (%s)\n", mctx.pid, tttctx->thrdNum, ret,strerror (ret)); fflush (stderr); - addErrorStat(ret); + (void)addErrorStat(ret); return (-1); } tttctx->ldapCtx = NULL; @@ -1942,7 +1942,7 @@ createMissingNodes ( printf ("ldclt[%d]: T%03d: Cannot add (%s), error=%d (%s)\n", mctx.pid, tttctx->thrdNum, nodeDN, ret, my_ldap_err2string (ret)); fflush (stdout); - addErrorStat(ret); + (void)addErrorStat(ret); return (-1); }