From 0f2865abb29e0e910d516703b589c02c792790f6 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 21 Aug 2015 17:31:58 +0200
Subject: Repeated calls to loginWithApache() should not not try to set user
 information in the session again

---
 lib/private/user.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/private/user.php b/lib/private/user.php
index 92807246144..e70734ece40 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -277,11 +277,13 @@ class OC_User {
 		OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid));
 
 		if ($uid) {
-			self::setUserId($uid);
-			self::setDisplayName($uid);
-			self::getUserSession()->setLoginName($uid);
+			if (self::getUser() !== $uid) {
+				self::setUserId($uid);
+				self::setDisplayName($uid);
+				self::getUserSession()->setLoginName($uid);
 
-			OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+				OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+			}
 			return true;
 		}
 		return false;
-- 
cgit v1.2.3