Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00
Code Releases Activity

config: Support "" values for drop_characters and suffix_separators

Browse Source 
If the `drop_characters` or `suffix_separators` options are set to "",
currently instead of the empty string, their default value is used instead.

This is a bug, and it also happens on other config options, but because
the others have to be set in order for chasquid to function, it's not a
problem in practice.

Thanks Björn Busse (bbusse@github) for finding and reporting this
problem, on irc and in https://github.com/albertito/chasquid/issues/25.

This patch fixes the problem by marking these fields explicitly
optional, which enables presence testing, as described in the protobuf
documentation:
https://github.com/protocolbuffers/protobuf/blob/master/docs/field_presence.md.
This commit is contained in:
Alberto Bertogli
2022-01-14 01:13:31 +00:00
parent 4f595ce3d2
commit fa1db7d81a
6 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/chasquid-util/chasquid-util.go
View File

@@ -225,8 +225,8 @@ func aliasesResolve() {
_ = os.Chdir(configDir)
r := aliases.NewResolver()
r.SuffixSep = conf.SuffixSeparators
r.DropChars = conf.DropCharacters
r.SuffixSep = *conf.SuffixSeparators
r.DropChars = *conf.DropCharacters
domainDirs, err := ioutil.ReadDir("domains/")
if err != nil {
@@ -316,8 +316,8 @@ func aliasesAdd() {
// Setup alias resolver.
r := aliases.NewResolver()
r.SuffixSep = conf.SuffixSeparators
r.DropChars = conf.DropCharacters
r.SuffixSep = *conf.SuffixSeparators
r.DropChars = *conf.DropCharacters
r.AddDomain(domain)
aliasesFilePath := filepath.Join("domains", domain, "aliases")