Differential D9427 Diff 25538 head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC | |||||
+++ mysys_ssl/my_default.cc | |||||
@@ -110,7 +110,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; | |||||
@@ -903,6 +903,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++; | |||||
@@ -1241,7 +1249,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); | |||||
} | |||||
} | |||||
} | |||||
@@ -1400,13 +1409,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 | |||||
@@ -1477,7 +1481,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. |