[SVN] r473 - in /branches/cvsmerge/cyrus-cvs/imtest: CVS/Entries imtest.c

[debian at incase.de]

Author: sven
Date: Fri May 26 21:10:37 2006
New Revision: 473

URL: https://mail.incase.de/viewcvs?rev=473&root=cyrus22&view=rev
Log:
compatibility fix for SASL 2.1.22

Modified:
    branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries
    branches/cvsmerge/cyrus-cvs/imtest/imtest.c

Modified: branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries?rev=473&root=cyrus22&r1=472&r2=473&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries Fri May 26 21:10:37 2006
@@ -1,4 +1,4 @@
 /.cvsignore/1.3/Wed Oct 22 18:03:01 2003//
 /Makefile.in/1.30/Fri May 28 18:03:03 2004//
-/imtest.c/1.107/Thu Feb  9 23:49:54 2006//
+/imtest.c/1.108/Fri May 26 18:59:58 2006//
 D

Modified: branches/cvsmerge/cyrus-cvs/imtest/imtest.c
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imtest/imtest.c?rev=473&root=cyrus22&r1=472&r2=473&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imtest/imtest.c (original)
+++ branches/cvsmerge/cyrus-cvs/imtest/imtest.c Fri May 26 21:10:37 2006
@@ -1,7 +1,7 @@
 /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
  * Ken Murchison (multi-protocol implementation)
  * Tim Martin (SASL implementation)
- * $Id: imtest.c,v 1.107 2006/01/20 20:31:23 jeaton Exp $
+ * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $
  *
  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
  *
@@ -886,6 +886,12 @@
     }
     
     if (*str != '\r') {
+	/* trim CRLF */
+	char *p = str + strlen(str) - 1;
+	if (p >= str && *p == '\n') *p-- = '\0';
+	if (p >= str && *p == '\r') *p-- = '\0';
+
+	/* alloc space for decoded response */
 	len = strlen(str) + 1;
 	*line = malloc(len);
 	if ((*line) == NULL) {