summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-06-13 17:14:32 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-06-13 17:14:32 -0700
commit7ebc1618511ae7da7f8e36593c8918d6c469cfb6 (patch)
treeb054b3110e99f5341afbe38865d0e245fc4e1a2f
parent6b0a191db595eedb093be601c15dff9978e49af1 (diff)
parent7d4f6603c5e333917ec70986f32ef0661cce318a (diff)
downloadquagga-7ebc1618511ae7da7f8e36593c8918d6c469cfb6.tar.bz2
quagga-7ebc1618511ae7da7f8e36593c8918d6c469cfb6.tar.xz
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-quagga into hollywood
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/vyatta-quagga.pam3
-rw-r--r--debian/vyatta-quagga.quagga.pam5
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules
index f5f7e932..c5b8cae4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,7 +126,7 @@ binary-arch: build install
dh_installdocs
dh_installexamples
dh_installinit
- dh_installpam
+ dh_installpam --name=quagga
dh_installlogrotate
dh_strip
diff --git a/debian/vyatta-quagga.pam b/debian/vyatta-quagga.pam
deleted file mode 100644
index 093e1729..00000000
--- a/debian/vyatta-quagga.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-# Any user may call vtysh but only those belonging to the group quaggavty can
-# actually connect to the socket and use the program.
-auth sufficient pam_permit.so
diff --git a/debian/vyatta-quagga.quagga.pam b/debian/vyatta-quagga.quagga.pam
new file mode 100644
index 00000000..6dd5d474
--- /dev/null
+++ b/debian/vyatta-quagga.quagga.pam
@@ -0,0 +1,5 @@
+# This allows root to do vtysh without passwords
+auth sufficient pam_rootok.so
+
+# Only users in group quaggavty can run vtysh
+auth required pam_wheel.so trust group=quaggavty