From 2ebfa91823db74a5aea680e6c561a09b709b84ac Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 17 Jul 2012 17:30:36 -0400 Subject: daemon: Rename GdmWelcomeSession to GdmLaunchEnvironment "GdmWelcomeSession" was always a sort of bad name, as it is not a GdmSession, itself (it has-a GdmSession), and it's unnecessarily generic; it doesn't really have anything to do with "Welcome" or "Session" itself. It managed a non-user GdmSession, spawned the process in the correct environment (spawning a DBus daemon if need be) and made sure to keep track of it until it died. I think "GdmLaunchEnvironment" is an appropriate name for this. https://bugzilla.gnome.org/show_bug.cgi?id=678057 --- data/Makefile.am | 4 ++-- data/pam-openembedded/gdm-launch-environment.pam | 9 +++++++++ data/pam-openembedded/gdm-welcome.pam | 9 --------- data/pam-redhat/gdm-launch-environment.pam | 11 +++++++++++ data/pam-redhat/gdm-welcome.pam | 11 ----------- 5 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 data/pam-openembedded/gdm-launch-environment.pam delete mode 100644 data/pam-openembedded/gdm-welcome.pam create mode 100644 data/pam-redhat/gdm-launch-environment.pam delete mode 100644 data/pam-redhat/gdm-welcome.pam (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index e3f86422..ffbc7684 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -91,7 +91,7 @@ session_DATA = gdm-fallback.session gdm-shell.session pam_redhat_files = pam-redhat/gdm.pam \ pam-redhat/gdm-autologin.pam \ - pam-redhat/gdm-welcome.pam \ + pam-redhat/gdm-launch-environment.pam \ pam-redhat/gdm-fingerprint.pam \ pam-redhat/gdm-smartcard.pam \ pam-redhat/gdm-password.pam \ @@ -100,7 +100,7 @@ EXTRA_DIST += $(pam_redhat_files) pam_openembedded_files = pam-openembedded/gdm.pam \ pam-openembedded/gdm-autologin.pam \ - pam-openembedded/gdm-welcome.pam \ + pam-openembedded/gdm-launch-environment.pam \ $(NULL) EXTRA_DIST += $(pam_openembedded_files) diff --git a/data/pam-openembedded/gdm-launch-environment.pam b/data/pam-openembedded/gdm-launch-environment.pam new file mode 100644 index 00000000..602217b1 --- /dev/null +++ b/data/pam-openembedded/gdm-launch-environment.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include common-account +password include common-auth +session required pam_loginuid.so +session optional pam_keyinit.so force revoke +session include common-session diff --git a/data/pam-openembedded/gdm-welcome.pam b/data/pam-openembedded/gdm-welcome.pam deleted file mode 100644 index 602217b1..00000000 --- a/data/pam-openembedded/gdm-welcome.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -account required pam_nologin.so -account include common-account -password include common-auth -session required pam_loginuid.so -session optional pam_keyinit.so force revoke -session include common-session diff --git a/data/pam-redhat/gdm-launch-environment.pam b/data/pam-redhat/gdm-launch-environment.pam new file mode 100644 index 00000000..17f323e1 --- /dev/null +++ b/data/pam-redhat/gdm-launch-environment.pam @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session required pam_loginuid.so +session optional pam_keyinit.so force revoke +session include system-auth +session include postlogin diff --git a/data/pam-redhat/gdm-welcome.pam b/data/pam-redhat/gdm-welcome.pam deleted file mode 100644 index 17f323e1..00000000 --- a/data/pam-redhat/gdm-welcome.pam +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -auth include postlogin -account required pam_nologin.so -account include system-auth -password include system-auth -session required pam_loginuid.so -session optional pam_keyinit.so force revoke -session include system-auth -session include postlogin -- cgit v1.2.1