7 files changed, 11 insertions, 9 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index c66cb1a749d..8596d1cafee 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /*
   This file is included by both libmysql.c (the MySQL client C API)
@@ -1575,8 +1575,10 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
   */
 
 #ifdef HAVE_X509_check_host
-  ret_validation= X509_check_host(server_cert, server_hostname,
-                                  strlen(server_hostname), 0, 0) != 1;
+  ret_validation=
+   (X509_check_host(server_cert, server_hostname,
+       strlen(server_hostname), 0, 0) != 1) &&
+   (X509_check_ip_asc(server_cert, server_hostname, 0) != 1);
 #else
   subject= X509_get_subject_name(server_cert);
   cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1);
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index 4c584d17294..b15203cd9be 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /**
   @file
diff --git a/sql-common/conf_to_src.c b/sql-common/conf_to_src.c
index 0e92388c93c..57d3ee864ac 100644
--- a/sql-common/conf_to_src.c
+++ b/sql-common/conf_to_src.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /* can't use -lmysys because this prog is used to create -lstrings */
 
diff --git a/sql-common/errmsg.c b/sql-common/errmsg.c
index fc5a6a07e11..049fb51ec87 100644
--- a/sql-common/errmsg.c
+++ b/sql-common/errmsg.c
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 /* Error messages for MySQL clients */
 /* (Error messages for the daemon are in share/language/errmsg.sys) */
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index 60df4ef118d..b8054aa2c23 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -13,7 +13,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include <my_global.h>
 #include <my_time.h>
diff --git a/sql-common/my_user.c b/sql-common/my_user.c
index 712101b471f..4af0f8f0796 100644
--- a/sql-common/my_user.c
+++ b/sql-common/my_user.c
@@ -12,7 +12,7 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
 
 #include <my_global.h>
 #include <my_user.h>
diff --git a/sql-common/pack.c b/sql-common/pack.c
index da95172c92d..de821f08b35 100644
--- a/sql-common/pack.c
+++ b/sql-common/pack.c
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include <my_global.h>
 #include <mysql_com.h>