pam.d: Delete some files that don't belong.

While I'm here, fix some whitespace issues and pam_ssh examples (add
want_agent).

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 2e79c3f..f6b27a5 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -2027,6 +2027,8 @@ TO_REMOVE+=/usr/share/man/man3/tok_wstr.3.gz
 TO_REMOVE+=/usr/share/man/cat3/puffs_fuse_unlink.3.gz
 TO_REMOVE+=/usr/share/man/man3/puffs_fuse_unlink.3.gz
 TO_REMOVE+=/usr/include/netgraph7/ng_tty.h
+TO_REMOVE+=/etc/pam.d/gdm
+TO_REMOVE+=/etc/pam.d/kde
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys

diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index f5707fa..ab81b9b 100644 (file)
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -5,9 +5,7 @@ FILES=  README \
        atrun \
        cron \
        ftpd \
-       gdm \
        imap \
-       kde \
        login \
        other \
        passwd \

diff --git a/etc/pam.d/ftpd b/etc/pam.d/ftpd
index 62cdd0c..a705f3f 100644 (file)
--- a/etc/pam.d/ftpd
+++ b/etc/pam.d/ftpd
@@ -1,6 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/ftpd,v 1.19 2007/06/10 18:57:20 yar Exp $
-# $DragonFly: src/etc/pam.d/ftpd,v 1.1 2005/07/22 18:20:43 joerg Exp $
+# $FreeBSD: src/etc/pam.d/ftpd,v 1.20 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "ftpd" service
 #
@@ -9,12 +8,12 @@
 auth           sufficient      pam_opie.so             no_warn no_fake_prompts
 auth           requisite       pam_opieaccess.so       no_warn allow_local
 #auth          sufficient      pam_krb5.so             no_warn
-#auth           sufficient      pam_ssh.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
 
 # account
 account                required        pam_nologin.so
-#account       required        pam_krb5.so
+#account       required        pam_krb5.so
 account                required        pam_unix.so
 
 # session

diff --git a/etc/pam.d/gdm b/etc/pam.d/gdm
deleted file mode 100644 (file)
index a5311a9..0000000
--- a/etc/pam.d/gdm
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $FreeBSD: src/etc/pam.d/gdm,v 1.8 2007/06/10 18:57:20 yar Exp $
-# $DragonFly: src/etc/pam.d/gdm,v 1.1 2005/07/22 18:20:43 joerg 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
-
-# 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

diff --git a/etc/pam.d/kde b/etc/pam.d/kde
deleted file mode 100644 (file)
index 3002f20..0000000
--- a/etc/pam.d/kde
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# $FreeBSD: src/etc/pam.d/kde,v 1.7 2007/06/10 18:57:20 yar Exp $
-#
-# PAM configuration for the "kde" 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
-
-# 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

diff --git a/etc/pam.d/other b/etc/pam.d/other
index ab7f9af..f26b272 100644 (file)
--- a/etc/pam.d/other
+++ b/etc/pam.d/other
@@ -1,6 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/other,v 1.11 2007/06/10 18:57:20 yar Exp $
-# $DragonFly: src/etc/pam.d/other,v 1.1 2005/07/22 18:20:43 joerg Exp $
+# $FreeBSD: src/etc/pam.d/other,v 1.13 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "other" service
 #
@@ -14,12 +13,12 @@ auth                required        pam_unix.so             no_warn try_first_pass
 
 # account
 account                required        pam_nologin.so
-#account       required        pam_krb5.so
+#account       required        pam_krb5.so
 account                required        pam_login_access.so
 account                required        pam_unix.so
 
 # session
-#session       optional        pam_ssh.so
+#session       optional        pam_ssh.so              want_agent
 session                required        pam_permit.so
 
 # password

diff --git a/etc/pam.d/sshd b/etc/pam.d/sshd
index 98f82fb..02bafe7 100644 (file)
--- a/etc/pam.d/sshd
+++ b/etc/pam.d/sshd
@@ -1,6 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/sshd,v 1.16 2007/06/10 18:57:20 yar Exp $
-# $DragonFly: src/etc/pam.d/sshd,v 1.1 2005/07/22 18:20:43 joerg Exp $
+# $FreeBSD: src/etc/pam.d/sshd,v 1.18 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "sshd" service
 #
@@ -14,12 +13,12 @@ auth                required        pam_unix.so             no_warn try_first_pass
 
 # account
 account                required        pam_nologin.so
-#account       required        pam_krb5.so
+#account       required        pam_krb5.so
 account                required        pam_login_access.so
 account                required        pam_unix.so
 
 # session
-#session       optional        pam_ssh.so
+#session       optional        pam_ssh.so              want_agent
 session                required        pam_permit.so
 
 # password

diff --git a/etc/pam.d/su b/etc/pam.d/su
index 2c2cb73..005f9cc 100644 (file)
--- a/etc/pam.d/su
+++ b/etc/pam.d/su
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/su,v 1.16 2003/07/09 18:40:49 des Exp $
+# $FreeBSD: src/etc/pam.d/su,v 1.17 2011/03/15 10:13:35 des Exp $
 #
 # PAM configuration for the "su" service
 #

diff --git a/etc/pam.d/system b/etc/pam.d/system
index a4ac703..4a41bef 100644 (file)
--- a/etc/pam.d/system
+++ b/etc/pam.d/system
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/system,v 1.1 2003/06/14 12:35:05 des Exp $
+# $FreeBSD: src/etc/pam.d/system,v 1.3 2009/10/05 09:28:54 des Exp $
 #
 # System-wide defaults
 #
@@ -12,12 +12,12 @@ auth                requisite       pam_opieaccess.so       no_warn allow_local
 auth           required        pam_unix.so             no_warn try_first_pass nullok
 
 # account
-#account       required        pam_krb5.so
+#account       required        pam_krb5.so
 account                required        pam_login_access.so
 account                required        pam_unix.so
 
 # session
-#session       optional        pam_ssh.so
+#session       optional        pam_ssh.so              want_agent
 session                required        pam_lastlog.so          no_fail
 
 # password

diff --git a/etc/pam.d/telnetd b/etc/pam.d/telnetd
index 6a77425..a963efb 100644 (file)
--- a/etc/pam.d/telnetd
+++ b/etc/pam.d/telnetd
@@ -1,6 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/telnetd,v 1.8 2007/06/10 18:57:20 yar Exp $
-# $DragonFly: src/etc/pam.d/telnetd,v 1.1 2005/07/22 18:20:43 joerg Exp $
+# $FreeBSD: src/etc/pam.d/telnetd,v 1.10 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "telnetd" service
 #
@@ -14,12 +13,12 @@ auth                required        pam_unix.so             no_warn try_first_pass
 
 # account
 account                required        pam_nologin.so
-#account       required        pam_krb5.so
+#account       required        pam_krb5.so
 account                required        pam_login_access.so
 account                required        pam_unix.so
 
 # session
-#session       optional        pam_ssh.so
+#session       optional        pam_ssh.so              want_agent
 session                required        pam_lastlog.so          no_fail
 
 # password

diff --git a/etc/pam.d/xdm b/etc/pam.d/xdm
index 866de96..75dfa50 100644 (file)
--- a/etc/pam.d/xdm
+++ b/etc/pam.d/xdm
@@ -1,6 +1,5 @@
 #
-# $FreeBSD: src/etc/pam.d/xdm,v 1.11 2007/06/10 18:57:20 yar Exp $
-# $DragonFly: src/etc/pam.d/xdm,v 1.1 2005/07/22 18:20:43 joerg Exp $
+# $FreeBSD: src/etc/pam.d/xdm,v 1.12 2009/10/05 09:28:54 des Exp $
 #
 # PAM configuration for the "xdm" service
 #
@@ -12,11 +11,11 @@ auth                required        pam_unix.so             no_warn try_first_pass
 
 # account
 account                required        pam_nologin.so
-#account       required        pam_krb5.so
+#account       required        pam_krb5.so
 account                required        pam_unix.so
 
 # session
-#session       required        pam_ssh.so              want_agent
+#session       required        pam_ssh.so              want_agent
 # xdm has a software bug in it where session callbacks can occur
 # after the widget has been destroyed, causing a seg-fault.  Commenting
 # out the session line works around the problem.