summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--slapi-nis.spec6
-rw-r--r--src/back-nis.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/slapi-nis.spec b/slapi-nis.spec
index 60b29d1..f0dcd0c 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -6,7 +6,7 @@
Name: slapi-nis
Version: 0.21
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NIS Server and Schema Compatibility plugins for Directory Server
Group: System Environment/Daemons
License: GPLv2
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/nisserver-plugin-defs
%changelog
+* Thu Jan 6 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.21-2
+- make sure we always pull in nss-devel and nspr-devel, and the right
+ ldap toolkit for the Fedora or RHEL version
+
* Tue Nov 18 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.21-1
- update to 0.21
- schema-compat: don't look at standalone compat containers for a search,
diff --git a/src/back-nis.c b/src/back-nis.c
index 869e903..360f9ac 100644
--- a/src/back-nis.c
+++ b/src/back-nis.c
@@ -284,9 +284,10 @@ backend_gather_data(struct plugin_state *state, Slapi_Entry *e,
n_groups = j;
ret = malloc((n + 1) * sizeof(char *));
lengths = malloc(n * sizeof((*ret_lengths)[0]));
- if ((ret == NULL) || (ret_lengths == NULL)) {
+ if ((ret == NULL) || (lengths == NULL) || (ret_lengths == NULL)) {
free(ret);
free(lengths);
+ free(single_lengths);
backend_free_gathered_data(NULL, NULL,
n_singles, singles,
n_groups, groups, group_lengths);