Menu
▾
▴
[SM-CVS] SF.net SVN: squirrelmail:[14024] trunk/imap_proxy
|
From: <pdo...@us...> - 2010-07-25 08:59:58
|
Revision: 14024
http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14024&view=rev
Author: pdontthink
Date: 2010-07-25 08:59:51 +0000 (Sun, 25 Jul 2010)
Log Message:
-----------
Committing differences to IMAP Proxy version 1.2.5 RC 2
Modified Paths:
--------------
trunk/imap_proxy/ChangeLog
trunk/imap_proxy/Makefile.in
trunk/imap_proxy/README
trunk/imap_proxy/imapproxy.spec
trunk/imap_proxy/include/common.h
trunk/imap_proxy/pkginfo
trunk/imap_proxy/src/imapcommon.c
trunk/imap_proxy/src/main.c
Modified: trunk/imap_proxy/ChangeLog
===================================================================
--- trunk/imap_proxy/ChangeLog 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/ChangeLog 2010-07-25 08:59:51 UTC (rev 14024)
@@ -1,3 +1,18 @@
+2006-10-03 Dave McMurtrie <dav...@gm...>
+
+ * common.h: Updated version string to 1.2.5rc2.
+
+ * main.c: Patch by Matt Selsky to log ssl peer verify at Debug
+ level instead of err level.
+
+ * Makefile.in: Patch by Matt Selsky to set the permissions on
+ the configuration files to 755 instead of 644.
+
+2006-08-15 Dave McMurtrie <dav...@gm...>
+
+ * imapcommon.c: No longer exit() from IMAP_Line_Read() on
+ failed sanity check.
+
2006-02-16 Dave McMurtrie <dav...@gm...>
* pimpstat.c: Patch by Matt Selsky to fix spelling error.
Modified: trunk/imap_proxy/Makefile.in
===================================================================
--- trunk/imap_proxy/Makefile.in 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/Makefile.in 2010-07-25 08:59:51 UTC (rev 14024)
@@ -88,10 +88,10 @@
ln -s ../init.d/imapproxy /etc/rc0.d/K10imapproxy
install-conf:
- $(INSTALL) -o root -g bin -m 0755 ./scripts/imapproxy.conf $(ETC)
+ $(INSTALL) -o root -g bin -m 0644 ./scripts/imapproxy.conf $(ETC)
rpm-install: install
- $(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.conf $(rpm_prefix)/etc
+ $(INSTALL) -o root -g sys -m 0644 ./scripts/imapproxy.conf $(rpm_prefix)/etc
$(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.init $(rpm_prefix)/etc/init.d/imapproxy
pkg:
Modified: trunk/imap_proxy/README
===================================================================
--- trunk/imap_proxy/README 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/README 2010-07-25 08:59:51 UTC (rev 14024)
@@ -8,7 +8,7 @@
If you want to subscribe to the imapproxy-info mailing list, visit:
-http://lists.andrew.cmu.edu/mailman/listinfo/imapproxy-info
+http://lists.pitt.edu/mailman/listinfo/imapproxy-info
For some Debian specific issues that have come up, read the file README.debian.
Modified: trunk/imap_proxy/imapproxy.spec
===================================================================
--- trunk/imap_proxy/imapproxy.spec 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/imapproxy.spec 2010-07-25 08:59:51 UTC (rev 14024)
@@ -1,6 +1,6 @@
#This is imapproxy rpm spec file
-%define ver 1.2.5rc1
+%define ver 1.2.5rc2
%define rel 1
%define prefix /usr/local
Modified: trunk/imap_proxy/include/common.h
===================================================================
--- trunk/imap_proxy/include/common.h 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/include/common.h 2010-07-25 08:59:51 UTC (rev 14024)
@@ -35,11 +35,14 @@
** RCS:
**
** $Source: /afs/andrew.cmu.edu/usr18/dave64/work/IMAP_Proxy/include/RCS/common.h,v $
-** $Id: common.h,v 1.4 2006/02/16 18:32:30 dave64 Exp $
+** $Id: common.h,v 1.5 2006/10/03 12:21:54 dave64 Exp $
**
** Modification History:
**
** $Log: common.h,v $
+** Revision 1.5 2006/10/03 12:21:54 dave64
+** Updated version string to 1.2.5rc2.
+**
** Revision 1.4 2006/02/16 18:32:30 dave64
** Added IMAP_PROXY_VERSION patch by Matt Selsky.
**
@@ -60,7 +63,7 @@
#define HASH_TABLE_SIZE 1024
-#define IMAP_PROXY_VERSION "1.2.5rc1"
+#define IMAP_PROXY_VERSION "1.2.5rc2"
/*
* Misc. function prototypes.
Modified: trunk/imap_proxy/pkginfo
===================================================================
--- trunk/imap_proxy/pkginfo 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/pkginfo 2010-07-25 08:59:51 UTC (rev 14024)
@@ -1,7 +1,7 @@
PKG=UPimapproxy
NAME=up-imapproxy
ARCH=sparc
-VERSION=1.2.5rc1
+VERSION=1.2.5rc2
CATEGORY=application
VENDOR=www.imapproxy.org
DESC=This is a connection caching imapproxy daemon for proxied imap connections
Modified: trunk/imap_proxy/src/imapcommon.c
===================================================================
--- trunk/imap_proxy/src/imapcommon.c 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/src/imapcommon.c 2010-07-25 08:59:51 UTC (rev 14024)
@@ -34,12 +34,15 @@
**
** RCS:
**
-** $Source: /afs/pitt.edu/usr12/dgm/work/IMAP_Proxy/src/RCS/imapcommon.c,v $
-** $Id: imapcommon.c,v 1.21 2005/06/15 12:06:31 dgm Exp $
+** $Source: /afs/andrew.cmu.edu/usr18/dave64/work/IMAP_Proxy/src/RCS/imapcommon.c,v $
+** $Id: imapcommon.c,v 1.22 2006/08/15 13:13:08 dave64 Exp $
**
** Modification History:
**
** $Log: imapcommon.c,v $
+** Revision 1.22 2006/08/15 13:13:08 dave64
+** No longer exit() from IMAP_Line_Read. Just return failure.
+**
** Revision 1.21 2005/06/15 12:06:31 dgm
** Added missing include directive for openssl/err.h.
** atoui function added to replace calls to atoi.
@@ -1197,11 +1200,6 @@
* Notes: caller must be certain that the IMAPTransactionDescriptor
* is initialized to zero on the first call.
*
- *
- * Callers must check RemainingLiteralBytes after calling this
- * function. If this is set and a caller ignores it, it will
- * play havoc... Actually, it will exit() and kill the entire
- * process.
*--
*/
extern int IMAP_Line_Read( ITD_Struct *ITD )
@@ -1219,8 +1217,14 @@
*/
if ( ITD->LiteralBytesRemaining )
{
- syslog(LOG_ERR, "%s: Sanity check failed! Literal bytestream has not been fully processed (%d bytes remain) and line-oriented read function was called again. Exiting!", fn, ITD->LiteralBytesRemaining);
- exit(1);
+ syslog(LOG_ERR, "%s: Sanity check failed! Literal bytestream has not been fully processed (%d bytes remain) and line-oriented read function was called again.", fn, ITD->LiteralBytesRemaining );
+ /*
+ * Previous behavior was to exit, but that was wrong. This sanity
+ * check only affects a single connection and should not kill the entire
+ * process.
+ * Just return failure and let the caller deal with it.
+ */
+ return( -1 );
}
Modified: trunk/imap_proxy/src/main.c
===================================================================
--- trunk/imap_proxy/src/main.c 2010-07-25 08:56:34 UTC (rev 14023)
+++ trunk/imap_proxy/src/main.c 2010-07-25 08:59:51 UTC (rev 14024)
@@ -36,11 +36,19 @@
** RCS:
**
** $Source: /afs/andrew.cmu.edu/usr18/dave64/work/IMAP_Proxy/src/RCS/main.c,v $
-** $Id: main.c,v 1.29 2006/02/16 18:43:42 dave64 Exp $
+** $Id: main.c,v 1.31 2006/10/03 12:13:09 dave64 Exp $
**
** Modification History:
**
** $Log: main.c,v $
+** Revision 1.31 2006/10/03 12:13:09 dave64
+** Patch by Matt Selsky to log ssl peer verify at debug level instead
+** of err level.
+**
+** Revision 1.30 2006/04/13 12:39:15 dave64
+** Patch by Ramiro Morales to prevent bad file descriptor error
+** on startup.
+**
** Revision 1.29 2006/02/16 18:43:42 dave64
** Added IMAP_PROXY_VERSION string to startup log message.
**
@@ -163,7 +171,7 @@
*/
-static char *rcsId = "$Id: main.c,v 1.29 2006/02/16 18:43:42 dave64 Exp $";
+static char *rcsId = "$Id: main.c,v 1.31 2006/10/03 12:13:09 dave64 Exp $";
static char *rcsSource = "$Source: /afs/andrew.cmu.edu/usr18/dave64/work/IMAP_Proxy/src/RCS/main.c,v $";
static char *rcsAuthor = "$Author: dave64 $";
@@ -983,7 +991,10 @@
sleep( 15 ); /* IMAP server may not be started yet. */
}
- break; /* Success */
+ else
+ {
+ break; /* Success */
+ }
}
@@ -1121,7 +1132,7 @@
int err;
int depth;
- syslog(LOG_ERR,"Doing a peer verify");
+ syslog(LOG_DEBUG,"Doing a peer verify");
err_cert = X509_STORE_CTX_get_current_cert(ctx);
err = X509_STORE_CTX_get_error(ctx);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
