From 403bb750a20b84800fbbd4d18156b11840b65ee4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 2 Nov 2009 17:18:27 -0800
Subject: rename pam-radius to pam_radius.cfg

Use a reasonable suffix for file type
---
 Makefile.am                          |  2 +-
 debian/vyatta-cfg-system.postinst.in |  2 +-
 sysconf/pam-radius                   | 12 ------------
 sysconf/pam_radius.cfg               | 12 ++++++++++++
 4 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 sysconf/pam-radius
 create mode 100644 sysconf/pam_radius.cfg

diff --git a/Makefile.am b/Makefile.am
index 29619127..99142777 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,7 @@ sysconf_DATA += sysconf/securetty
 sysconf_DATA += sysconf/vyatta-sysctl.conf
 sysconf_DATA += sysconf/blacklist.DSA-1024
 sysconf_DATA += sysconf/blacklist.RSA-2048
-sysconf_DATA += sysconf/pam-radius
+sysconf_DATA += sysconf/pam_radius.cfg
 
 libudev_SCRIPTS	 = scripts/vyatta_net_name
 etcudev_DATA	 = sysconf/vyatta-net.rules
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 95fcd1ca..3a914f7f 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -149,7 +149,7 @@ update-rc.d -f ssh remove >/dev/null
 sed -i 's/requisite[ \t][ \t]*pam_securetty.so/required pam_securetty.so/' $rootfsdir/etc/pam.d/login
 
 # Install pamradius config (should come with radius client eventually)
-cp $sysconfdir/pam-radius /usr/share/pam-configs/radius
+cp $sysconfdir/pam_radius.cfg /usr/share/pam-configs/radius
 
 [ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist
 
diff --git a/sysconf/pam-radius b/sysconf/pam-radius
deleted file mode 100644
index 0409dd44..00000000
--- a/sysconf/pam-radius
+++ /dev/null
@@ -1,12 +0,0 @@
-Name: Radius authentication
-Default: no
-Priority: 512
-Auth-Type: Primary
-Auth:
-	[success=end default=ignore]	pam_radius_auth.so try_first_pass
-Auth-Initial:
-	[success=end default=ignore]	pam_radius_auth.so
-Account-Type: Primary
-Account:
-	[success=end new_authtok_reqd=done default=ignore]	pam_radius_auth.so try_first_pass
-	
diff --git a/sysconf/pam_radius.cfg b/sysconf/pam_radius.cfg
new file mode 100644
index 00000000..3b9d92fc
--- /dev/null
+++ b/sysconf/pam_radius.cfg
@@ -0,0 +1,12 @@
+Name: Radius client
+Default: yes
+Priority: 512
+Auth-Type: Primary
+Auth:
+	[success=end default=ignore]	pam_radius_auth.so try_first_pass
+Auth-Initial:
+	[success=end default=ignore]	pam_radius_auth.so
+Account-Type: Primary
+Account:
+	[success=end new_authtok_reqd=done default=ignore]	pam_radius_auth.so try_first_pass
+	
-- 
cgit v1.2.3