From cf9dde9305913f46ccf2ee254048b24e58a320c6 Mon Sep 17 00:00:00 2001 From: chrislu Date: Tue, 28 Oct 2025 15:11:18 -0700 Subject: [PATCH] simplify again --- weed/command/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weed/command/server.go b/weed/command/server.go index 73329cdc0..f67d32423 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -323,9 +323,9 @@ func runServer(cmd *Command, args []string) bool { if *isStartingS3 { // Handle IAM config: -s3.iam.config takes precedence over -iam.config - if *s3Options.iamConfig == "" && *serverIamConfig != "" { + if *s3Options.iamConfig == "" { s3Options.iamConfig = serverIamConfig - } else if *s3Options.iamConfig != "" && *serverIamConfig != "" && *s3Options.iamConfig != *serverIamConfig { + } else if *serverIamConfig != "" && *s3Options.iamConfig != *serverIamConfig { glog.V(0).Infof("both -s3.iam.config(%s) and -iam.config(%s) provided; using -s3.iam.config", *s3Options.iamConfig, *serverIamConfig) } go func() {