rpms/gdm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Create settings object early to prevent assertion failures when one pam

Browse Source 
conversation completes before another starts.
This commit is contained in:
Ray Strode 2009-03-05 21:54:46 +00:00
parent 18800be8a0
commit 060e108707
2 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
gdm-2.25.2-multistack-but-boring.patch
View File

@ -4151,8 +4151,17 @@ diff -up gdm-2.25.2/daemon/gdm-session-relay.c.multistack-but-boring gdm-2.25.2/
iface->authenticate = gdm_session_relay_authenticate; iface->authenticate = gdm_session_relay_authenticate;
diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker.c diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker.c
--- gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring 2008-11-18 17:19:05.000000000 -0500 --- gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring 2008-11-18 17:19:05.000000000 -0500
+++ gdm-2.25.2/daemon/gdm-session-worker.c 2009-03-04 21:03:53.123432737 -0500 +++ gdm-2.25.2/daemon/gdm-session-worker.c 2009-03-05 16:51:38.010621245 -0500
@@ -2568,6 +2568,28 @@ worker_dbus_filter_function (DBusConnect @@ -2054,8 +2054,6 @@ do_setup (GdmSessionWorker *worker)
GError *error;
gboolean res;
- worker->priv->user_settings = gdm_session_settings_new ();
-
g_signal_connect_swapped (worker->priv->user_settings,
"notify::language-name",
G_CALLBACK (on_saved_language_name_read),
@@ -2568,6 +2566,28 @@ worker_dbus_filter_function (DBusConnect
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_HANDLED;
} }
@ -4181,7 +4190,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2
static GObject * static GObject *
gdm_session_worker_constructor (GType type, gdm_session_worker_constructor (GType type,
guint n_construct_properties, guint n_construct_properties,
@@ -2594,6 +2616,11 @@ gdm_session_worker_constructor (GType @@ -2594,6 +2614,11 @@ gdm_session_worker_constructor (GType
exit (1); exit (1);
} }
@ -4193,6 +4202,14 @@ diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2
dbus_connection_setup_with_g_main (worker->priv->connection, NULL); dbus_connection_setup_with_g_main (worker->priv->connection, NULL);
dbus_connection_set_exit_on_disconnect (worker->priv->connection, TRUE); dbus_connection_set_exit_on_disconnect (worker->priv->connection, TRUE);
@@ -2635,6 +2660,7 @@ gdm_session_worker_init (GdmSessionWorke
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
+ worker->priv->user_settings = gdm_session_settings_new ();
}
static void
diff -up gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker-job.c diff -up gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker-job.c
--- gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400 --- gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring 2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.25.2/daemon/gdm-session-worker-job.c 2009-03-04 21:03:53.125433055 -0500 +++ gdm-2.25.2/daemon/gdm-session-worker-job.c 2009-03-04 21:03:53.125433055 -0500
@ -7183,7 +7200,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h.multistack-but
G_END_DECLS G_END_DECLS
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500
@@ -0,0 +1,255 @@ @@ -0,0 +1,255 @@
+/* +/*
@ -7442,7 +7459,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c
+} +}
+ +
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+/* +/*
@ -7772,7 +7789,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c.multistack-but-bori
} }
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500
@@ -0,0 +1,478 @@ @@ -0,0 +1,478 @@
+/* +/*
@ -8254,7 +8271,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c
+ return g_hash_table_lookup (manager->priv->plugins, name); + return g_hash_table_lookup (manager->priv->plugins, name);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+/* +/*
@ -8324,7 +8341,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h
+ +
+#endif /* __GDM_PLUGIN_MANAGER_H */ +#endif /* __GDM_PLUGIN_MANAGER_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500
@@ -0,0 +1,329 @@ @@ -0,0 +1,329 @@
+/* +/*
@ -8657,7 +8674,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c
+ return g_list_length (widget->priv->tasks); + return g_list_length (widget->priv->tasks);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+/* +/*
@ -8803,7 +8820,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c.multistack-but-
pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
"emblem-default", "emblem-default",
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500
@@ -0,0 +1,186 @@ @@ -0,0 +1,186 @@
+/* +/*
@ -8993,7 +9010,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-convers
+ return was_chosen; + return was_chosen;
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
@ -9090,7 +9107,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-convers
+ +
+#endif /* __GDM_CONVERSATION_H */ +#endif /* __GDM_CONVERSATION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -0500
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
@ -9187,7 +9204,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter
+ g_signal_emit (extension, signals [LOAD_FAILED], 0, error); + g_signal_emit (extension, signals [LOAD_FAILED], 0, error);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -0500
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+/* +/*
@ -9246,7 +9263,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter
+G_END_DECLS +G_END_DECLS
+#endif /* __GDM_GREETER_EXTENSION_H */ +#endif /* __GDM_GREETER_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+prefix=@prefix@ +prefix=@prefix@
@ -9261,7 +9278,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegr
+Libs: -L${libdir} -lgdmsimplegreeter +Libs: -L${libdir} -lgdmsimplegreeter
+Cflags: -I${includedir}/gdm/simple-greeter +Cflags: -I${includedir}/gdm/simple-greeter
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
+/* +/*
@ -9388,7 +9405,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
+ 0); + 0);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+/* +/*
@ -9456,7 +9473,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
+ +
+#endif /* __GDM_TASK_H */ +#endif /* __GDM_TASK_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+NULL = +NULL =
@ -9586,7 +9603,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/Makefile.am.multistack-but-boring gdm-2.2
$(EXTRA_GREETER_LIBS) \ $(EXTRA_GREETER_LIBS) \
$(SIMPLE_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -0500
@@ -0,0 +1,304 @@ @@ -0,0 +1,304 @@
+/* +/*
@ -9894,7 +9911,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerp
+ gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension));
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+/* +/*
@ -9954,7 +9971,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerp
+ +
+#endif /* GDM_FINGERPRINT_EXTENSION_H */ +#endif /* GDM_FINGERPRINT_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+#%PAM-1.0 +#%PAM-1.0
@ -9968,7 +9985,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerp
+session required pam_namespace.so +session required pam_namespace.so
+session include system-auth +session include system-auth
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+NULL = +NULL =
@ -10022,7 +10039,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am
+ *~ \ + *~ \
+ Makefile.in + Makefile.in
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
@ -10082,7 +10099,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui
+ </object> + </object>
+</interface> +</interface>
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*
@ -10126,12 +10143,12 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c
+ return GDM_GREETER_EXTENSION (extension); + return GDM_GREETER_EXTENSION (extension);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+SUBDIRS = password +SUBDIRS = password
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -0500
@@ -0,0 +1,323 @@ @@ -0,0 +1,323 @@
+/* +/*
@ -10458,7 +10475,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-e
+ gdm_password_extension_reset (GDM_CONVERSATION (extension)); + gdm_password_extension_reset (GDM_CONVERSATION (extension));
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+/* +/*
@ -10518,7 +10535,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-e
+ +
+#endif /* GDM_PASSWORD_EXTENSION_H */ +#endif /* GDM_PASSWORD_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#%PAM-1.0 +#%PAM-1.0
@ -10535,7 +10552,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password
+session optional pam_gnome_keyring.so auto_start +session optional pam_gnome_keyring.so auto_start
+session include system-auth +session include system-auth
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+NULL = +NULL =
@ -10583,7 +10600,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am
+ *~ \ + *~ \
+ Makefile.in + Makefile.in
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
@ -10643,7 +10660,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui
+ </object> + </object>
+</interface> +</interface>
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*
@ -10687,7 +10704,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c
+ return GDM_GREETER_EXTENSION (extension); + return GDM_GREETER_EXTENSION (extension);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -0500
@@ -0,0 +1,558 @@ @@ -0,0 +1,558 @@
+/* gdm-smartcard.c - smartcard object +/* gdm-smartcard.c - smartcard object
@ -11249,7 +11266,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ return NULL; + return NULL;
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -0500
@@ -0,0 +1,440 @@ @@ -0,0 +1,440 @@
+/* +/*
@ -11693,7 +11710,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension));
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+/* +/*
@ -11753,7 +11770,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ +
+#endif /* GDM_SMARTCARD_EXTENSION_H */ +#endif /* GDM_SMARTCARD_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -0500
@@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
+/* securitycard.h - api for reading and writing data to a security card +/* securitycard.h - api for reading and writing data to a security card
@ -11851,7 +11868,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+G_END_DECLS +G_END_DECLS
+#endif /* GDM_SMARTCARD_H */ +#endif /* GDM_SMARTCARD_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -0500
@@ -0,0 +1,1394 @@ @@ -0,0 +1,1394 @@
+/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and
@ -13249,7 +13266,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+} +}
+#endif +#endif
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -0500
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and
@ -13339,7 +13356,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+G_END_DECLS +G_END_DECLS
+#endif /* GDM_SMARTCARD_MANAGER_H */ +#endif /* GDM_SMARTCARD_MANAGER_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#%PAM-1.0 +#%PAM-1.0
@ -13354,7 +13371,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+session required pam_namespace.so +session required pam_namespace.so
+session include system-auth +session include system-auth
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -0500
@@ -0,0 +1,167 @@ @@ -0,0 +1,167 @@
+#include "config.h" +#include "config.h"
@ -13525,7 +13542,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ return 0; + return 0;
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+NULL = +NULL =
@ -13600,7 +13617,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am
+ *~ \ + *~ \
+ Makefile.in + Makefile.in
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
@ -13660,7 +13677,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui
+ </object> + </object>
+</interface> +</interface>
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c
--- /dev/null 2009-03-05 04:25:32.556261885 -0500 --- /dev/null 2009-03-05 05:52:53.556012017 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*

6
gdm.spec
View File

@ -15,7 +15,7 @@
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
Name: gdm Name: gdm
Version: 2.25.2 Version: 2.25.2
Release: 11%{?dist} Release: 12%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: User Interface/X Group: User Interface/X
@ -341,6 +341,10 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog %changelog
* Thu Mar 5 2009 Ray Strode <rstrode@redhat.com> - 1:2.25.2-12
- Create settings object early to prevent assertion failures
when one pam conversation completes before another starts.
* Wed Mar 4 2009 Ray Strode <rstrode@redhat.com> - 1:2.25.2-11 * Wed Mar 4 2009 Ray Strode <rstrode@redhat.com> - 1:2.25.2-11
- Bring back language/session/layout selector for autologin - Bring back language/session/layout selector for autologin