From 574e030caf42b8eaef4ebd4f85b3941a9b8829c1 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 13 May 2014 11:52:46 +0200
Subject: [PATCH] Use a different key than "user" to store the shib user

There is a HACK from commit fa0a2764a40d5955f1d3426481f998a370223290
Which save the http user as a user for all credidentials, but that
cannot work with shibboleth

Fixes https://github.com/owncloud/enterprise/issues/175
---
 src/creds/shibbolethcredentials.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index 90a413c862..fda7ab4485 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -43,7 +43,8 @@ namespace Mirall
 namespace
 {
 
-const char userC[] = "user";
+// Not "user" because it has a special meaning for http
+const char userC[] = "shib_user";
 
 int shibboleth_redirect_callback(CSYNC* csync_ctx,
                                  const char* uri)