From: William Douglas <william.douglas@intel.com>
Date: Wed, 8 May 2013 00:52:30 +0000 (-0700)
Subject: Rework how sudo access is granted.
X-Git-Tag: accepted/tizen/20130520.094340^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80ffe6caf81e6004b6096d81ffc68f5942e5a621;p=platform%2Fupstream%2Fsudo.git

Rework how sudo access is granted.

Instead of per user sudoer config settings being added just let any
user in the wheel group have full sudo access. Remove old tizen_conf
file.

Signed-off-by: William Douglas <william.douglas@intel.com>
---

diff --git a/packaging/sudo.spec b/packaging/sudo.spec
index 9501ea0..8d444dd 100644
--- a/packaging/sudo.spec
+++ b/packaging/sudo.spec
@@ -7,7 +7,6 @@ Group:          System/Base
 Url:            http://www.sudo.ws/
 Source0:        http://sudo.ws/sudo/dist/%{name}-%{version}.tar.gz
 Source1:        sudo.pamd
-Source2:        tizen_conf
 BuildRequires:  groff
 BuildRequires:  pam-devel
 Requires(pre):  coreutils
@@ -57,7 +56,6 @@ make %{?_smp_mflags}
 %make_install
 install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/sudo
-install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudoers.d
 rm -f %{buildroot}%{_bindir}/sudoedit
 ln -sf %{_bindir}/sudo %{buildroot}%{_bindir}/sudoedit
 rm -f %{buildroot}%{_docdir}/%{name}/sample.pam
@@ -78,7 +76,6 @@ chmod 0440 %{_sysconfdir}/sudoers
 %defattr(-,root,root)
 %config(noreplace) %attr(0440,root,root) %{_sysconfdir}/sudoers
 %dir %{_sysconfdir}/sudoers.d
-%{_sysconfdir}/sudoers.d/*
 %config %{_sysconfdir}/pam.d/sudo
 %attr(4755,root,root) %{_bindir}/sudo
 %{_bindir}/sudoedit
diff --git a/packaging/tizen_conf b/packaging/tizen_conf
deleted file mode 100644
index f10e99b..0000000
--- a/packaging/tizen_conf
+++ /dev/null
@@ -1,3 +0,0 @@
-
-## wheel is without a password
-%wheel ALL=(ALL) NOPASSWD: ALL
diff --git a/plugins/sudoers/sudoers.in b/plugins/sudoers/sudoers.in
index 42e639e..1eed849 100644
--- a/plugins/sudoers/sudoers.in
+++ b/plugins/sudoers/sudoers.in
@@ -72,7 +72,7 @@
 root ALL=(ALL) ALL
 
 ## Uncomment to allow members of group wheel to execute any command
-# %wheel ALL=(ALL) ALL
+%wheel ALL=(ALL) ALL
 
 ## Same thing without a password
 # %wheel ALL=(ALL) NOPASSWD: ALL