Split up the Verification step in the GdmSession interface into component

2007-11-07  William Jon McCann  <mccann@jhu.edu>

	* daemon/gdm-factory-slave.c: (greeter_reset_timeout),
	(queue_greeter_reset), (on_session_setup_complete),
	(on_session_setup_failed), (on_session_reset_complete),
	(on_session_reset_failed), (on_session_authenticated),
	(on_session_authentication_failed), (on_session_authorized),
	(on_session_authorization_failed), (on_session_accredited),
	(on_session_accreditation_failed), (on_greeter_begin_verification),
	(on_greeter_begin_verification_for_user),
	(gdm_factory_slave_start):
	* daemon/gdm-product-slave.c: (on_session_setup_complete),
	(on_session_setup_failed), (on_session_reset_complete),
	(on_session_reset_failed), (on_session_authenticated),
	(on_session_authentication_failed), (on_session_authorized),
	(on_session_authorization_failed), (on_session_accredited),
	(on_session_accreditation_failed), (on_relay_setup),
	(on_relay_setup_for_user), (on_relay_authenticate),
	(on_relay_authorize), (on_relay_establish_credentials),
	(on_relay_renew_credentials), (create_new_session),
	(relay_dbus_handle_message):
	* daemon/gdm-session-direct.c: (send_dbus_void_signal),
	(on_authentication_failed), (on_session_start_failed),
	(gdm_session_direct_handle_setup_complete),
	(gdm_session_direct_handle_setup_failed),
	(gdm_session_direct_handle_reset_complete),
	(gdm_session_direct_handle_reset_failed),
	(gdm_session_direct_handle_authenticated),
	(gdm_session_direct_handle_authentication_failed),
	(gdm_session_direct_handle_authorized),
	(gdm_session_direct_handle_authorization_failed),
	(gdm_session_direct_handle_accredited),
	(gdm_session_direct_handle_accreditation_failed),
	(gdm_session_direct_handle_start_failed), (session_worker_message),
	(do_introspect), (gdm_session_direct_init), (worker_exited),
	(worker_died), (gdm_session_direct_open), (send_setup),
	(send_setup_for_user), (gdm_session_direct_setup),
	(gdm_session_direct_setup_for_user),
	(gdm_session_direct_authenticate), (gdm_session_direct_authorize),
	(gdm_session_direct_accredit), (gdm_session_direct_close),
	(gdm_session_iface_init):
	* daemon/gdm-session-direct.h:
	* daemon/gdm-session-private.h:
	* daemon/gdm-session-relay.c: (send_dbus_string_signal),
	(send_dbus_void_signal), (gdm_session_relay_setup),
	(gdm_session_relay_setup_for_user),
	(gdm_session_relay_authenticate), (gdm_session_relay_authorize),
	(gdm_session_relay_accredit), (gdm_session_relay_answer_query),
	(handle_setup_complete), (handle_setup_failed),
	(handle_authenticated), (handle_authentication_failed),
	(handle_authorized), (handle_authorization_failed),
	(handle_accredited), (handle_accreditation_failed),
	(handle_session_started), (handle_session_stopped),
	(handle_opened), (session_handle_child_message), (do_introspect),
	(gdm_session_iface_init):
	* daemon/gdm-session-worker.c: (gdm_session_execute),
	(gdm_session_worker_update_username),
	(gdm_session_worker_initialize_pam),
	(gdm_session_worker_accredit_user), (session_worker_child_watch),
	(gdm_session_worker_start_user_session), (do_setup),
	(do_authenticate), (do_authorize), (do_accredit),
	(do_open_session), (do_start_session), (state_change_idle),
	(on_setup), (on_setup_for_user), (on_authenticate), (on_authorize),
	(on_establish_credentials), (on_renew_credentials),
	(worker_dbus_handle_message):
	* daemon/gdm-session.c: (gdm_session_setup),
	(gdm_session_setup_for_user), (gdm_session_authenticate),
	(gdm_session_authorize), (gdm_session_accredit),
	(gdm_session_class_init), (_gdm_session_setup_complete),
	(_gdm_session_setup_failed), (_gdm_session_reset_complete),
	(_gdm_session_reset_failed), (_gdm_session_authenticated),
	(_gdm_session_authentication_failed), (_gdm_session_authorized),
	(_gdm_session_authorization_failed), (_gdm_session_accredited),
	(_gdm_session_accreditation_failed),
	(_gdm_session_session_start_failed):
	* daemon/gdm-session.h:
	* daemon/gdm-simple-slave.c: (greeter_reset_timeout),
	(queue_greeter_reset), (on_session_setup_complete),
	(on_session_setup_failed), (on_session_reset_complete),
	(on_session_reset_failed), (on_session_authenticated),
	(on_session_authentication_failed), (on_session_authorized),
	(on_session_authorization_failed), (on_session_accredited),
	(on_session_accreditation_failed), (create_new_session),
	(on_greeter_begin_verification),
	(on_greeter_begin_verification_for_user):
	* daemon/test-session.c: (on_open), (on_session_setup_complete),
	(on_session_setup_failed), (on_session_reset_complete),
	(on_session_reset_failed), (on_session_authenticated),
	(on_session_authentication_failed), (on_session_authorized),
	(on_session_authorization_failed), (on_session_accredited),
	(on_session_accreditation_failed), (on_session_started),
	(on_session_exited), (on_session_died), (main):
	Split up the Verification step in the GdmSession interface into
	component parts: setup, authenticate, authorize, accredit.


