← Back to branch summary

~ricotz/gdm/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/01git.diff

  • Committer: Rico Tzschichholz
  • Date: 2011-10-06 13:11:22 UTC
  • Revision ID: ricotz@t-online.de-20111006131122-u7ktmaf5klp7c8b7
* New upstream release
* debian/control.in:
  - Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
    gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
  - Add gir1.2-gdmgreeter-1.0 libgdmgreeter1, libgdmgreeter-dev,
    libgdmsimplegreeter1, libgdmsimplegreeter-dev packages
* debian/patches:
  - Drop 00git_use_new_power_interface.patch,
    00git_xsession-errors_symlink.patch and 29_grep_path.patch
    which are upstream
  - refreshed as needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01git.diff
 
1
From 1d7f466e7bf4cbd1426ce4c3536360f0f9badc3b Mon Sep 17 00:00:00 2001
 
2
From: Ray Strode <rstrode@redhat.com>
 
3
Date: Mon, 26 Sep 2011 15:45:15 +0000
 
4
Subject: daemon: fix the legacy auth compatibility layer
 
5
 
 
6
In commit f91f017071ffa5f5999e6c2e2c0929e290482932 I
 
7
introduced a translation layer that keeps compatibility
 
8
for distros who build with --disable-split-authentication.
 
9
 
 
10
The commit was somewhat faulty, though.  I made some last
 
11
minute clean ups to the patch before committing that I didn't
 
12
fully test.  Those cleanups resulted in the pam service name
 
13
getting improperly translated and broke the compatibility layer
 
14
the commit introduced.
 
15
 
 
16
https://bugzilla.gnome.org/show_bug.cgi?id=658451
 
17
---
 
18
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
 
19
index 4803bc3..535fdbf 100644
 
20
--- a/daemon/gdm-greeter-server.c
 
21
+++ b/daemon/gdm-greeter-server.c
 
22
@@ -486,7 +486,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server,
 
23
         dbus_connection_send (connection, reply, NULL);
 
24
         dbus_message_unref (reply);
 
25
 
 
26
-        service_name = translate_outgoing_service_name (greeter_server, service_name);
 
27
+        service_name = translate_incoming_service_name (greeter_server, service_name);
 
28
         g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION], 0, service_name);
 
29
 
 
30
         return DBUS_HANDLER_RESULT_HANDLED;
 
31
@@ -544,7 +544,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server,
 
32
         dbus_connection_send (connection, reply, NULL);
 
33
         dbus_message_unref (reply);
 
34
 
 
35
-        service_name = translate_outgoing_service_name (greeter_server, service_name);
 
36
+        service_name = translate_incoming_service_name (greeter_server, service_name);
 
37
         g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION_FOR_USER], 0, service_name, text);
 
38
 
 
39
         return DBUS_HANDLER_RESULT_HANDLED;
 
40
@@ -575,7 +575,7 @@ handle_answer_query (GdmGreeterServer *greeter_server,
 
41
         dbus_connection_send (connection, reply, NULL);
 
42
         dbus_message_unref (reply);
 
43
 
 
44
-        service_name = translate_outgoing_service_name (greeter_server, service_name);
 
45
+        service_name = translate_incoming_service_name (greeter_server, service_name);
 
46
         g_signal_emit (greeter_server, signals [QUERY_ANSWER], 0, service_name, text);
 
47
 
 
48
         return DBUS_HANDLER_RESULT_HANDLED;
 
49
@@ -763,7 +763,7 @@ handle_start_session_when_ready (GdmGreeterServer *greeter_server,
 
50
         dbus_connection_send (connection, reply, NULL);
 
51
         dbus_message_unref (reply);
 
52
 
 
53
-        service_name = (char *) translate_outgoing_service_name (greeter_server, service_name);
 
54
+        service_name = (char *) translate_incoming_service_name (greeter_server, service_name);
 
55
         if (should_start_session) {
 
56
                 g_signal_emit (greeter_server, signals [START_SESSION_WHEN_READY], 0, service_name);
 
57
         } else {
 
58
--
 
59
cgit v0.9.0.2