From 781e66ba3cb9baf767051fdac42d811d2e7feb27 Mon Sep 17 00:00:00 2001
From: Adrien Fillon <adrien.fillon@cdiscount.com>
Date: Thu, 18 Oct 2018 12:34:53 +0200
Subject: [PATCH] fix LDAP Grafana admin logic

Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com>
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>
---
 pkg/login/ldap.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go
index 43f45f900d9..4c71ab3cd5f 100644
--- a/pkg/login/ldap.go
+++ b/pkg/login/ldap.go
@@ -185,7 +185,9 @@ func (a *ldapAuther) GetGrafanaUserFor(ctx *m.ReqContext, ldapUser *LdapUserInfo
 
 		if ldapUser.isMemberOf(group.GroupDN) {
 			extUser.OrgRoles[group.OrgId] = group.OrgRole
-			extUser.IsGrafanaAdmin = group.IsGrafanaAdmin
+			if extUser.IsGrafanaAdmin == nil || *extUser.IsGrafanaAdmin == false {
+				extUser.IsGrafanaAdmin = group.IsGrafanaAdmin
+			}
 		}
 	}