svn path=/trunk/; revision=5496

1 files changed, 41 insertions, 12 deletions

diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h
index 5a14f54b..50cf28bb 100644
--- a/daemon/gdm-session.h
+++ b/daemon/gdm-session.h
@@ -35,14 +35,25 @@ G_BEGIN_DECLS
 typedef struct _GdmSession      GdmSession; /* Dummy typedef */
 typedef struct _GdmSessionIface GdmSessionIface;
 
+enum {
+        GDM_SESSION_CRED_ESTABLISH = 0,
+        GDM_SESSION_CRED_RENEW,
+};
+
 struct _GdmSessionIface
 {
         GTypeInterface base_iface;
 
         /* Methods */
-        void (* begin_verification)          (GdmSession   *session);
-        void (* begin_verification_for_user) (GdmSession   *session,
+        void (* open)                        (GdmSession   *session);
+        void (* setup)                       (GdmSession   *session);
+        void (* setup_for_user)              (GdmSession   *session,
                                               const char   *username);
+        void (* reset)                       (GdmSession   *session);
+        void (* authenticate)                (GdmSession   *session);
+        void (* authorize)                   (GdmSession   *session);
+        void (* accredit)                    (GdmSession   *session,
+                                              int           cred_flag);
         void (* answer_query)                (GdmSession   *session,
                                               const char   *text);
         void (* select_language)             (GdmSession   *session,
@@ -51,15 +62,27 @@ struct _GdmSessionIface
                                               const char   *text);
         void (* select_user)                 (GdmSession   *session,
                                               const char   *text);
-        void (* open)                        (GdmSession   *session);
+        void (* start_session)               (GdmSession   *session);
         void (* close)                       (GdmSession   *session);
         void (* cancel)                      (GdmSession   *session);
-        void (* start_session)               (GdmSession   *session);
 
         /* Signals */
-        void (* user_verified)               (GdmSession   *session);
-        void (* user_verification_error)     (GdmSession   *session,
+        void (* setup_complete)              (GdmSession   *session);
+        void (* setup_failed)                (GdmSession   *session,
+                                              const char   *message);
+        void (* reset_complete)              (GdmSession   *session);
+        void (* reset_failed)                (GdmSession   *session,
+                                              const char   *message);
+        void (* authenticated)               (GdmSession   *session);
+        void (* authentication_failed)       (GdmSession   *session,
+                                              const char   *message);
+        void (* authorized)                  (GdmSession   *session);
+        void (* authorization_failed)        (GdmSession   *session,
                                               const char   *message);
+        void (* accredited)                  (GdmSession   *session);
+        void (* accreditation_failed)        (GdmSession   *session,
+                                              const char   *message);
+
         void (* info_query)                  (GdmSession   *session,
                                               const char   *query_text);
         void (* secret_info_query)           (GdmSession   *session,
@@ -69,7 +92,7 @@ struct _GdmSessionIface
         void (* problem)                     (GdmSession   *session,
                                               const char   *problem);
         void (* session_started)             (GdmSession   *session);
-        void (* session_startup_error)       (GdmSession   *session,
+        void (* session_start_failed)        (GdmSession   *session,
                                               const char   *message);
         void (* session_exited)              (GdmSession   *session,
                                               int           exit_code);
@@ -84,9 +107,18 @@ struct _GdmSessionIface
 
 GType    gdm_session_get_type                    (void) G_GNUC_CONST;
 
-void     gdm_session_begin_verification          (GdmSession *session);
-void     gdm_session_begin_verification_for_user (GdmSession *session,
+void     gdm_session_open                        (GdmSession *session);
+void     gdm_session_setup                       (GdmSession *session);
+void     gdm_session_setup_for_user              (GdmSession *session,
                                                   const char *username);
+void     gdm_session_reset                       (GdmSession *session);
+void     gdm_session_authenticate                (GdmSession *session);
+void     gdm_session_authorize                   (GdmSession *session);
+void     gdm_session_accredit                    (GdmSession *session,
+                                                  int         cred_flag);
+void     gdm_session_start_session               (GdmSession *session);
+void     gdm_session_close                       (GdmSession *session);
+
 void     gdm_session_answer_query                (GdmSession *session,
                                                   const char *text);
 void     gdm_session_select_session              (GdmSession *session,
@@ -95,10 +127,7 @@ void     gdm_session_select_language             (GdmSession *session,
                                                   const char *language);
 void     gdm_session_select_user                 (GdmSession *session,
                                                   const char *username);
-void     gdm_session_open                        (GdmSession *session);
-void     gdm_session_close                       (GdmSession *session);
 void     gdm_session_cancel                      (GdmSession *session);
-void     gdm_session_start_session               (GdmSession *session);
 
 G_END_DECLS