Attachment #372644 for bug #504492




#if HAVE_ENV
auth		required	pam_env.so DEBUG
#endif
#if HAVE_PAM_SSH
auth		sufficient	pam_ssh.so
#endif

auth		required	pam_unix.so try_first_pass LIKEAUTH nullok DEBUG
/* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */
auth		optional	pam_permit.so
#if HAVE_ENV
auth		required	pam_env.so DEBUG
#endif
 
#if HAVE_KRB5
account		KRB5_CONTROL	pam_krb5.so KRB5_PARAMS

#if HAVE_PAM_SSH
session		optional	pam_ssh.so
#endif
#include "system-session.inc"

#include "system-session.inc"
-session        optional        pam_systemd.so
#endif

Lines 37-45 session optional pam_loginuid.so Link Here

(-)a/system-login.in (-5 / +8 lines)
37	#if HAVE_SELINUX	37	#if HAVE_SELINUX
38	session required pam_selinux.so close	38	session required pam_selinux.so close
39	#endif	39	#endif
40	#if HAVE_ENV
41	session required pam_env.so DEBUG
42	#endif
43	#if HAVE_LASTLOG	40	#if HAVE_LASTLOG
44	session optional pam_lastlog.so silent DEBUG	41	session optional pam_lastlog.so silent DEBUG
45	#endif	42	#endif
Lines 47-52 session include system-auth Link Here
47	#if HAVE_CONSOLEKIT	44	#if HAVE_CONSOLEKIT
48	session optional pam_ck_connector.so nox11	45	session optional pam_ck_connector.so nox11
49	#endif	46	#endif
		47	#if HAVE_SYSTEMD
		48	-session optional pam_systemd.so
		49	#endif
50	#if HAVE_GNOME_KEYRING	50	#if HAVE_GNOME_KEYRING
51	session optional pam_gnome_keyring.so auto_start	51	session optional pam_gnome_keyring.so auto_start
52	#endif	52	#endif
Lines 57-62 session required pam_selinux.so multiple open Link Here
57	session optional pam_motd.so motd=/etc/motd	57	session optional pam_motd.so motd=/etc/motd
58	#endif	58	#endif
59	#if HAVE_MAIL	59	#if HAVE_MAIL
60	session optional pam_mail.so	60	session optional pam_mail.so quiet
		61	#endif
		62
		63	#if HAVE_ENV
		64	session required pam_env.so DEBUG
61	#endif	65	#endif
62

Lines 6-8 account include system-auth Link Here

(-)a/system-services.in (+3 lines)
6	session optional pam_loginuid.so	6	session optional pam_loginuid.so
7	#endif	7	#endif
8	#include "system-session.inc"	8	#include "system-session.inc"
		9	#if HAVE_ENV
		10	session required pam_env.so DEBUG
		11	#endif

Lines 1-9 Link Here

(-)a/system-session.inc (-4 lines)
1	#if HAVE_LIMITS	1	#if HAVE_LIMITS
2	session required pam_limits.so DEBUG	2	session required pam_limits.so DEBUG
3	#endif	3	#endif
4	#if HAVE_ENV
5	session required pam_env.so DEBUG
6	#endif
7	#if HAVE_MKTEMP	4	#if HAVE_MKTEMP
8	session optional pam_mktemp.so	5	session optional pam_mktemp.so
9	#endif	6	#endif
10	-

Return to bug 504492

Lines 1-6 Link Here

(-)a/system-auth.in (-7 / +4 lines)
1	#if HAVE_ENV
2	auth required pam_env.so DEBUG
3	#endif
4	#if HAVE_PAM_SSH	1	#if HAVE_PAM_SSH
5	auth sufficient pam_ssh.so	2	auth sufficient pam_ssh.so
6	#endif	3	#endif
Lines 10-15 auth KRB5_CONTROL pam_krb5.so KRB5_PARAMS Link Here
10	auth required pam_unix.so try_first_pass LIKEAUTH nullok DEBUG	7	auth required pam_unix.so try_first_pass LIKEAUTH nullok DEBUG
11	/* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */	8	/* This is needed to make sure that the Kerberos skip-on-success won't cause a bad jump. */
12	auth optional pam_permit.so	9	auth optional pam_permit.so
		10	#if HAVE_ENV
		11	auth required pam_env.so DEBUG
		12	#endif
13		13
14	#if HAVE_KRB5	14	#if HAVE_KRB5
15	account KRB5_CONTROL pam_krb5.so KRB5_PARAMS	15	account KRB5_CONTROL pam_krb5.so KRB5_PARAMS
Lines 34-41 password optional pam_permit.so Link Here
34	#if HAVE_PAM_SSH	34	#if HAVE_PAM_SSH
35	session optional pam_ssh.so	35	session optional pam_ssh.so
36	#endif	36	#endif
37	#include "system-session.inc"
38		37
39	#if HAVE_SYSTEMD	38	#include "system-session.inc"
40	-session optional pam_systemd.so
41	#endif