diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-28 04:33:23 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-28 04:33:23 +0800 |
| commit | fb00351ebfe806a3c5155f56b8b9ae492104bd3a (patch) | |
| tree | eef63b334d6f883f2d042080177ca09a77021467 /x11/gdm/files | |
| parent | d12daa6236579c43a212b032f4a994ff19f1e5fb (diff) | |
| download | marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.tar marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.tar.gz marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.tar.bz2 marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.tar.lz marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.tar.xz marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.tar.zst marcuscom-ports-fb00351ebfe806a3c5155f56b8b9ae492104bd3a.zip | |
Sync with the FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11192 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
| -rw-r--r-- | x11/gdm/files/gdm.in | 9 | ||||
| -rw-r--r-- | x11/gdm/files/gdm.pam.in | 21 |
2 files changed, 29 insertions, 1 deletions
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index f44669946..df726e5af 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports-experimental/x11/gdm/files/gdm.in,v 1.1 2008/02/29 22:20:47 mezz Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.30 2008/03/24 14:15:12 kwm Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus @@ -14,6 +14,7 @@ . %%GNOME_SUBR%% gdm_enable=${gdm_enable-${gnome_enable}} +gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO} export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin @@ -31,6 +32,12 @@ gdm_start() fi echo "Starting ${name}." + # make sure there is no pam configuration for gdm service in base system + if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then + cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled + rm -f /etc/pam.d/gdm + fi + ( iter=0 while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do if [ ${iter} -eq 60 ]; then diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in new file mode 100644 index 000000000..2355004d0 --- /dev/null +++ b/x11/gdm/files/gdm.pam.in @@ -0,0 +1,21 @@ +# +# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $ +# +# PAM configuration for the "gdm" service +# + +# auth +#auth sufficient pam_krb5.so no_warn try_first_pass +#auth sufficient pam_ssh.so no_warn try_first_pass +auth required pam_unix.so no_warn try_first_pass +%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so + +# account +account required pam_nologin.so +#account required pam_krb5.so +account required pam_unix.so + +# session +#session optional pam_ssh.so +session required pam_permit.so +%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start |