update patch for updated sample sudoers

diff --git a/debian/patches/paths-in-samples.diff b/debian/patches/paths-in-samples.diff
index 5b95402f3231d05e506bf3823b8cf1ae73caf402..0d47c7c7dfab3160f6283e81edc96ce81f9d6f81 100644 (file)
--- a/debian/patches/paths-in-samples.diff
+++ b/debian/patches/paths-in-samples.diff
@@ -1,17 +1,64 @@
---- /home/bdale/Desktop/sudo-1.7.2p1/doc/sample.sudoers        2008-10-03 13:55:57.000000000 -0600
-+++ sudo/doc/sample.sudoers    2009-11-20 07:31:58.000000000 -0700
-@@ -46,8 +46,8 @@
+diff --git a/debian/patches/paths-in-samples.diff b/debian/patches/paths-in-samples.diff
+index 5b95402..e69de29 100644
+--- a/debian/patches/paths-in-samples.diff
++++ b/debian/patches/paths-in-samples.diff
+@@ -1,38 +0,0 @@
+---- /home/bdale/Desktop/sudo-1.7.2p1/doc/sample.sudoers       2008-10-03 13:55:57.000000000 -0600
+-+++ sudo/doc/sample.sudoers   2009-11-20 07:31:58.000000000 -0700
+-@@ -46,8 +46,8 @@
+- # Cmnd alias specification
+- ##
+- Cmnd_Alias   DUMPS = /usr/sbin/dump, /usr/sbin/rdump, /usr/sbin/restore, \
+--                     /usr/sbin/rrestore, /usr/bin/mt
+--Cmnd_Alias   KILL = /usr/bin/kill
+-+                     /usr/sbin/rrestore, /bin/mt
+-+Cmnd_Alias   KILL = /bin/kill
+- Cmnd_Alias   PRINTING = /usr/sbin/lpc, /usr/bin/lprm
+- Cmnd_Alias   SHUTDOWN = /usr/sbin/shutdown
+- Cmnd_Alias   HALT = /usr/sbin/halt
+-@@ -85,7 +85,7 @@
+-              sudoedit /etc/printcap, /usr/oper/bin/
+- 
+- # joe may su only to operator
+--joe          ALL = /usr/bin/su operator
+-+joe          ALL = /bin/su operator
+- 
+- # pete may change passwords for anyone but root on the hp snakes
+- pete         HPPA = /usr/bin/passwd [A-Za-z]*, !/usr/bin/passwd root
+-@@ -99,13 +99,13 @@
+- 
+- # users in the secretaries netgroup need to help manage the printers
+- # as well as add and remove users
+--+secretaries ALL = PRINTING, /usr/bin/adduser, /usr/bin/rmuser
+-++secretaries ALL = PRINTING, /usr/sbin/adduser, /usr/bin/rmuser
+- 
+- # fred can run commands as oracle or sybase without a password
+- fred         ALL = (DB) NOPASSWD: ALL
+- 
+- # on the alphas, john may su to anyone but root and flags are not allowed
+--john         ALPHA = /usr/bin/su [!-]*, !/usr/bin/su *root*
+-+john         ALPHA = /bin/su [!-]*, !/bin/su *root*
+- 
+- # jen can run anything on all machines except the ones
+- # in the "SERVERS" Host_Alias
+diff --git a/doc/sample.sudoers b/doc/sample.sudoers
+index 9946008..691738a 100644
+--- a/doc/sample.sudoers
++++ b/doc/sample.sudoers
+@@ -44,10 +44,10 @@ Host_Alias CDROM = orion, perseus, hercules
  # Cmnd alias specification
  ##
  Cmnd_Alias    DUMPS = /usr/sbin/dump, /usr/sbin/rdump, /usr/sbin/restore, \
--                      /usr/sbin/rrestore, /usr/bin/mt
+-                      /usr/sbin/rrestore, /usr/bin/mt, \
++                      /usr/sbin/rrestore, /bin/mt, \
+                       sha224:0GomF8mNN3wlDt1HD9XldjJ3SNgpFdbjO1+NsQ== \
+                       /home/operator/bin/start_backups
 -Cmnd_Alias    KILL = /usr/bin/kill
-+                      /usr/sbin/rrestore, /bin/mt
 +Cmnd_Alias    KILL = /bin/kill
  Cmnd_Alias    PRINTING = /usr/sbin/lpc, /usr/bin/lprm
  Cmnd_Alias    SHUTDOWN = /usr/sbin/shutdown
  Cmnd_Alias    HALT = /usr/sbin/halt
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ operator     ALL = DUMPS, KILL, SHUTDOWN, HALT, REBOOT, PRINTING,\
                sudoedit /etc/printcap, /usr/oper/bin/
  
  # joe may su only to operator
@@ -20,7 +67,7 @@
  
  # pete may change passwords for anyone but root on the hp snakes
  pete          HPPA = /usr/bin/passwd [A-Za-z]*, !/usr/bin/passwd root
-@@ -99,13 +99,13 @@
+@@ -99,13 +99,13 @@ jim                +biglab = ALL
  
  # users in the secretaries netgroup need to help manage the printers
  # as well as add and remove users