diff --git a/configure.ac b/configure.ac index 43d4100..e2f5a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(cosfs, 1.0.9) +AC_INIT(cosfs, 1.0.10) AC_CONFIG_HEADER([config.h]) AC_CANONICAL_SYSTEM diff --git a/src/s3fs.cpp b/src/s3fs.cpp index c165ba0..1ff4548 100644 --- a/src/s3fs.cpp +++ b/src/s3fs.cpp @@ -4879,10 +4879,7 @@ int main(int argc, char* argv[]) S3FS_PRN_EXIT("specifying both public_bucket and the access keys options is invalid."); exit(EXIT_FAILURE); } - if(passwd_file.size() > 0 && S3fsCurl::IsSetAccessKeyId()){ - S3FS_PRN_EXIT("specifying both passwd_file and the access keys options is invalid."); - // exit(EXIT_FAILURE); - } + if(!S3fsCurl::IsPublicBucket()){ if(EXIT_SUCCESS != get_access_keys()){ exit(EXIT_FAILURE);