Revert "Do not leak memory memory leak in plugin_common.c ..." (#1202364)

This reverts commit c11ac22f93.
This commit is contained in:
Jakub Jelen 2015-03-16 16:59:59 +01:00
parent 393aa38972
commit 29eb7eb1fb
2 changed files with 2 additions and 17 deletions

View File

@ -1,12 +0,0 @@
diff --git a/plugins/plugin_common.c b/plugins/plugin_common.c
index fc66062..3ef81e9 100644
--- a/plugins/plugin_common.c
+++ b/plugins/plugin_common.c
@@ -416,6 +416,7 @@ int _plug_get_password(const sasl_utils_t *utils, sasl_secret_t **password,
PARAMERROR(utils);
return SASL_BADPARAM;
}
+ *iscopy = 1;
}
return ret;

View File

@ -56,10 +56,8 @@ Patch52: cyrus-sasl-2.1.26-config-error.patch
Patch53: cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch
# Do not leak memory in sample server (#852755)
Patch54: cyrus-sasl-2.1.26-sample-leak.patch
# Do not leak memory memory leak in plugin_common.c for password callback (#1191183)
Patch55: cyrus-sasl-2.1.26-leak-callback-plugin_common.patch
# Document ability to run saslauthd unprivileged (#1189203)
Patch56: cyrus-sasl-2.1.26-saslauthd-user.patch
Patch55: cyrus-sasl-2.1.26-saslauthd-user.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@ -205,8 +203,7 @@ chmod -x include/*.h
%patch52 -p1 -b .configerr
%patch53 -p1 -b .sha1vsplain
%patch54 -p1 -b .leak
%patch55 -p1 -b .password-callback
%patch56 -p1 -b .man-unprivileged
%patch55 -p1 -b .man-unprivileged
%build