diff --git a/include/ncauth.h b/include/ncauth.h index 6022afa3a3..d1a88fb815 100644 --- a/include/ncauth.h +++ b/include/ncauth.h @@ -49,7 +49,6 @@ typedef struct NCauth { char *user; /*CURLOPT_USERNAME*/ char *pwd; /*CURLOPT_PASSWORD*/ } creds; - char* s3profile; } NCauth; #if defined(__cplusplus) diff --git a/libdispatch/dauth.c b/libdispatch/dauth.c index 9cd335eeba..4700e1c33b 100644 --- a/libdispatch/dauth.c +++ b/libdispatch/dauth.c @@ -3,7 +3,6 @@ Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata See COPYRIGHT for license information. */ - #include "config.h" #include #include @@ -177,16 +176,6 @@ NC_authsetup(NCauth** authp, NCURI* uri) nullfree(user); nullfree(pwd); } - - /* Get the Default profile */ - if((ret=NC_authgets3profile("no",&ap))) goto done; - if(ap == NULL) - if((ret=NC_authgets3profile("default",&ap))) goto done; - if(ap != NULL) - auth->s3profile = strdup(ap->name); - else - auth->s3profile = NULL; - if(authp) {*authp = auth; auth = NULL;} done: nullfree(uri_hostport); @@ -217,7 +206,6 @@ NC_authfree(NCauth* auth) nullfree(auth->proxy.pwd); nullfree(auth->creds.user); nullfree(auth->creds.pwd); - nullfree(auth->s3profile); nullfree(auth); } diff --git a/libdispatch/nch5s3comms.c b/libdispatch/nch5s3comms.c index 321538e3f8..db0fb72b92 100644 --- a/libdispatch/nch5s3comms.c +++ b/libdispatch/nch5s3comms.c @@ -1722,6 +1722,9 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha return (ret_value); } /* end H5FD__s3comms_load_aws_creds_from_file() */ +#if 0 +Currently not used. See instead NC_aws_load_credentials. + /*---------------------------------------------------------------------------- * Function: NCH5_s3comms_load_aws_profile() * Purpose : @@ -1805,6 +1808,7 @@ NCH5_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char * return (ret_value); } /* end NCH5_s3comms_load_aws_profile() */ +#endif /*0*/ /*---------------------------------------------------------------------------- * Function: NCH5_s3comms_nlowercase()