From 8874626358898d717ac2b7ee812eb039536deb80 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 26 Sep 2011 11:45:15 -0400 Subject: [PATCH] daemon: fix the legacy auth compatibility layer In commit f91f017071ffa5f5999e6c2e2c0929e290482932 I introduced a translation layer that keeps compatibility for distros who build with --disable-split-authentication. The commit was somewhat faulty, though. I made some last minute clean ups to the patch before committing that I didn't fully test. Those cleanups resulted in the pam service name getting improperly translated and broke the compatibility layer the commit introduced. https://bugzilla.gnome.org/show_bug.cgi?id=658451 --- daemon/gdm-greeter-server.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c index 4803bc3..535fdbf 100644 --- a/daemon/gdm-greeter-server.c +++ b/daemon/gdm-greeter-server.c @@ -486,7 +486,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); - service_name = translate_outgoing_service_name (greeter_server, service_name); + service_name = translate_incoming_service_name (greeter_server, service_name); g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION], 0, service_name); return DBUS_HANDLER_RESULT_HANDLED; @@ -544,7 +544,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); - service_name = translate_outgoing_service_name (greeter_server, service_name); + service_name = translate_incoming_service_name (greeter_server, service_name); g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION_FOR_USER], 0, service_name, text); return DBUS_HANDLER_RESULT_HANDLED; @@ -575,7 +575,7 @@ handle_answer_query (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); - service_name = translate_outgoing_service_name (greeter_server, service_name); + service_name = translate_incoming_service_name (greeter_server, service_name); g_signal_emit (greeter_server, signals [QUERY_ANSWER], 0, service_name, text); return DBUS_HANDLER_RESULT_HANDLED; @@ -763,7 +763,7 @@ handle_start_session_when_ready (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); - service_name = (char *) translate_outgoing_service_name (greeter_server, service_name); + service_name = (char *) translate_incoming_service_name (greeter_server, service_name); if (should_start_session) { g_signal_emit (greeter_server, signals [START_SESSION_WHEN_READY], 0, service_name); } else { -- 1.7.6.2