octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-18 02:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check bucket at public bucket and add nocopyapi option automatically

Browse Source
This commit is contained in:
Takeshi Nakatani 2017-05-13 07:48:50 +00:00
parent 7115835834
commit d2ae14d8b7
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/s3fs.cpp
View File

@ -3419,19 +3419,6 @@ static void* s3fs_init(struct fuse_conn_info* conn)
} }
// Check Bucket // Check Bucket
//TEST
/*****************
// If the network is up, check for valid credentials and if the bucket
// exists. skip check if mounting a public bucket
if(!S3fsCurl::IsPublicBucket()){
int result;
if(EXIT_SUCCESS != (result = s3fs_check_service())){
s3fs_exit_fuseloop(result);
return NULL;
}
}
***************/
{ {
int result; int result;
if(EXIT_SUCCESS != (result = s3fs_check_service())){ if(EXIT_SUCCESS != (result = s3fs_check_service())){
@ -3439,7 +3426,6 @@ static void* s3fs_init(struct fuse_conn_info* conn)
return NULL; return NULL;
} }
} }
//TEST
// Investigate system capabilities // Investigate system capabilities
#ifndef __APPLE__ #ifndef __APPLE__
@ -4581,13 +4567,11 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
off_t pubbucket = s3fs_strtoofft(strchr(arg, '=') + sizeof(char)); off_t pubbucket = s3fs_strtoofft(strchr(arg, '=') + sizeof(char));
if(1 == pubbucket){ if(1 == pubbucket){
S3fsCurl::SetPublicBucket(true); S3fsCurl::SetPublicBucket(true);
//TEST
// [NOTE] // [NOTE]
// if bucket is public(without credential), s3 do not allow copy api. // if bucket is public(without credential), s3 do not allow copy api.
// so s3fs sets nocopyapi mode. // so s3fs sets nocopyapi mode.
// //
nocopyapi = true; nocopyapi = true;
//TEST
}else if(0 == pubbucket){ }else if(0 == pubbucket){
S3fsCurl::SetPublicBucket(false); S3fsCurl::SetPublicBucket(false);
}else{ }else{