Commit 327b59d7 authored by Marc-Antoine Perennou's avatar Marc-Antoine Perennou
parent cec255f6
......@@ -222,18 +222,19 @@ if test x$enable_split_authentication = xyes; then
fi
AC_ARG_WITH(default-pam-config,
AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, none @<:@default=auto@:>@]))
AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, none @<:@default=auto@:>@]))
dnl If not given, try autodetecting from release files (see NetworkManager source)
if test x$with_default_pam_config = x; then
AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat")
AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat")
AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo")
dnl If not autodetected, default to none
if test x$with_default_pam_config = x; then
with_default_pam_config=none
fi
fi
case x$with_default_pam_config in
xredhat|xopenembedded|xnone) ;;
xredhat|xopenembedded|xexherbo|xnone) ;;
*)
AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}])
exit 1
......@@ -241,6 +242,7 @@ case x$with_default_pam_config in
esac
AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredhat)
AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded)
AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo)
AC_ARG_ENABLE(console-helper,
AS_HELP_STRING([--enable-console-helper],
......
......@@ -104,12 +104,23 @@ pam_openembedded_files = pam-openembedded/gdm.pam \
$(NULL)
EXTRA_DIST += $(pam_openembedded_files)
pam_exherbo_files = pam-redhat/gdm-autologin.pam \
pam-exherbo/gdm-launch-environment.pam \
pam-exherbo/gdm-fingerprint.pam \
pam-exherbo/gdm-smartcard.pam \
pam-exherbo/gdm-password.pam \
$(NULL)
EXTRA_DIST += $(pam_exherbo_files)
if ENABLE_REDHAT_PAM_CONFIG
pam_files = $(pam_redhat_files)
endif
if ENABLE_OPENEMBEDDED_PAM_CONFIG
pam_files = $(pam_openembedded_files)
endif
if ENABLE_EXHERBO_PAM_CONFIG
pam_files = $(pam_exherbo_files)
endif
EXTRA_DIST += \
$(schemas_in_files) \
......
# mirrors system-auth / system(-local)-login
# except for the authentication method, which is:
# always permit login
auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth required pam_permit.so
-auth optional pam_gnome_keyring.so
account include system-local-login
password include system-local-login
session include system-local-login
-session optional pam_gnome_keyring.so auto_start
# mirrors system-auth / system(-local)-login
# except for the authentication method, which is:
# fingerprint login
auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth required pam_fprintd.so
-auth optional pam_gnome_keyring.so
account include system-local-login
password include system-local-login
session include system-local-login
-session optional pam_gnome_keyring.so auto_start
# this is for the session that gdm spawns to show the login screen
auth required pam_env.so
auth required pam_nologin.so
auth required pam_permit.so
account include system-local-login
password include system-local-login
session include system-local-login
# mirrors system-auth / system(-local)-login
# except for the authentication method, which is:
# password login
auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth required pam_unix.so try_first_pass likeauth nullok
-auth optional pam_gnome_keyring.so
account include system-local-login
password include system-local-login
session include system-local-login
-session optional pam_gnome_keyring.so auto_start
# mirrors system-auth / system(-local)-login
# except for the authentication method, which is:
# smartcard login
auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only
-auth optional pam_gnome_keyring.so
account include system-local-login
password include system-local-login
session include system-local-login
-session optional pam_gnome_keyring.so auto_start
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment