summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-01-22 17:00:09 -0600
committerCorey Hulen <corey@hulen.com>2016-01-22 17:00:09 -0600
commit1a0b12313bd0af1724df2fc6260ef284acfc5f93 (patch)
treeaf8cd83e5beba2426251532e42ba059c59af59b9 /utils
parentd352c5b64dddfb8e46b18edbd7352c41495078a1 (diff)
parent60a73ebabba6798d2b45fa8c8ac0f2bfa6144689 (diff)
downloadchat-1a0b12313bd0af1724df2fc6260ef284acfc5f93.tar.gz
chat-1a0b12313bd0af1724df2fc6260ef284acfc5f93.tar.bz2
chat-1a0b12313bd0af1724df2fc6260ef284acfc5f93.zip
Merge pull request #1956 from mattermost/plt-1779
PLT-1779 Add system-wide statistics page
Diffstat (limited to 'utils')
-rw-r--r--utils/license.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/license.go b/utils/license.go
index 7594e33af..4fba94d4d 100644
--- a/utils/license.go
+++ b/utils/license.go
@@ -55,6 +55,7 @@ func LoadLicense() {
if success, licenseStr := ValidateLicense(buf.Bytes()); success {
license := model.LicenseFromJson(strings.NewReader(licenseStr))
SetLicense(license)
+ return
}
l4g.Warn("No valid enterprise license found")
@@ -105,7 +106,7 @@ func ValidateLicense(signed []byte) (bool, string) {
}
// remove null terminator
- if decoded[len(decoded)-1] == byte(0) {
+ for decoded[len(decoded)-1] == byte(0) {
decoded = decoded[:len(decoded)-1]
}