From aa9121aa9de0593e758d0a956e989bbaa82c4869 Mon Sep 17 00:00:00 2001
From: Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com>
Date: Mon, 7 Apr 2025 23:09:40 +0500
Subject: [PATCH] Revert "[filer] void panic if s3opt.tlsCACertificate is nill"
 (#6694)

Revert "[filer] void panic if s3opt.tlsCACertificate is nill (#6685)"

This reverts commit 4dca59ed276f90fea1f79cf72cdeb23371f39ba8.
---
 weed/command/filer.go | 1 -
 weed/command/s3.go    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/weed/command/filer.go b/weed/command/filer.go
index 1a341ac69..55ea1169d 100644
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -114,7 +114,6 @@ func init() {
 	filerS3Options.dataCenter = cmdFiler.Flag.String("s3.dataCenter", "", "prefer to read and write to volumes in this data center")
 	filerS3Options.tlsPrivateKey = cmdFiler.Flag.String("s3.key.file", "", "path to the TLS private key file")
 	filerS3Options.tlsCertificate = cmdFiler.Flag.String("s3.cert.file", "", "path to the TLS certificate file")
-	filerS3Options.tlsCACertificate = cmdFiler.Flag.String("s3.cacert.file", "", "path to the TLS CA certificate file")
 	filerS3Options.config = cmdFiler.Flag.String("s3.config", "", "path to the config file")
 	filerS3Options.auditLogConfig = cmdFiler.Flag.String("s3.auditLogConfig", "", "path to the audit log config file")
 	filerS3Options.allowEmptyFolder = cmdFiler.Flag.Bool("s3.allowEmptyFolder", true, "allow empty folders")
diff --git a/weed/command/s3.go b/weed/command/s3.go
index 06eb5529b..84042b3e0 100644
--- a/weed/command/s3.go
+++ b/weed/command/s3.go
@@ -312,7 +312,7 @@ func (s3opt *S3Options) startS3Server() bool {
 		}
 
 		caCertPool := x509.NewCertPool()
-		if s3opt.tlsCACertificate != nil && *s3opt.tlsCACertificate != "" {
+		if *s3opt.tlsCACertificate != "" {
 			// load CA certificate file and add it to list of client CAs
 			caCertFile, err := ioutil.ReadFile(*s3opt.tlsCACertificate)
 			if err != nil {