diff options
Diffstat (limited to 'src/general.c')
| -rw-r--r-- | src/general.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/general.c b/src/general.c index 861c289..fb30c37 100644 --- a/src/general.c +++ b/src/general.c @@ -32,13 +32,14 @@ static int initializeCountG = 0; -S3Status S3_initialize(const char *userAgentInfo, int flags) +S3Status S3_initialize(const char *userAgentInfo, int flags, + const char *defaultS3HostName) { if (initializeCountG++) { return S3StatusOK; } - return request_api_initialize(userAgentInfo, flags); + return request_api_initialize(userAgentInfo, flags, defaultS3HostName); } @@ -372,18 +373,15 @@ static S3Status convertAclXmlCallback(const char *elementPath, } else if (caData->groupUri[0]) { if (!strcmp(caData->groupUri, - "http://acs.amazonaws.com/groups/global/" - "AuthenticatedUsers")) { + ACS_GROUP_AWS_USERS)) { grant->granteeType = S3GranteeTypeAllAwsUsers; } else if (!strcmp(caData->groupUri, - "http://acs.amazonaws.com/groups/global/" - "AllUsers")) { + ACS_GROUP_ALL_USERS)) { grant->granteeType = S3GranteeTypeAllUsers; } else if (!strcmp(caData->groupUri, - "http://acs.amazonaws.com/groups/s3/" - "LogDelivery")) { + ACS_GROUP_LOG_DELIVERY)) { grant->granteeType = S3GranteeTypeLogDelivery; } else { |