diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2021-05-29 13:34:54 +0300 |
|---|---|---|
| committer | Kenneth Skovhede <kenneth@hexad.dk> | 2021-05-29 13:34:54 +0300 |
| commit | b8d0b6d7941cf1cc0109b7130d019efcab90e021 (patch) | |
| tree | ced5a6733dde8cab7bb1592bb684e22e09d468cf | |
| parent | fe99e8179eee81d502a8cf26be350b43feef9832 (diff) | |
| parent | 29f1d2c3cbb27ff1c1d205abc7d2f81ed51cb894 (diff) | |
Merge commit '29f1d2c3cbb27ff1c1d205abc7d2f81ed51cb894' into release/2.0.6.2_experimental
| -rw-r--r-- | Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs | 12 | ||||
| -rw-r--r-- | Duplicati/Library/Backend/S3/S3Backend.cs | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs b/Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs index 42d6d7725..98822fdbc 100644 --- a/Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs +++ b/Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs @@ -53,10 +53,14 @@ namespace Duplicati.Library.Backend.AzureBlob storageAccountName = options["auth-username"]; if (options.ContainsKey("auth-password")) accessKey = options["auth-password"]; - if (options.ContainsKey("azure_account_name") || options.ContainsKey("azure-account-name")) - storageAccountName = options["azure_account_name"] ?? options["azure-account-name"]; - if (options.ContainsKey("azure_access_key") || options.ContainsKey("azure-access-key")) - accessKey = options["azure_access_key"] ?? options["azure-access-key"]; + if (options.ContainsKey("azure_account_name")) + storageAccountName = options["azure_account_name"]; + if (options.ContainsKey("azure-account-name")) + storageAccountName = options["azure-account-name"]; + if (options.ContainsKey("azure_access_key")) + accessKey = options["azure_access_key"]; + if (options.ContainsKey("azure-access-key")) + accessKey = options["azure-access-key"]; if (!string.IsNullOrEmpty(uri.Username)) storageAccountName = uri.Username; if (!string.IsNullOrEmpty(uri.Password)) diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs index 2470b196d..6b14eabbf 100644 --- a/Duplicati/Library/Backend/S3/S3Backend.cs +++ b/Duplicati/Library/Backend/S3/S3Backend.cs @@ -185,10 +185,14 @@ namespace Duplicati.Library.Backend if (options.ContainsKey("auth-password"))
awsKey = options["auth-password"];
- if (options.ContainsKey("aws_access_key_id") || options.ContainsKey("aws-access-key-id"))
- awsID = options["aws_access_key_id"] ?? options["aws-access-key-id"];
- if (options.ContainsKey("aws_secret_access_key") || options.ContainsKey("aws-secret-access-key"))
- awsKey = options["aws_secret_access_key"] ?? options["aws-secret-access-key"];
+ if (options.ContainsKey("aws_access_key_id"))
+ awsID = options["aws_access_key_id"];
+ if (options.ContainsKey("aws-access-key-id"))
+ awsID = options["aws-access-key-id"];
+ if (options.ContainsKey("aws_secret_access_key"))
+ awsKey = options["aws_secret_access_key"];
+ if (options.ContainsKey("aws-secret-access-key"))
+ awsKey = options["aws-secret-access-key"];
if (!string.IsNullOrEmpty(uri.Username))
awsID = uri.Username;
if (!string.IsNullOrEmpty(uri.Password))
|