summaryrefslogtreecommitdiff
path: root/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
diff options
context:
space:
mode:
authorNikolai Lifanov <lifanov@FreeBSD.org>2017-01-07 20:34:46 +0000
committerNikolai Lifanov <lifanov@FreeBSD.org>2017-01-07 20:34:46 +0000
commitc93ab7fefa27cc2640ad10481f106ecc089d83d5 (patch)
tree317be9105acc04fa055523ebb9f20f1cc249c71f /databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
parentUpgrade libproj4 to proj.4 4.9.3. (diff)
add databases/mysql80-server and databases/mysql80-client
This is a development snapshot of upcoming MySQL 8.0. PR: 215738 Submitted by: Mahdi Mokhtari <mokhi64@gmail.com> Reviewed by: matthew, feld Approved by: matthew (mentor), feld Differential Revision: https://reviews.freebsd.org/D9031
Diffstat (limited to 'databases/mysql80-server/files/patch-mysys__ssl_my__default.cc')
-rw-r--r--databases/mysql80-server/files/patch-mysys__ssl_my__default.cc61
1 files changed, 61 insertions, 0 deletions
diff --git a/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc b/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
new file mode 100644
index 000000000000..ea05679341fa
--- /dev/null
+++ b/databases/mysql80-server/files/patch-mysys__ssl_my__default.cc
@@ -0,0 +1,61 @@
+--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC
++++ mysys_ssl/my_default.cc
+@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
+
+ /* Which directories are searched for options (and in which order) */
+
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
+ static const char **default_directories = NULL;
+
+@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
+ return 1; /* Ignore wrong files */
+ }
+
++ if (strstr(name, "/etc") == name)
++ {
++ fprintf(stderr,
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
++ goto err;
++ }
++
+ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
+ {
+ line++;
+@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
+ end[(strlen(end)-1)] = ' ';
+ else
+ strxmov(end, conf_file, *ext , " ", NullS);
+- fputs(name, stdout);
++ if (strstr(name, "/etc") != name)
++ fputs(name, stdout);
+ }
+ }
+ }
+@@ -1411,13 +1420,8 @@ static const char **init_default_directo
+
+ #else
+
+- errors += add_directory(alloc, "/etc/", dirs);
+- errors += add_directory(alloc, "/etc/mysql/", dirs);
+-
+-#if defined(DEFAULT_SYSCONFDIR)
+- if (DEFAULT_SYSCONFDIR[0])
+- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
++ errors += add_directory(alloc, "/usr/local/etc/", dirs);
++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+
+ #endif
+
+@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
+ MY_STAT stat_info;
+
+ if (!my_stat(file_name,&stat_info,MYF(0)))
+- return 1;
++ return 0;
+ /*
+ Ignore .mylogin.cnf file if not exclusively readable/writable
+ by current user.