[monit-dev] [monit] r372 committed - Fix MySQL protocol test: MySQL 5.5.12 returns new error code in the ca...

[monit]

Revision: 372
Author:   address@hidden
Date:     Mon May 23 04:35:35 2011
Log:      Fix MySQL protocol test: MySQL 5.5.12 returns new error code in  
the case of authentication failure.


http://code.google.com/p/monit/source/detail?r=372

Modified:
 /trunk/CHANGES.txt
 /trunk/protocols/mysql.c

=======================================
--- /trunk/CHANGES.txt  Wed Apr 13 23:20:11 2011
+++ /trunk/CHANGES.txt  Mon May 23 04:35:35 2011
@@ -9,6 +9,9 @@

 Version 5.2.6

+* Fix MySQL protocol test: MySQL 5.5.12 returns new error code in
+  the case of authentication failure.
+
 * Fix Debian bug #621047: monit fails to build after SSLv2 removal

 * Fix crash on Solaris which may occur if the system load is zero.
=======================================
--- /trunk/protocols/mysql.c    Wed Jan 19 10:40:32 2011
+++ /trunk/protocols/mysql.c    Mon May 23 04:35:35 2011
@@ -160,8 +160,8 @@
     }

     return TRUE;
-  } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) ||  
(buf[5] == 0xE3 && buf[6] == 0x04))) {
-    /* If access denied (1045) or server requires newer authentication  
protocol (1251), return success immediately */
+  } else if((buf[4] == 0xFF) && ((buf[5] == 0x15 && buf[6] == 0x04) ||  
(buf[5] == 0xE3 && buf[6] == 0x04) || (buf[5] == 0x13 && buf[6] == 0x04))) {
+    /* If access denied (1045) or server requires newer authentication  
protocol (1251) or bad handshake (1043) return success immediately */
     return TRUE;
   }