diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2016-09-16 15:55:15 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2016-09-16 15:55:15 +0000 |
| commit | b5931dac78825dcc54e0f064235c48daba2739a8 (patch) | |
| tree | 922eb88768d479dc3eeeb513621a3854cd2542ca /databases/mysql57-client/files/patch-mysys__ssl_my__default.cc | |
| parent | security/libp11: Mark IGNORE if SSL_DEFAULT matchs libressl (diff) | |
Update to upstream version 5.7.15; fixes zero-day remote vuln CVE-2016-6662
PR: 212690
Submitted by: mokhi64@gmail.com (maintainer)
MFH: 2016Q3
Security: CVE 2016-6662
Diffstat (limited to 'databases/mysql57-client/files/patch-mysys__ssl_my__default.cc')
| -rw-r--r-- | databases/mysql57-client/files/patch-mysys__ssl_my__default.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc index 0b4ee9e2360e..ea05679341fa 100644 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc +++ b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc @@ -1,6 +1,6 @@ ---- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC +--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +++ mysys_ssl/my_default.cc -@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; +@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA /* Which directories are searched for options (and in which order) */ @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -909,6 +909,14 @@ +@@ -914,6 +914,14 @@ static int search_default_file_with_ext( return 1; /* Ignore wrong files */ } @@ -21,10 +21,10 @@ + goto err; + } + - while (mysql_file_getline(buff, sizeof(buff) - 1, fp)) + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { line++; -@@ -1245,7 +1253,8 @@ +@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * end[(strlen(end)-1)] = ' '; else strxmov(end, conf_file, *ext , " ", NullS); @@ -34,7 +34,7 @@ } } } -@@ -1404,13 +1413,8 @@ +@@ -1411,13 +1420,8 @@ static const char **init_default_directo #else @@ -50,7 +50,7 @@ #endif -@@ -1480,7 +1484,7 @@ +@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) |