← Back to branch summary

~clint-fewbar/+junk/cyrus-sasl2-builddeb

« back to all changes in this revision

Viewing changes to debian/patches/0032-revert_1.103_revision_to_unbreak_GSSAPI.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ondřej Surý
  • Date: 2011-06-08 08:37:13 UTC
  • mfrom: (2.1.16 sid)
  • Revision ID: james.westby@ubuntu.com-20110608083713-p54jwpkmq0di2x2e
Tags: 2.1.24~rc1.dfsg1+cvs2011-05-23-4
http://bugs.debian.org/629589
Fix yet another upstream segfault breakage in GSSAPI from CVS
(Closes: #629589)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0032-revert_1.103_revision_to_unbreak_GSSAPI.patch
 
1
--- a/plugins/gssapi.c
 
2
+++ b/plugins/gssapi.c
 
3
@@ -1480,10 +1480,10 @@ static int gssapi_client_mech_step(void
 
4
        }
 
5
 
 
6
        /* Setup req_flags properly */
 
7
-       req_flags = GSS_C_INTEG_FLAG;
 
8
+       req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG;
 
9
        if (params->props.max_ssf > params->external_ssf) {
 
10
            /* We are requesting a security layer */
 
11
-           req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG;
 
12
+           req_flags |= GSS_C_INTEG_FLAG;
 
13
            /* Any SSF bigger than 1 is confidentiality. */
 
14
            /* Let's check if the client of the API requires confidentiality,
 
15
               and it wasn't already provided by an external layer */