[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14572] trunk/imap_proxy/src/request.c
From:       pdontthink () users ! sourceforge ! net
Date:       2016-09-14 2:23:57
Message-ID: E1bjzrk-0003HM-Uh () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14572
          http://sourceforge.net/p/squirrelmail/code/14572
Author:   pdontthink
Date:     2016-09-14 02:23:57 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
Unify log messages

Modified Paths:
--------------
    trunk/imap_proxy/src/request.c

Modified: trunk/imap_proxy/src/request.c
===================================================================
--- trunk/imap_proxy/src/request.c	2016-09-14 02:16:55 UTC (rev 14571)
+++ trunk/imap_proxy/src/request.c	2016-09-14 02:23:57 UTC (rev 14572)
@@ -735,7 +735,7 @@
     
     if ( BytesRead == -1 )
     {
-	syslog( LOG_NOTICE, "%s: Failed to read base64 encoded username from client on \
socket %d", fn, Client->conn->sd ); +	syslog( LOG_NOTICE, "%s: Failed to read base64 \
encoded username from client on sd [%d]", fn, Client->conn->sd );  return( -1 );
     }
 
@@ -744,7 +744,7 @@
      */
     if ( Client->LiteralBytesRemaining )
     {
-	syslog( LOG_NOTICE, "%s: Read unexpected literal specifier from client on socket \
%d", fn, Client->conn->sd ); +	syslog( LOG_NOTICE, "%s: Read unexpected literal \
specifier from client on sd [%d]", fn, Client->conn->sd );  return( -1 );
     }
     
@@ -788,13 +788,13 @@
 
     if ( Client->LiteralBytesRemaining )
     {
-	syslog( LOG_ERR, "%s: received unexpected literal specifier from client on socket \
%d", fn, Client->conn->sd ); +	syslog( LOG_ERR, "%s: received unexpected literal \
specifier from client on sd [%d]", fn, Client->conn->sd );  return( -1 );
     }
     
     if ( BytesRead == -1 )
     {
-        syslog( LOG_NOTICE, "%s: Failed to read base64 encoded password from client \
on socket %d", fn, Client->conn->sd ); +        syslog( LOG_NOTICE, "%s: Failed to \
read base64 encoded password from client on sd [%d]", fn, Client->conn->sd );  \
return( -1 );  }
     
@@ -1329,7 +1329,7 @@
 		
 		if ( status == -1 )
 		{
-		    syslog(LOG_NOTICE, "%s: Failed to read line from client on socket %d", fn, \
Client->conn->sd ); +		    syslog(LOG_NOTICE, "%s: Failed to read line from client on \
sd [%d]", fn, Client->conn->sd );  return( -1 );
 		}
 	    
@@ -1526,7 +1526,7 @@
 		
 		if ( status == -1 )
 		{
-		    syslog(LOG_NOTICE, "%s: Failed to read string literal from client on socket \
%d", fn, Client->conn->sd ); +		    syslog(LOG_NOTICE, "%s: Failed to read string \
literal from client on sd [%d]", fn, Client->conn->sd );  return( -1 );
 		}
 
@@ -1765,7 +1765,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of ID command -- disconnecting client", fn, Client.conn->sd ); +		syslog( \
LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as part of ID \
command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1792,7 +1792,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of NOOP command -- disconnecting client", fn, Client.conn->sd ); +		syslog( \
LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as part of \
NOOP command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1805,7 +1805,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of CAPABILITY command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of CAPABILITY command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1817,7 +1817,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of AUTHENTICATE command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of AUTHENTICATE command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1893,7 +1893,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of LOGOUT command -- disconnecting client", fn, Client.conn->sd ); +		syslog( \
LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as part of \
LOGOUT command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1907,7 +1907,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of P_TRACE command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of P_TRACE command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1920,7 +1920,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of P_DUMPICC command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of P_DUMPICC command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1932,7 +1932,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of P_RESETCOUNTERS command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of P_RESETCOUNTERS command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1944,7 +1944,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of P_NEWLOG command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of P_NEWLOG command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -1956,7 +1956,7 @@
 	{
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of P_VERSION command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of P_VERSION command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;
@@ -2232,7 +2232,7 @@
 	     */
 	    if ( Client.LiteralBytesRemaining )
 	    {
-		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on socket %d \
as part of unknown command -- disconnecting client", fn, Client.conn->sd ); \
+		syslog( LOG_ERR, "%s: Unexpected literal specifier read from client on sd [%d] as \
part of unknown command -- disconnecting client", fn, Client.conn->sd );  \
IMAPCount->CurrentClientConnections--;  close( Client.conn->sd );
 		return;

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]