Merge pull request #1554 from Graylog2/issue-1000

Use the root user's timezone for LDAP users by default
Graylog2 · Nov 11, 2015 · 59e4987 · 59e4987
2 parents 7ed56ca + 621087d
commit 59e4987
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/users/UserServiceImpl.java b/graylog2-server/src/main/java/org/graylog2/users/UserServiceImpl.java
@@ -166,6 +166,10 @@ public void updateFromLdap(User user, LdapEntry userEntry, LdapSettings ldapSett
         user.setFullName(fullName);
         user.setExternal(true);
 
+        if (user.getTimeZone() == null) {
+            user.setTimeZone(configuration.getRootTimeZone());
+        }
+
         final String email = userEntry.getEmail();
         if (isNullOrEmpty(email)) {
             LOG.debug("No email address found for user {} in LDAP. Using {}@localhost", username, username);