diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-04 16:36:51 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-04 16:36:51 -0400 |
| commit | 010ec23af38c7c15f133f9327685b9813efb3e43 (patch) | |
| tree | cd86c34e7ceb9a64a900a6bb00045214d43d17f6 /utils/config.go | |
| parent | fe95276ba849bc7a520087369eea0aaff6c92358 (diff) | |
| download | chat-010ec23af38c7c15f133f9327685b9813efb3e43.tar.gz chat-010ec23af38c7c15f133f9327685b9813efb3e43.tar.bz2 chat-010ec23af38c7c15f133f9327685b9813efb3e43.zip | |
Removing password reset salt (#6334)
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 5 |
1 files changed, 1 insertions, 4 deletions
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 } |