make 2.2.10

cyrusimap · Nov 23, 2004 · 55c2813 · 55c2813
1 parent b6e0eeb
commit 55c2813
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/cyrus/Makefile.in b/cyrus/Makefile.in
@@ -62,7 +62,7 @@ YACC = @YACC@
 LEX = @LEX@
 COMPILE_ET = @COMPILE_ET@
 
-VERSION = 2.2.9
+VERSION = 2.2.10
 
 all:: 
 	@for d in  $(SUBDIRS); \

diff --git a/cyrus/doc/changes.html b/cyrus/doc/changes.html
@@ -1,13 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: changes.html,v 1.96 2004/11/22 21:23:17 shadow Exp $ -->
+<!-- $Id: changes.html,v 1.97 2004/11/23 17:52:50 shadow Exp $ -->
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta name="generator" content="HTML Tidy, see www.w3.org" />
 <title>Changes to the Cyrus IMAP Server</title>
 </head>
 <body>
 
+<h1>Changes to the Cyrus IMAP Server since 2.2.9</h1>
+<ul>
+<li>Fix 0 termination in mysasl_canon_user.</li>
+<li>Check for imap magic plus buffer overflow in proxyd also (CAN-2004-1015).</li>
+</ul>
+
 <h1>Changes to the Cyrus IMAP Server since 2.2.8</h1>
 <ul>
 <li>Change ACLs correctly when renaming a user</li>
@@ -1984,7 +1990,7 @@ <h2>Changes to the Cyrus IMAP Server Since Version 1.0-Beta</h2>
 </ul>
 
 <hr />
-last modified: $Date: 2004/11/22 21:23:17 $ <br />
+last modified: $Date: 2004/11/23 17:52:50 $ <br />
 <a href="index.html">Return</a> to the Cyrus IMAP Server Home Page
 </body>
 </html>

diff --git a/cyrus/imap/version.h b/cyrus/imap/version.h
@@ -37,10 +37,10 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: version.h,v 1.136 2004/11/22 21:23:17 shadow Exp $
+ * $Id: version.h,v 1.137 2004/11/23 17:52:52 shadow Exp $
  */
 
-#define _CYRUS_VERSION "v2.2.9"
+#define _CYRUS_VERSION "v2.2.10"
 
 /* EXTRA_IDENT is a hack to add some version information for which compile
  * was used to build this version (at CMU, but we don't care what you do with