Mirrors/mailfull-go
1
0
Fork 0
mirror of https://github.com/directorz/mailfull-go.git synced 2025-12-17 09:37:02 +00:00
Code Issues Releases Wiki Activity

Use Errorf

Browse Source
This commit is contained in:
teru
2017-07-25 11:57:30 +09:00
parent 2e87209ad2
commit 146ab299d0
23 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/mailfull/cmd_userpasswd.go
View File

@@ -75,33 +75,33 @@ func (c *CmdUserPasswd) Run(args []string) int {
repo, err := mailfull.OpenRepository(".")
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
user, err := repo.User(domainName, userName)
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
if user == nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrUserNotExist)
c.Meta.Errorf("%v\n", mailfull.ErrUserNotExist)
return 1
}
if len(args) != 2 {
input1, err := c.UI.AskSecret(fmt.Sprintf("Enter new password for %s:", address))
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
input2, err := c.UI.AskSecret("Retype new password:")
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
if input1 != input2 {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] inputs do not match.\n")
c.Meta.Errorf("inputs do not match.\n")
return 1
}
rawPassword = input1
@@ -111,7 +111,7 @@ func (c *CmdUserPasswd) Run(args []string) int {
if rawPassword != "" {
str, err := ssha.Generate(rawPassword, 4)
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
hashedPassword = str
@@ -120,7 +120,7 @@ func (c *CmdUserPasswd) Run(args []string) int {
user.SetHashedPassword(hashedPassword)
if err := repo.UserUpdate(domainName, user); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
@@ -130,13 +130,13 @@ func (c *CmdUserPasswd) Run(args []string) int {
mailData, err := repo.MailData()
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}
err = repo.GenerateDatabases(mailData)
if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err)
c.Meta.Errorf("%v\n", err)
return 1
}