diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 665100b69dfebe45e2d3b68116c6718560bf63b2 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/sql_load.cc | |
| parent | 5eed6cc55db0f99aff7845397a824fb2f5ef069e (diff) | |
| parent | 4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff) | |
| download | mariadb-git-665100b69dfebe45e2d3b68116c6718560bf63b2.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8f4fe4e8885..cbd7b3cc232 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -337,8 +337,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, else { (void) fn_format(name, ex->file_name, mysql_real_data_home, "", - MY_RELATIVE_PATH | MY_UNPACK_FILENAME); - + MY_RELATIVE_PATH | MY_UNPACK_FILENAME | + MY_RETURN_REAL_PATH); #if !defined(__WIN__) && ! defined(__NETWARE__) MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(MY_WME))) @@ -381,12 +381,16 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, DBUG_ASSERT(FALSE); #endif } - else if (opt_secure_file_priv && - strncmp(opt_secure_file_priv, name, strlen(opt_secure_file_priv))) + else if (opt_secure_file_priv) { - /* Read only allowed from within dir specified by secure_file_priv */ - my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv"); - DBUG_RETURN(TRUE); + char secure_file_real_path[FN_REFLEN]; + (void) my_realpath(secure_file_real_path, opt_secure_file_priv, 0); + if (strncmp(secure_file_real_path, name, strlen(secure_file_real_path))) + { + /* Read only allowed from within dir specified by secure_file_priv */ + my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--secure-file-priv"); + DBUG_RETURN(TRUE); + } } } |