From: Bdale Garbee <bdale@gag.com>
Date: Thu, 11 Mar 2010 19:05:45 +0000 (-0700)
Subject: fixing small text bugs
X-Git-Tag: debian/1.7.2p5-1~6
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ac5122df28fff79615a1eff90aea0a4a0b9720f4;p=debian%2Fsudo

fixing small text bugs
---

diff --git a/debian/changelog b/debian/changelog
index 542307b..1a77453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
-sudo (1.7.2p2-1) UNRELEASED; urgency=low
+sudo (1.7.2p5-1) UNRELEASED; urgency=low
 
-  * new upstream release, closes a bug filed upstream regarding missing
-    man page processing scripts in the 1.7.2p1 tarball
+  * new upstream release, closes a bug filed upstream regarding missing man 
+    page processing scripts in the 1.7.2p1 tarball, also includes the fix
+    for CVE-2010-0426 previously the subject of a security team nmu
   * move to source format 3.0 (quilt) and restructure changes as patches
   * fix unprocessed substitution variables in man pages, closes: #557204
   * apply patch from Neil Moore to fix Debian-specific content in the
     visudo man page, closes: #555013
   * update descriptions to better explain sudo-ldap, closes: #573108
+  * eliminate spurious 'and' in man page, closes: #571620
 
- -- Bdale Garbee <bdale@gag.com>  Mon, 07 Dec 2009 16:58:36 +0100
+ -- Bdale Garbee <bdale@gag.com>  Thu, 11 Mar 2010 11:54:23 -0700
 
 sudo (1.7.2p1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 90f5800..2fda443 100644
--- a/debian/control
+++ b/debian/control
@@ -29,5 +29,6 @@ Description: Provide limited super user privileges to specific users
  privileges to users and log root activity.  The basic philosophy is to give
  as few privileges as possible but still allow people to get their work done.
  .
- This version is built with LDAP support, which allows the sudoers database
- to be distributed via LDAP.  Authentication is still performed via pam.
+ This version is built with LDAP support, which allows an equivalent of the
+ sudoers database to be distributed via LDAP.  Authentication is still 
+ performed via pam.
diff --git a/sudoers.man.in b/sudoers.man.in
index b56b1c4..9d4f010 100644
--- a/sudoers.man.in
+++ b/sudoers.man.in
@@ -856,7 +856,7 @@ This flag is \fIoff\fR by default.
 If set, root is allowed to run \fBsudo\fR too.  Disabling this prevents users
 from \*(L"chaining\*(R" \fBsudo\fR commands to get a root shell by doing something
 like \f(CW"sudo sudo /bin/sh"\fR.  Note, however, that turning off \fIroot_sudo\fR
-will also prevent root and from running \fBsudoedit\fR.
+will also prevent root from running \fBsudoedit\fR.
 Disabling \fIroot_sudo\fR provides no real additional security; it
 exists purely for historical reasons.
 This flag is \fI@root_sudo@\fR by default.