Merge pull request #733 from phxvyper/enhance/dupe-bucket-error

More useful error message for dupe entries in passwd file
This commit is contained in:
Takeshi Nakatani 2018-04-01 22:11:00 +09:00 committed by GitHub
commit b3c376afbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3925,7 +3925,7 @@ static int parse_passwd_file(bucketkvmap_t& resmap)
secret = trim(iter->substr(first_pos + 1, string::npos)); secret = trim(iter->substr(first_pos + 1, string::npos));
} }
if(resmap.end() != resmap.find(bucket)){ if(resmap.end() != resmap.find(bucket)){
S3FS_PRN_EXIT("same bucket(%s) passwd setting found in passwd file.", ("" == bucket ? "default" : bucket.c_str())); S3FS_PRN_EXIT("there are mutliple entries for the same bucket(%s) in the passwd file.", ("" == bucket ? "default" : bucket.c_str()));
return -1; return -1;
} }
kv.clear(); kv.clear();