From a166382d72e2e0eeb3f7f0417947b82dbca9c286 Mon Sep 17 00:00:00 2001 From: Jan F Date: Wed, 25 May 2011 04:18:24 +0200 Subject: [PATCH] repair ntlm support --- cyrus-sasl-2.1.23-ntlm.patch | 12 ++++++++++++ cyrus-sasl.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 cyrus-sasl-2.1.23-ntlm.patch diff --git a/cyrus-sasl-2.1.23-ntlm.patch b/cyrus-sasl-2.1.23-ntlm.patch new file mode 100644 index 0000000..44eb17d --- /dev/null +++ b/cyrus-sasl-2.1.23-ntlm.patch @@ -0,0 +1,12 @@ +diff -up cyrus-sasl-2.1.23/plugins/ntlm.c.ntlm cyrus-sasl-2.1.23/plugins/ntlm.c +--- cyrus-sasl-2.1.23/plugins/ntlm.c.ntlm 2011-05-25 04:07:22.923341599 +0200 ++++ cyrus-sasl-2.1.23/plugins/ntlm.c 2011-05-25 04:08:02.648341353 +0200 +@@ -1572,7 +1572,7 @@ static int ntlm_server_mech_step2(server + sparams->utils->log(NULL, SASL_LOG_DEBUG, + "calculating NTv2 response"); + V2(resp, password, authid, domain, text->nonce, +- lm_resp + MD5_DIGEST_LENGTH, nt_resp_len - MD5_DIGEST_LENGTH, ++ nt_resp + MD5_DIGEST_LENGTH, nt_resp_len - MD5_DIGEST_LENGTH, + sparams->utils, &text->out_buf, &text->out_buf_len, + &result); + diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 0b79142..5f15c51 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -9,7 +9,7 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.23 -Release: 20%{?dist} +Release: 21%{?dist} License: BSD with advertising Group: System Environment/Libraries # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; @@ -42,6 +42,7 @@ Patch35: cyrus-sasl-2.1.22-bad-elif.patch Patch36: cyrus-sasl-2.1.23-ac-quote.patch Patch37: cyrus-sasl-2.1.23-race.patch Patch38: cyrus-sasl-2.1.23-pam_rhosts.patch +Patch39: cyrus-sasl-2.1.23-ntlm.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, automake, libtool, gdbm-devel, groff @@ -163,6 +164,7 @@ chmod -x include/*.h %patch36 -p1 -b .ac-quote %patch37 -p1 -b .race %patch38 -p1 -b .pam_rhosts +%patch39 -p1 -b .ntlm %build # FIXME - we remove these files directly so that we can avoid using the -f @@ -443,6 +445,9 @@ exit 0 %{_sbindir}/sasl2-shared-mechlist %changelog +* Wed May 25 2011 Jan F. Chadima - 2.1.23-21 +- repair ntlm support + * Mon May 23 2011 Jan F. Chadima - 2.1.23-20 - add logging of the remote host via PAM