From 32ff1c0c50a3217f8362c4b832d43a41b3fcf104 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Fri, 5 Sep 2014 16:05:10 +0300 Subject: [PATCH] Fix #263: ADFS fails when user and login name differ Use authuser also for web ticket ADFS requests, if it is set. This will fix failing ADFS authentication for users where the SIP user name is different from the authentication name. --- src/core/sipe-svc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/sipe-svc.c b/src/core/sipe-svc.c index cd45f930..5a124ba4 100644 --- a/src/core/sipe-svc.c +++ b/src/core/sipe-svc.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2013 SIPE Project + * Copyright (C) 2011-2014 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -476,7 +476,6 @@ static gboolean request_user_password(struct sipe_core_private *sipe_private, struct sipe_svc_session *session, const gchar *service_uri, const gchar *auth_uri, - const gchar *authuser, const gchar *content_type, const gchar *request_extension, sipe_svc_callback *callback, @@ -487,7 +486,7 @@ static gboolean request_user_password(struct sipe_core_private *sipe_private, " %s" " %s" "", - authuser, + sipe_private->authuser ? sipe_private->authuser : sipe_private->username, sipe_private->password ? sipe_private->password : ""); gboolean ret = request_passport(sipe_private, @@ -514,7 +513,6 @@ gboolean sipe_svc_webticket_adfs(struct sipe_core_private *sipe_private, session, "urn:federation:MicrosoftOnline", adfs_uri, - sipe_private->username, /* ADFS is special, *sigh* */ "application/soap+xml; charset=utf-8", "http://schemas.xmlsoap.org/ws/2005/05/identity/NoProofKey", @@ -534,7 +532,6 @@ gboolean sipe_svc_webticket_lmc(struct sipe_core_private *sipe_private, session, service_uri, LMC_URI, - sipe_private->authuser ? sipe_private->authuser : sipe_private->username, NULL, NULL, callback, -- 2.11.4.GIT