diff --git a/cyrus-sasl-revert_gssapi_flags.patch b/cyrus-sasl-revert_gssapi_flags.patch new file mode 100644 index 0000000..6dd6c79 --- /dev/null +++ b/cyrus-sasl-revert_gssapi_flags.patch @@ -0,0 +1,15 @@ +--- a/plugins/gssapi.c ++++ b/plugins/gssapi.c +@@ -1583,10 +1583,10 @@ static int gssapi_client_mech_step(void *conn_context, + } + + /* Setup req_flags properly */ +- req_flags = GSS_C_INTEG_FLAG; ++ req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; + if (params->props.max_ssf > params->external_ssf) { + /* We are requesting a security layer */ +- req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; ++ req_flags |= GSS_C_INTEG_FLAG; + /* Any SSF bigger than 1 is confidentiality. */ + /* Let's check if the client of the API requires confidentiality, + and it wasn't already provided by an external layer */ diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index d86f449..6075140 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 13 11:03:45 UTC 2014 - ckornacker@suse.com + +- Revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 + cyrus-sasl-revert_gssapi_flags.patch (bnc#775279) + ------------------------------------------------------------------- Sat Nov 2 20:47:58 UTC 2013 - jengelh@inai.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index ddf1ed7..45353b1 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -34,6 +34,7 @@ Patch1: shared_link_on_ppc.patch Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix-sasl-header.diff +Patch8: cyrus-sasl-revert_gssapi_flags.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel @@ -170,6 +171,7 @@ fi %patch5 -p1 %patch6 %patch7 -p1 +%patch8 -p1 %build find . -name "*.cvsignore" -exec rm -fv "{}" "+"