From 594c9ca7d267a3f2acfeadd4c6bf3e6ad474d180 Mon Sep 17 00:00:00 2001
From: "Nathaniel W. Turner" <nate@houseofnate.net>
Date: Fri, 20 May 2016 12:22:05 -0400
Subject: [PATCH] Skip early credential checks when iam_role=auto

If user specifies iam_role=auto (or just iam_role), credentials will not
be loaded during early phase, so skip credential checks there.

Signed-off-by: Nathaniel W. Turner <nate@houseofnate.net>
---
 src/s3fs.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index ed2ba0b..67a2eff 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -4050,6 +4050,11 @@ static int get_access_keys(void)
      return EXIT_SUCCESS;
   }
 
+  // access key loading is deferred
+  if(load_iamrole){
+     return EXIT_SUCCESS;
+  }
+
   // 1 - keys specified on the command line
   if(S3fsCurl::IsSetAccessKeyId()){
      return EXIT_SUCCESS;
@@ -4815,7 +4820,7 @@ int main(int argc, char* argv[])
     S3FS_PRN_EXIT("specifying both passwd_file and the access keys options is invalid.");
     exit(EXIT_FAILURE);
   }
-  if(!S3fsCurl::IsPublicBucket()){
+  if(!S3fsCurl::IsPublicBucket() && !load_iamrole){
     if(EXIT_SUCCESS != get_access_keys()){
       exit(EXIT_FAILURE);
     }