grafana/006-pkg-setting-ini-default-section.patch
Andreas Gerstmayr daef40c390 Rebase to grafana-6.7.3 for 8.3
Resolves: #1807323
Resolves: #1830006
Resolves: #1830002
Fixes: CVE-2020-12458
Fixes: CVE-2020-12459
2020-05-05 17:28:43 +02:00

14 lines
571 B
Diff

diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 19181be84e..9a745f67e4 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -387,7 +387,7 @@ func applyCommandLineDefaultProperties(props map[string]string, file *ini.File)
func applyCommandLineProperties(props map[string]string, file *ini.File) {
for _, section := range file.Sections() {
sectionName := section.Name() + "."
- if section.Name() == ini.DefaultSection {
+ if section.Name() == ini.DEFAULT_SECTION {
sectionName = ""
}
for _, key := range section.Keys() {