From c8d30c14ee1a8c62eb581f747f0c66426bbbcbb5 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sat, 10 Jan 2015 23:44:20 +0200 Subject: [PATCH] security: remove domain from internal interface --- src/core/sip-sec-basic.c | 3 +-- src/core/sip-sec-gssapi.c | 1 - src/core/sip-sec-mech.h | 1 - src/core/sip-sec-negotiate.c | 3 --- src/core/sip-sec-ntlm.c | 1 - src/core/sip-sec-sspi.c | 1 - src/core/sip-sec-tls-dsk.c | 3 +-- src/core/sip-sec.c | 6 +++--- 8 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/core/sip-sec-basic.c b/src/core/sip-sec-basic.c index 55fa5f39..76bd923e 100644 --- a/src/core/sip-sec-basic.c +++ b/src/core/sip-sec-basic.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2013 SIPE Project + * Copyright (C) 2013-2015 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -45,7 +45,6 @@ typedef struct _context_basic { static gboolean sip_sec_acquire_cred__basic(SipSecContext context, - SIPE_UNUSED_PARAMETER const gchar *domain, const gchar *username, const gchar *password) { diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c index 7256f6ad..9af8595e 100644 --- a/src/core/sip-sec-gssapi.c +++ b/src/core/sip-sec-gssapi.c @@ -275,7 +275,6 @@ static void drop_gssapi_context(SipSecContext context) static gboolean sip_sec_acquire_cred__gssapi(SipSecContext context, - SIPE_UNUSED_PARAMETER const gchar *domain, const gchar *username, const gchar *password) { diff --git a/src/core/sip-sec-mech.h b/src/core/sip-sec-mech.h index ac6b5b8c..e5581bb6 100644 --- a/src/core/sip-sec-mech.h +++ b/src/core/sip-sec-mech.h @@ -38,7 +38,6 @@ typedef SipSecContext typedef gboolean (*sip_sec_acquire_cred_func)(SipSecContext context, - const gchar *domain, const gchar *username, const gchar *password); diff --git a/src/core/sip-sec-negotiate.c b/src/core/sip-sec-negotiate.c index 6bd3dc39..944858b2 100644 --- a/src/core/sip-sec-negotiate.c +++ b/src/core/sip-sec-negotiate.c @@ -81,7 +81,6 @@ static gboolean sip_sec_negotiate_ntlm_fallback(context_negotiate context) sip_sec_negotiate_copy_flags(context, context->ntlm); return(context->ntlm->acquire_cred_func(context->ntlm, - NULL, context->username, context->password)); } @@ -90,7 +89,6 @@ static gboolean sip_sec_negotiate_ntlm_fallback(context_negotiate context) static gboolean sip_sec_acquire_cred__negotiate(SipSecContext context, - SIPE_UNUSED_PARAMETER const gchar *domain, const gchar *username, const gchar *password) { @@ -105,7 +103,6 @@ sip_sec_acquire_cred__negotiate(SipSecContext context, context = ctx->krb5; sip_sec_negotiate_copy_flags(ctx, context); ret = context->acquire_cred_func(context, - NULL, username, password); if (!ret) { diff --git a/src/core/sip-sec-ntlm.c b/src/core/sip-sec-ntlm.c index 14394f2e..38742877 100644 --- a/src/core/sip-sec-ntlm.c +++ b/src/core/sip-sec-ntlm.c @@ -1718,7 +1718,6 @@ typedef struct _context_ntlm { static gboolean sip_sec_acquire_cred__ntlm(SipSecContext context, - SIPE_UNUSED_PARAMETER const gchar *domain, const gchar *username, const gchar *password) { diff --git a/src/core/sip-sec-sspi.c b/src/core/sip-sec-sspi.c index 26cdaeda..183b0a9b 100644 --- a/src/core/sip-sec-sspi.c +++ b/src/core/sip-sec-sspi.c @@ -133,7 +133,6 @@ sip_sec_destroy_sspi_context(context_sspi context) static gboolean sip_sec_acquire_cred__sspi(SipSecContext context, - SIPE_UNUSED_PARAMETER const gchar *domain, const gchar *username, const gchar *password) { diff --git a/src/core/sip-sec-tls-dsk.c b/src/core/sip-sec-tls-dsk.c index fbc5da92..188c8943 100644 --- a/src/core/sip-sec-tls-dsk.c +++ b/src/core/sip-sec-tls-dsk.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-2013 SIPE Project + * Copyright (C) 2011-2015 SIPE Project * * * This program is free software; you can redistribute it and/or modify @@ -59,7 +59,6 @@ typedef struct _context_tls_dsk { static gboolean sip_sec_acquire_cred__tls_dsk(SipSecContext context, - SIPE_UNUSED_PARAMETER const gchar *domain, SIPE_UNUSED_PARAMETER const gchar *username, const gchar *password) { diff --git a/src/core/sip-sec.c b/src/core/sip-sec.c index 57c97c2a..9fb255f7 100644 --- a/src/core/sip-sec.c +++ b/src/core/sip-sec.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2010-2014 SIPE Project + * Copyright (C) 2010-2015 SIPE Project * Copyright (C) 2009 pier11 * * @@ -122,7 +122,7 @@ SipSecContext sip_sec_create_context(guint type, gboolean sso, gboolean http, - const gchar *domain, + SIPE_UNUSED_PARAMETER const gchar *domain, const gchar *username, const gchar *password) { @@ -156,7 +156,7 @@ sip_sec_create_context(guint type, if (http) context->flags |= SIP_SEC_FLAG_COMMON_HTTP; - if (!(*context->acquire_cred_func)(context, domain, username, password)) { + if (!(*context->acquire_cred_func)(context, username, password)) { SIPE_DEBUG_INFO_NOFORMAT("ERROR: sip_sec_create_context: failed to acquire credentials."); (*context->destroy_context_func)(context); context = NULL; -- 2.11.4.GIT