From 010ec23af38c7c15f133f9327685b9813efb3e43 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 4 May 2017 16:36:51 -0400 Subject: Removing password reset salt (#6334) --- utils/config.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index 25d222f3a..8da08245a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -288,7 +288,7 @@ func LoadConfig(fileName string) { CfgFileName = viper.ConfigFileUsed() needSave := len(config.SqlSettings.AtRestEncryptKey) == 0 || len(*config.FileSettings.PublicLinkSalt) == 0 || - len(config.EmailSettings.InviteSalt) == 0 || len(config.EmailSettings.PasswordResetSalt) == 0 + len(config.EmailSettings.InviteSalt) == 0 config.SetDefaults() @@ -542,9 +542,6 @@ func Desanitize(cfg *model.Config) { if cfg.EmailSettings.InviteSalt == model.FAKE_SETTING { cfg.EmailSettings.InviteSalt = Cfg.EmailSettings.InviteSalt } - if cfg.EmailSettings.PasswordResetSalt == model.FAKE_SETTING { - cfg.EmailSettings.PasswordResetSalt = Cfg.EmailSettings.PasswordResetSalt - } if cfg.EmailSettings.SMTPPassword == model.FAKE_SETTING { cfg.EmailSettings.SMTPPassword = Cfg.EmailSettings.SMTPPassword } -- cgit v1.2.3-1-g7c22