Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
cmd/dkim-milter: switch to short options, add -v flag
Browse files Browse the repository at this point in the history
Fixes #13
  • Loading branch information
emersion committed Mar 11, 2019
1 parent 90a28fb commit 874171f
Showing 1 changed file with 19 additions and 11 deletions.
30 changes: 19 additions & 11 deletions cmd/dkim-milter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ import (
"github.com/emersion/go-msgauth"
)

var identity string
var listenURI string
var verbose bool

func init() {
flag.StringVar(&identity, "i", "", "Server identity (defaults to hostname)")
flag.StringVar(&listenURI, "l", "unix:///tmp/dkim-milter.sock", "Listen URI")
flag.BoolVar(&verbose, "v", false, "Enable verbose logging")
}

type session struct {
identity string
authResDelete []int
Expand Down Expand Up @@ -106,7 +116,9 @@ func (s *session) Body(m *milter.Modifier) (milter.Response, error) {
}

if err := <-s.done; err != nil {
log.Printf("DKIM verification failed: %v", err)
if verbose {
log.Printf("DKIM verification failed: %v", err)
}
return milter.RespAccept, nil
}

Expand All @@ -119,8 +131,12 @@ func (s *session) Body(m *milter.Modifier) (milter.Response, error) {
}

for _, verif := range s.verifs {
if verif.Err != nil {
log.Printf("DKIM verification failed for %v: %v", verif.Domain, verif.Err)
if verbose {
if verif.Err != nil {
log.Printf("DKIM verification failed for %v: %v", verif.Domain, verif.Err)
} else {
log.Printf("DKIM verification succeded for %v", verif.Domain)
}
}

var val msgauth.ResultValue
Expand All @@ -146,14 +162,6 @@ func (s *session) Body(m *milter.Modifier) (milter.Response, error) {
return milter.RespAccept, err
}

var identity string
var listenURI string

func init() {
flag.StringVar(&identity, "identity", "", "Server identity (defaults to hostname)")
flag.StringVar(&listenURI, "listen", "unix:///tmp/dkim-milter.sock", "Listen URI")
}

func main() {
flag.Parse()

Expand Down

0 comments on commit 874171f

Please sign in to comment.