Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 914590 Details for
Bug 1116149
GSSAPI support is incomplete
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Suggested GSSAPI fixes
evolution-ews-gssapi.patch (text/plain), 23.29 KB, created by
Daniel Sands
on 2014-07-03 21:37:05 UTC
(
hide
)
Description:
Suggested GSSAPI fixes
Filename:
MIME Type:
Creator:
Daniel Sands
Created:
2014-07-03 21:37:05 UTC
Size:
23.29 KB
patch
obsolete
>diff -up evolution-ews-3.12.3.new/src/addressbook/e-book-backend-ews.c.gssapi-fix evolution-ews-3.12.3.new/src/addressbook/e-book-backend-ews.c >--- evolution-ews-3.12.3.new/src/addressbook/e-book-backend-ews.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/addressbook/e-book-backend-ews.c 2014-07-03 13:38:00.487584179 -0600 >@@ -43,6 +43,7 @@ > #include "server/e-ews-item-change.h" > #include "server/e-ews-message.h" > #include "server/e-ews-connection.h" >+#include "server/e-ews-connection-utils.h" > #include "server/e-ews-item.h" > #include "server/e-source-ews-folder.h" > >@@ -4012,6 +4013,18 @@ e_book_backend_ews_dispose (GObject *obj > G_OBJECT_CLASS (e_book_backend_ews_parent_class)->dispose (object); > } > >+static gboolean >+book_backend_ews_get_without_password (ESourceAuthenticator *authenticator) >+{ >+ EBookBackendEws *backend; >+ CamelEwsSettings *ews_settings; >+ >+ backend = E_BOOK_BACKEND_EWS (authenticator); >+ ews_settings = book_backend_ews_get_collection_settings (backend); >+ >+ return e_ews_connection_utils_get_without_password (ews_settings); >+} >+ > static ESourceAuthenticationResult > book_backend_ews_try_password_sync (ESourceAuthenticator *authenticator, > const GString *password, >@@ -4097,6 +4110,8 @@ e_book_backend_ews_class_init (EBookBack > static void > e_book_backend_ews_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ book_backend_ews_get_without_password; > iface->try_password_sync = book_backend_ews_try_password_sync; > } > >diff -up evolution-ews-3.12.3.new/src/calendar/e-cal-backend-ews.c.gssapi-fix evolution-ews-3.12.3.new/src/calendar/e-cal-backend-ews.c >--- evolution-ews-3.12.3.new/src/calendar/e-cal-backend-ews.c.gssapi-fix 2014-05-28 05:24:49.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/calendar/e-cal-backend-ews.c 2014-07-03 14:01:59.904501935 -0600 >@@ -41,6 +41,7 @@ > #include <libical/icalparameter.h> > > #include "server/e-source-ews-folder.h" >+#include "server/e-ews-connection-utils.h" > > #include "utils/ews-camel-common.h" > >@@ -4095,6 +4096,18 @@ e_cal_backend_ews_finalize (GObject *obj > G_OBJECT_CLASS (e_cal_backend_ews_parent_class)->finalize (object); > } > >+static gboolean >+cal_backend_ews_get_without_password (ESourceAuthenticator *authenticator) >+{ >+ ECalBackendEws *backend; >+ CamelEwsSettings *ews_settings; >+ >+ backend = E_CAL_BACKEND_EWS (authenticator); >+ ews_settings = cal_backend_ews_get_collection_settings (backend); >+ >+ return e_ews_connection_utils_get_without_password (ews_settings); >+} >+ > static ESourceAuthenticationResult > cal_backend_ews_try_password_sync (ESourceAuthenticator *authenticator, > const GString *password, >@@ -4187,6 +4200,8 @@ e_cal_backend_ews_class_init (ECalBacken > static void > e_cal_backend_ews_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ cal_backend_ews_get_without_password; > iface->try_password_sync = cal_backend_ews_try_password_sync; > } > >diff -up evolution-ews-3.12.3.new/src/camel/camel-ews-store.c.gssapi-fix evolution-ews-3.12.3.new/src/camel/camel-ews-store.c >--- evolution-ews-3.12.3.new/src/camel/camel-ews-store.c.gssapi-fix 2014-05-07 04:45:21.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/camel/camel-ews-store.c 2014-07-03 13:09:26.095682134 -0600 >@@ -1887,14 +1887,6 @@ ews_store_query_auth_types_sync (CamelSe > > g_return_val_if_fail (CAMEL_IS_EWS_STORE (service), NULL); > >- if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (service))) { >- g_set_error ( >- error, CAMEL_SERVICE_ERROR, >- CAMEL_SERVICE_ERROR_UNAVAILABLE, >- _("You must be working online to complete this operation")); >- return NULL; >- } >- > settings = camel_service_ref_settings (service); > ews_settings = CAMEL_EWS_SETTINGS (settings); > hosturl = camel_ews_settings_dup_hosturl (ews_settings); >diff -up evolution-ews-3.12.3.new/src/configuration/e-ews-config-utils.c.gssapi-fix evolution-ews-3.12.3.new/src/configuration/e-ews-config-utils.c >--- evolution-ews-3.12.3.new/src/configuration/e-ews-config-utils.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/configuration/e-ews-config-utils.c 2014-07-03 14:06:55.619485038 -0600 >@@ -36,6 +36,7 @@ > #include <shell/e-shell-window.h> > > #include "server/e-ews-connection.h" >+#include "server/e-ews-connection-utils.h" > #include "server/e-source-ews-folder.h" > > #include "e-ews-edit-folder-permissions.h" >@@ -264,6 +265,13 @@ struct _EEwsConfigUtilsAuthenticatorClas > GObjectClass parent_class; > }; > >+static gboolean >+ews_config_utils_authenticator_get_without_password (ESourceAuthenticator *auth) >+{ >+ EEwsConfigUtilsAuthenticator *authenticator = (EEwsConfigUtilsAuthenticator *) auth; >+ return e_ews_connection_utils_get_without_password (authenticator->ews_settings); >+} >+ > static ESourceAuthenticationResult > ews_config_utils_authenticator_try_password_sync (ESourceAuthenticator *auth, > const GString *password, >@@ -358,6 +366,8 @@ e_ews_config_utils_authenticator_class_i > static void > e_ews_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ ews_config_utils_authenticator_get_without_password; > iface->try_password_sync = ews_config_utils_authenticator_try_password_sync; > } > >diff -up evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-autodiscover.c.gssapi-fix evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-autodiscover.c >--- evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-autodiscover.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-autodiscover.c 2014-07-03 14:19:30.123441928 -0600 >@@ -27,6 +27,7 @@ > #include <mail/e-mail-config-service-page.h> > > #include "server/e-ews-connection.h" >+#include "server/e-ews-connection-utils.h" > > #define E_MAIL_CONFIG_EWS_AUTODISCOVER_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE \ >@@ -246,6 +247,22 @@ mail_config_ews_autodiscover_clicked (Gt > mail_config_ews_autodiscover_run (autodiscover); > } > >+static gboolean >+mail_config_ews_autodiscover_get_without_password (ESourceAuthenticator *auth) >+{ >+ EMailConfigEwsAutodiscover *autodiscover; >+ EMailConfigServiceBackend *backend; >+ CamelSettings *settings; >+ CamelEwsSettings *ews_settings; >+ >+ autodiscover = E_MAIL_CONFIG_EWS_AUTODISCOVER (auth); >+ backend = e_mail_config_ews_autodiscover_get_backend (autodiscover); >+ settings = e_mail_config_service_backend_get_settings (backend); >+ ews_settings = CAMEL_EWS_SETTINGS (settings); >+ >+ return e_ews_connection_utils_get_without_password (ews_settings); >+} >+ > static ESourceAuthenticationResult > mail_config_ews_autodiscover_try_password_sync (ESourceAuthenticator *auth, > const GString *password, >@@ -321,6 +338,8 @@ e_mail_config_ews_autodiscover_class_ini > static void > e_mail_config_ews_autodiscover_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ mail_config_ews_autodiscover_get_without_password; > iface->try_password_sync = > mail_config_ews_autodiscover_try_password_sync; > } >diff -up evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-delegates-page.c.gssapi-fix evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-delegates-page.c >--- evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-delegates-page.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-delegates-page.c 2014-07-03 14:12:51.557464701 -0600 >@@ -31,6 +31,7 @@ > > #include "server/camel-ews-settings.h" > #include "server/e-ews-connection.h" >+#include "server/e-ews-connection-utils.h" > #include "server/e-ews-oof-settings.h" > #include "camel/camel-ews-store.h" > >@@ -1499,6 +1500,20 @@ sort_by_display_name_cb (gconstpointer a > return g_utf8_collate (aname, bname); > } > >+static gboolean >+mail_config_ews_delegates_page_get_without_password (ESourceAuthenticator *auth) >+{ >+ EMailConfigEwsDelegatesPage *page; >+ CamelSettings *settings; >+ CamelEwsSettings *ews_settings; >+ >+ page = E_MAIL_CONFIG_EWS_DELEGATES_PAGE (auth); >+ settings = mail_config_ews_delegates_page_get_settings (page); >+ ews_settings = CAMEL_EWS_SETTINGS (settings); >+ >+ return e_ews_connection_utils_get_without_password (ews_settings); >+} >+ > static ESourceAuthenticationResult > mail_config_ews_delegates_page_try_password_sync (ESourceAuthenticator *auth, > const GString *password, >@@ -1636,6 +1651,8 @@ e_mail_config_ews_delegates_page_interfa > static void > e_mail_config_ews_delegates_page_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ mail_config_ews_delegates_page_get_without_password; > iface->try_password_sync = mail_config_ews_delegates_page_try_password_sync; > } > >diff -up evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-oal-combo-box.c.gssapi-fix evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-oal-combo-box.c >--- evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-oal-combo-box.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-oal-combo-box.c 2014-07-03 14:16:38.481451735 -0600 >@@ -25,6 +25,7 @@ > #include <mail/e-mail-config-service-page.h> > > #include "server/e-ews-connection.h" >+#include "server/e-ews-connection-utils.h" > > #define E_MAIL_CONFIG_EWS_OAL_COMBO_BOX_GET_PRIVATE(obj) \ > (G_TYPE_INSTANCE_GET_PRIVATE \ >@@ -135,6 +136,23 @@ mail_config_ews_oal_combo_box_finalize ( > finalize (object); > } > >+static gboolean >+mail_config_ews_oal_combo_box_get_without_password (ESourceAuthenticator *auth) >+{ >+ EMailConfigEwsOalComboBox *combo_box; >+ EMailConfigServiceBackend *backend; >+ CamelSettings *settings; >+ CamelEwsSettings *ews_settings; >+ >+ combo_box = E_MAIL_CONFIG_EWS_OAL_COMBO_BOX (auth); >+ backend = e_mail_config_ews_oal_combo_box_get_backend (combo_box); >+ settings = e_mail_config_service_backend_get_settings (backend); >+ >+ ews_settings = CAMEL_EWS_SETTINGS (settings); >+ >+ return e_ews_connection_utils_get_without_password (ews_settings); >+} >+ > static ESourceAuthenticationResult > mail_config_ews_oal_combo_box_try_password_sync (ESourceAuthenticator *auth, > const GString *password, >@@ -219,6 +237,8 @@ e_mail_config_ews_oal_combo_box_class_in > static void > e_mail_config_ews_oal_combo_box_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ mail_config_ews_oal_combo_box_get_without_password; > iface->try_password_sync = > mail_config_ews_oal_combo_box_try_password_sync; > } >diff -up evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-ooo-page.c.gssapi-fix evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-ooo-page.c >--- evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-ooo-page.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/configuration/e-mail-config-ews-ooo-page.c 2014-07-03 14:18:54.876443942 -0600 >@@ -32,6 +32,7 @@ > > #include "server/camel-ews-settings.h" > #include "server/e-ews-connection.h" >+#include "server/e-ews-connection-utils.h" > #include "server/e-ews-oof-settings.h" > > #define E_MAIL_CONFIG_EWS_OOO_PAGE_GET_PRIVATE(obj) \ >@@ -790,6 +791,20 @@ mail_config_ews_ooo_page_submit_finish ( > return !g_simple_async_result_propagate_error (simple, error); > } > >+static gboolean >+mail_config_ews_ooo_page_get_without_password (ESourceAuthenticator *auth) >+{ >+ EMailConfigEwsOooPage *page; >+ CamelSettings *settings; >+ CamelEwsSettings *ews_settings; >+ >+ page = E_MAIL_CONFIG_EWS_OOO_PAGE (auth); >+ settings = mail_config_ews_ooo_page_get_settings (page); >+ ews_settings = CAMEL_EWS_SETTINGS (settings); >+ >+ return e_ews_connection_utils_get_without_password (ews_settings); >+} >+ > static ESourceAuthenticationResult > mail_config_ews_ooo_page_try_password_sync (ESourceAuthenticator *auth, > const GString *password, >@@ -922,6 +937,8 @@ e_mail_config_ews_ooo_page_interface_ini > static void > e_mail_config_ews_ooo_page_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ mail_config_ews_ooo_page_get_without_password; > iface->try_password_sync = > mail_config_ews_ooo_page_try_password_sync; > } >diff -up evolution-ews-3.12.3.new/src/server/e-ews-connection.c.gssapi-fix evolution-ews-3.12.3.new/src/server/e-ews-connection.c >--- evolution-ews-3.12.3.new/src/server/e-ews-connection.c.gssapi-fix 2014-05-22 00:46:14.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/server/e-ews-connection.c 2014-07-03 13:52:27.652534632 -0600 >@@ -74,6 +74,10 @@ static void ews_connection_authenticate > SoupAuth *auth, > gboolean retrying, > gpointer data); >+static void >+ews_dump_raw_soup_request (SoupMessage *msg); >+static void >+ews_dump_raw_soup_response (SoupMessage *msg); > > /* Connection APIS */ > >@@ -488,6 +492,19 @@ typedef struct _EwsScheduleData > gpointer queue_user_data; > } EwsScheduleData; > >+static gboolean >+ews_connection_get_without_password (ESourceAuthenticator *authenticator) >+{ >+ gboolean result; >+ EEwsConnection *cnc = E_EWS_CONNECTION (authenticator); >+ CamelEwsSettings *ews_settings = e_ews_connection_ref_settings (cnc); >+ >+ result = e_ews_connection_utils_get_without_password (ews_settings); >+ >+ g_object_unref (ews_settings); >+ return result; >+} >+ > /* this is run in priv->soup_thread */ > static gboolean > ews_connection_scheduled_cb (gpointer user_data) >@@ -498,6 +515,10 @@ ews_connection_scheduled_cb (gpointer us > > switch (sd->op) { > case EWS_SCHEDULE_OP_QUEUE_MESSAGE: >+ e_ews_connection_utils_add_needed_auth (sd->cnc, sd->cnc->priv->soup_session, sd->message); >+ >+ ews_dump_raw_soup_request (sd->message); >+ > soup_session_queue_message ( > sd->cnc->priv->soup_session, sd->message, > sd->queue_callback, sd->queue_user_data); >@@ -628,15 +649,6 @@ ews_next_request (gpointer _cnc) > > node = (EwsNode *) l->data; > >- if (e_ews_debug_get_log_level () == 1) { >- soup_buffer_free (soup_message_body_flatten (SOUP_MESSAGE (node->msg)->request_body)); >- /* print request's body */ >- printf ("\n The request headers"); >- fputc ('\n', stdout); >- fputs (SOUP_MESSAGE (node->msg)->request_body->data, stdout); >- fputc ('\n', stdout); >- } >- > /* Remove the node from the priority queue */ > cnc->priv->jobs = g_slist_remove (cnc->priv->jobs, (gconstpointer *) node); > >@@ -645,15 +657,10 @@ ews_next_request (gpointer _cnc) > > if (cnc->priv->soup_session) { > SoupMessage *msg = SOUP_MESSAGE (node->msg); >- CamelEwsSettings *ews_settings = e_ews_connection_ref_settings (cnc); >- gchar *auth_mech = NULL; > >- g_object_get (G_OBJECT (ews_settings), "auth-mechanism", &auth_mech, NULL); >- if (g_strcmp0 (auth_mech, "GSSAPI") == 0) >- e_ews_connection_utils_setup_msg_gssapi_auth (cnc, cnc->priv->soup_session, msg); >+ e_ews_connection_utils_add_needed_auth (cnc, cnc->priv->soup_session, msg); > >- g_object_unref (ews_settings); >- g_free (auth_mech); >+ ews_dump_raw_soup_request (msg); > > soup_session_queue_message (cnc->priv->soup_session, msg, ews_response_cb, node); > QUEUE_UNLOCK (cnc); >@@ -1751,6 +1758,8 @@ e_ews_connection_folders_list_free (gpoi > static void > e_ews_connection_authenticator_init (ESourceAuthenticatorInterface *iface) > { >+ iface->get_without_password = >+ ews_connection_get_without_password; > iface->try_password_sync = ews_connection_try_password_sync; > } > >@@ -1888,6 +1897,8 @@ ews_connection_authenticate (SoupSession > EEwsConnection *cnc = data; > CamelNetworkSettings *network_settings; > gchar *user, *password; >+ CamelEwsSettings *ews_settings; >+ gchar *auth_mech = NULL; > > g_return_if_fail (cnc != NULL); > >@@ -1899,8 +1910,19 @@ ews_connection_authenticate (SoupSession > > password = e_ews_connection_dup_password (cnc); > >- if (password != NULL) >+ ews_settings = e_ews_connection_ref_settings (cnc); >+ g_object_get (G_OBJECT (ews_settings), "auth-mechanism", &auth_mech, NULL); >+ if (g_strcmp0 (auth_mech, "GSSAPI") == 0) >+ { >+ e_ews_connection_utils_authenticate_gssapi(msg); >+ } >+ else if (password != NULL) >+ { > soup_auth_authenticate (auth, user, password); >+ } >+ >+ g_object_unref (ews_settings); >+ g_free (auth_mech); > > g_free (password); > g_free (user); >@@ -2421,6 +2443,35 @@ autodiscover_data_free (struct _autodisc > g_slice_free (struct _autodiscover_data, ad); > } > >+static void >+print_header (const char *name, >+ const char *value, >+ gpointer user_data) >+{ >+ printf( "\n%s: %s", name, value); >+} >+ >+static void >+ews_dump_raw_soup_request (SoupMessage *msg) >+{ >+ gint log_level; >+ >+ log_level = e_ews_debug_get_log_level (); >+ if (log_level >= 1 && log_level < 3) { >+ soup_buffer_free ( >+ soup_message_body_flatten ( >+ SOUP_MESSAGE (msg)->request_body)); >+ /* print response body */ >+ printf ("\n The request headers"); >+ printf ("\n ====================="); >+ soup_message_headers_foreach (SOUP_MESSAGE (msg)->request_headers, print_header, NULL); >+ fputc ('\n', stdout); >+ fputs (SOUP_MESSAGE (msg)->request_body->data, stdout); >+ fputc ('\n', stdout); >+ fflush (stdout); >+ } >+} >+ > static void > ews_dump_raw_soup_response (SoupMessage *msg) > { >@@ -2428,13 +2479,17 @@ ews_dump_raw_soup_response (SoupMessage > > log_level = e_ews_debug_get_log_level (); > if (log_level >= 1 && log_level < 3) { >- soup_buffer_free (soup_message_body_flatten (SOUP_MESSAGE (msg)->response_body)); >+ soup_buffer_free ( >+ soup_message_body_flatten ( >+ SOUP_MESSAGE (msg)->response_body)); > /* print response body */ > printf ("\n The response headers"); > printf ("\n ====================="); >+ soup_message_headers_foreach (SOUP_MESSAGE (msg)->response_headers, print_header, NULL); > fputc ('\n', stdout); > fputs (SOUP_MESSAGE (msg)->response_body->data, stdout); > fputc ('\n', stdout); >+ fflush (stdout); > } > > } >@@ -2605,6 +2660,11 @@ static void post_restarted (SoupMessage > { > xmlOutputBuffer *buf = data; > >+ if (msg->status_code == 401) >+ { >+ return; >+ } >+ > /* In violation of RFC2616, libsoup will change a POST request to > * a GET on receiving a 302 redirect. */ > printf ("Working around libsoup bug with redirect\n"); >@@ -2627,7 +2687,6 @@ e_ews_get_msg_for_url (const gchar *url, > GError **error) > { > SoupMessage *msg; >- gint log_level; > > if (url == NULL) { > g_set_error_literal ( >@@ -2663,18 +2722,7 @@ e_ews_get_msg_for_url (const gchar *url, > G_CALLBACK (post_restarted), buf); > } > >- log_level = e_ews_debug_get_log_level (); >- if (log_level >= 1 && log_level < 3) { >- soup_buffer_free ( >- soup_message_body_flatten ( >- SOUP_MESSAGE (msg)->request_body)); >- /* print request's body */ >- printf ("\n The request headers"); >- printf ("\n ==================="); >- fputc ('\n', stdout); >- fputs (SOUP_MESSAGE (msg)->request_body->data, stdout); >- fputc ('\n', stdout); >- } >+ ews_dump_raw_soup_request (msg); > > return msg; > } >@@ -3384,6 +3432,8 @@ oal_download_response_cb (SoupSession *s > g_unlink (data->cache_filename); > } > >+ ews_dump_raw_soup_response (soup_message); >+ > g_simple_async_result_complete_in_idle (simple); > e_ews_connection_utils_unref_in_thread (simple); > } >diff -up evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.c.gssapi-fix evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.c >--- evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.c.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.c 2014-07-03 13:53:44.705530229 -0600 >@@ -75,9 +75,8 @@ ews_connection_utils_gssapi_challenge (C > return response; > } > >-static void >-ews_connection_utils_authenticate_gssapi_cb (SoupMessage *message, >- gpointer user_data) >+void >+e_ews_connection_utils_authenticate_gssapi (SoupMessage *message) > { > EEwsConnection *connection = g_object_get_data (G_OBJECT (message), EWS_GSSAPI_CONNECTION); > SoupSession *session = g_object_get_data (G_OBJECT (message), EWS_GSSAPI_SOUP_SESSION); >@@ -178,8 +177,6 @@ e_ews_connection_utils_setup_msg_gssapi_ > g_object_set_data_full (G_OBJECT (message), EWS_GSSAPI_SASL, > gssapi_sasl, g_object_unref); > >- soup_message_add_header_handler (message, "got_body", "WWW-Authenticate", >- G_CALLBACK (ews_connection_utils_authenticate_gssapi_cb), NULL); > > g_object_unref (ews_settings); > } >@@ -241,4 +238,34 @@ e_ews_connection_utils_check_element (co > return TRUE; > } > >+/* Return TRUE if using GSSAPI. */ >+gboolean >+e_ews_connection_utils_get_without_password (CamelEwsSettings *ews_settings) >+{ >+ gboolean result = FALSE; >+ gchar *auth_mech = NULL; >+ >+ g_object_get (G_OBJECT (ews_settings), "auth-mechanism", &auth_mech, NULL); >+ if (g_strcmp0 (auth_mech, "GSSAPI") == 0) >+ result = TRUE; >+ >+ g_free (auth_mech); > >+ return result; >+} >+ >+void >+e_ews_connection_utils_add_needed_auth (EEwsConnection *cnc, >+ SoupSession *session, >+ SoupMessage *msg) >+{ >+ CamelEwsSettings *ews_settings = e_ews_connection_ref_settings (cnc); >+ gchar *auth_mech = NULL; >+ >+ g_object_get (G_OBJECT (ews_settings), "auth-mechanism", &auth_mech, NULL); >+ if (g_strcmp0 (auth_mech, "GSSAPI") == 0) >+ e_ews_connection_utils_setup_msg_gssapi_auth (cnc, session, msg); >+ >+ g_object_unref (ews_settings); >+ g_free (auth_mech); >+} >diff -up evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.h.gssapi-fix evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.h >--- evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.h.gssapi-fix 2014-03-24 03:28:36.000000000 -0600 >+++ evolution-ews-3.12.3.new/src/server/e-ews-connection-utils.h 2014-07-03 13:53:19.272531682 -0600 >@@ -41,6 +41,16 @@ gboolean e_ews_connection_utils_check_el > const gchar *element_name, > const gchar *expected_name); > >+void e_ews_connection_utils_authenticate_gssapi >+ (SoupMessage *message); >+ >+gboolean e_ews_connection_utils_get_without_password >+ (CamelEwsSettings *ews_settings); >+ >+void e_ews_connection_utils_add_needed_auth (EEwsConnection *cnc, >+ SoupSession *session, >+ SoupMessage *msg); >+ > G_END_DECLS > > #endif /* E_EWS_CONNECTION_UTILS_H */ >diff -up evolution-ews-3.12.3.new/src/server/e-ews-notification.c.gssapi-fix evolution-ews-3.12.3.new/src/server/e-ews-notification.c >--- evolution-ews-3.12.3.new/src/server/e-ews-notification.c.gssapi-fix 2014-07-03 14:20:49.597437387 -0600 >+++ evolution-ews-3.12.3.new/src/server/e-ews-notification.c 2014-07-03 13:58:13.245514885 -0600 >@@ -267,13 +267,11 @@ e_ews_notification_subscribe_folder_sync > gchar **subscription_id, > GCancellable *cancellable) > { >- CamelEwsSettings *ews_settings; > ESoapMessage *msg; > ESoapResponse *response; > ESoapParameter *param, *subparam; > GError *error = NULL; > GSList *l; >- gchar *auth_mech = NULL; > guint event_type; > xmlDoc *doc; > >@@ -325,17 +323,10 @@ e_ews_notification_subscribe_folder_sync > > soup_message_body_set_accumulate (SOUP_MESSAGE (msg)->response_body, TRUE); > >- ews_settings = e_ews_connection_ref_settings (notification->priv->connection); >- >- g_object_get (G_OBJECT (ews_settings), "auth-mechanism", &auth_mech, NULL); >- if (g_strcmp0 (auth_mech, "GSSAPI") == 0) >- e_ews_connection_utils_setup_msg_gssapi_auth ( >- notification->priv->connection, >- notification->priv->soup_session, >- SOUP_MESSAGE (msg)); >- >- g_object_unref (ews_settings); >- g_free (auth_mech); >+ e_ews_connection_utils_add_needed_auth ( >+ notification->priv->connection, >+ notification->priv->soup_session, >+ SOUP_MESSAGE (msg)); > > if (g_cancellable_is_cancelled (cancellable)) { > g_object_unref (msg);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1116149
: 914590