mirror of
https://git.freebsd.org/ports.git
synced 2025-05-22 11:48:35 -04:00
aefc391f38
This update includes security fixes on issues that are mentioned on upstream critical patch report. Further info: https://www.oracle.com/technetwork/security-advisory/cpujul2019-5072835.html#AppendixMSQL Delete upstream-merged patches Change other local-patches according upstream changes PR: 239272 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: EuroBSDCon 2019 DevSummit
60 lines
1.9 KiB
C++
60 lines
1.9 KiB
C++
--- mysys/my_default.cc.orig 2016-08-25 11:52:06 UTC
|
|
+++ mysys/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++;
|
|
/* Ignore comment and empty lines */
|
|
@@ -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;
|
|
+ if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
|
|
/*
|
|
Ignore .mylogin.cnf file if not exclusively readable/writable
|
|
by current user.
|