Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mariadb101-client/files/patch-mysys_my__default.c
| 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/my_default.c.orig 2016-03-24 09:12:11 UTC | |||||
| +++ mysys/my_default.c | |||||
| @@ -90,7 +90,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; | |||||
| @@ -785,7 +785,7 @@ static int search_default_file_with_ext( | |||||
| { | |||||
| MY_STAT stat_info; | |||||
| if (!my_stat(name,&stat_info,MYF(0))) | |||||
| - return 1; | |||||
| + return 0; | |||||
| /* | |||||
| Ignore world-writable regular files. | |||||
| This is mainly done to protect us to not read a file created by | |||||
| @@ -803,6 +803,14 @@ static int search_default_file_with_ext( | |||||
| if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) | |||||
| 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_fgets(buff, sizeof(buff) - 1, fp)) | |||||
| { | |||||
| line++; | |||||
| @@ -1067,7 +1075,8 @@ void my_print_default_files(const char * | |||||
| if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ | |||||
| *end++= '.'; | |||||
| strxmov(end, conf_file, *ext, " ", NullS); | |||||
| - fputs(name, stdout); | |||||
| + if (strstr(name, "/etc") != name) | |||||
| + fputs(name, stdout); | |||||
| } | |||||
| } | |||||
| } | |||||
| @@ -1223,13 +1232,10 @@ static const char **init_default_directo | |||||
| #else | |||||
| -#if defined(DEFAULT_SYSCONFDIR) | |||||
| - if (DEFAULT_SYSCONFDIR[0]) | |||||
| - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); | |||||
| -#else | |||||
| errors += add_directory(alloc, "/etc/", dirs); | |||||
| errors += add_directory(alloc, "/etc/mysql/", dirs); | |||||
| -#endif /* DEFAULT_SYSCONFDIR */ | |||||
| + errors += add_directory(alloc, "/usr/local/etc/", dirs); | |||||
| + errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); | |||||
| #endif | |||||