[libsoup] Define SoupAuthNegotiate unconditionally
- From: Allison Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] Define SoupAuthNegotiate unconditionally
- Date: Tue, 6 Dec 2016 12:56:28 +0000 (UTC)
commit 975e6f5426568187e907926c905bcb554019ae9f
Author: Allison Lortie <desrt desrt ca>
Date: Tue Dec 6 13:13:22 2016 +0100
Define SoupAuthNegotiate unconditionally
This class doesn't do much if LIBSOUP_HAVE_GSSAPI is not defined, but
the type itself still needs to exist, or (among other things) the
introspection build will fail.
bd93c273ea787df4f3fe03c9cf6c8e53d8fc5fc9 broke that, by making the
G_DEFINE_TYPE() condition on #ifdef LIBSOUP_HAVE_GSSAPI. This was done
because the Private struct contains gss types.
Reorder things a bit to make sure we always do the G_DEFINE_TYPE() even
if we have no GSSAPI.
https://bugzilla.gnome.org/show_bug.cgi?id=774189
libsoup/soup-auth-negotiate.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/libsoup/soup-auth-negotiate.c b/libsoup/soup-auth-negotiate.c
index fc040f0..94863d6 100644
--- a/libsoup/soup-auth-negotiate.c
+++ b/libsoup/soup-auth-negotiate.c
@@ -43,7 +43,6 @@ soup_auth_negotiate_supported (void)
#endif
}
-#ifdef LIBSOUP_HAVE_GSSAPI
#define AUTH_GSS_ERROR -1
#define AUTH_GSS_COMPLETE 1
#define AUTH_GSS_CONTINUE 0
@@ -59,8 +58,10 @@ typedef struct {
gboolean initialized;
gchar *response_header;
+#ifdef LIBSOUP_HAVE_GSSAPI
gss_ctx_id_t context;
gss_name_t server_name;
+#endif
SoupNegotiateState state;
} SoupNegotiateConnectionState;
@@ -90,6 +91,7 @@ typedef struct {
*/
G_DEFINE_TYPE_WITH_PRIVATE (SoupAuthNegotiate, soup_auth_negotiate, SOUP_TYPE_CONNECTION_AUTH)
+#ifdef LIBSOUP_HAVE_GSSAPI
static gboolean check_auth_trusted_uri (SoupConnectionAuth *auth,
SoupMessage *msg);
static gboolean soup_gss_build_response (SoupNegotiateConnectionState *conn,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]