[Pkg-owncloud-commits] [owncloud-client] 11/38: shibboleth: Fix connection when the URL do not have a path

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch sid
in repository owncloud-client.

commit 5254c9785ccef15e6b619220b9b467de5f3a97e6
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jul 28 13:50:24 2014 +0200

    shibboleth: Fix connection when the URL do not have a path
    
    When the url do not have a path (for example: "http://example.com" as
    opposed to "http://example.com/"),  its path is not a prefix of the
    root path of the cookie (usually '/')
    
    By adding the dav path, we make sure the URL has a path.
    
    This made a bug when the owncloud url was just a domain name and did not
    have a path
---
 src/creds/shibbolethcredentials.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp
index 5b83f70..e3ad80b 100644
--- a/src/creds/shibbolethcredentials.cpp
+++ b/src/creds/shibbolethcredentials.cpp
@@ -405,7 +405,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
 
 QList<QNetworkCookie> ShibbolethCredentials::accountCookies(Account *account)
 {
-    return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->url());
+    return account->networkAccessManager()->cookieJar()->cookiesForUrl(account->davUrl());
 }
 
 QNetworkCookie ShibbolethCredentials::findShibCookie(Account *account, QList<QNetworkCookie> cookies)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git