Sync with 1.6.6

diff --git a/CHANGES b/CHANGES
index e5167dea944f888a653c9d16a387a51e0255d46f..ee37c482402dd35b3bd643bbfe018f56b28ca658 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1519,3 +1519,13 @@ Sudo 1.6.5p1 released.
      BSD authentication, FWTK or PAM was in use.
 
 Sudo 1.6.5p2 released.
+
+474) Fixed compilation problem on HP-UX 9.x.
+
+475) Moved call to endpwent() and added a call to endgrent().
+
+476) Fixed a warning conflicting declaration of VOID with AFS.
+
+477) Fixed a security hole in prompt rewriting found by Global InterSec.
+
+Sudo 1.6.6 released.

diff --git a/RUNSON b/RUNSON
index 4cb64c22e7e1ff651fbc8d0767417811be1f7919..d0de74918fb3d2c21fb35a3f21353bdb5919ec02 100644 (file)
--- a/RUNSON
+++ b/RUNSON
@@ -6,10 +6,10 @@ the current version of sudo does not mean it won't work...
 Name   Rev     Arch    Used            Version By               Options
 =======        ======= ======= =============== ======= ===============  ===============
 Auspex 1.6.1   sun4    bundled cc      1.3.4   Alek Komarnitsky none
-SunOS  4.1.3   sun4    bundled cc      1.6.5p1 Todd Miller      none
-SunOS  4.1.3   sun4    gcc2.9.5.2      1.6.5p1 Todd Miller      none
+SunOS  4.1.3   sun4    bundled cc      1.6.6   Todd Miller      none
+SunOS  4.1.3   sun4    gcc2.9.5.2      1.6.6   Todd Miller      none
 SunOS  4.1.3   sun4    gcc2.7.2.1      1.5.3   Todd Miller      --with-kerb4
-SunOS  4.1.3   sun4    gcc2.9.5.2      1.6.5p1 Todd Miller      --with-skey
+SunOS  4.1.3   sun4    gcc2.9.5.2      1.6.6   Todd Miller      --with-skey
 Solaris        2.5.1   sparc   SC4.0           1.5.6p1 Brian Jackson    none 
 Solaris        2.5.1   sun4u   gcc2.7.2.3      1.5.4   Leon von Stauber none
 Solaris        2.5.1   i386    gcc2.7.2        1.5.4   Leon von Stauber none
@@ -22,12 +22,12 @@ Solaris     2.6     i386    unbundled cc    1.5.8p2 Udo Keller       none
 Solaris        7       i386    gcc 2.8.1       1.6.1   Ido Dubrawsky    none
 Solaris        7       i386    Workshop 5.0    1.6     Brian Jackson    none
 Solaris        7       sun4u   egcs 1.1.2      1.5.9p4 Scott Kinnane    none
-Solaris        7       sparc   SC4.2           1.6.5p1 Todd Miller      none
+Solaris        7       sparc   SC4.2           1.6.6   Todd Miller      none
 Solaris        7       sun4u   Workshop 6.2    1.6.3p7 Donna Dickerson  none
-Solaris        7       sparc   2.95.2          1.6.5p1 Todd Miller      --with-skey
+Solaris        7       sparc   2.95.2          1.6.6   Todd Miller      --with-skey
 Solaris        2.6     sun4u   egcs 1.1.2      1.5.9p4 Scott Kinnane    none
-Solaris        8       sparc   2.95.2          1.6.5p1 Todd Miller      --with-skey
-Solaris        8       sparc   SC4.2           1.6.5p1 Todd Miller      none
+Solaris        8       sparc   2.95.2          1.6.6   Todd Miller      --with-skey
+Solaris        8       sparc   SC4.2           1.6.6   Todd Miller      none
 Solaris        8       sun4u   Workshop 6.2    1.6.3p7 Donna Dickerson  none
 ISC    4.0     i386    bundled cc      1.4     Andy Smith       none
 ISC    4.0     i386    gcc2.7.0        1.4     Andy Smith       none
@@ -40,13 +40,14 @@ HP-UX       9.05    hp700   gcc2.7.2.1      1.5.3   Todd Miller      none
 HP-UX  9.05    hp700   gcc2.7.2.1      1.5.3   Todd Miller      --with-kerb4
 HP-UX  9.07    hp700   unbundled cc    1.5     Alek Komarnitsky --with-C2
 HP-UX  9.05    hp700   unbundled cc    1.4     Todd Miller      none
-HP-UX  10.10   hp700   unbundled cc    1.6.5p1 Todd Miller      --with-skey
-HP-UX  10.20   hp700   gcc2.9.5.2      1.6.5p1 Todd Miller      --with-skey
-HP-UX  10.20   hp700   bundled cc      1.6.5p1 Todd Miller      none
+HP-UX  10.10   hp700   unbundled cc    1.6.6   Todd Miller      --with-skey
+HP-UX  10.20   hp700   gcc2.9.5.2      1.6.6   Todd Miller      --with-skey
+HP-UX  10.20   hp700   bundled cc      1.6.6   Todd Miller      none
+HP-UX  10.20   hp700   gcc 2.95.2      1.6.2   Jeff Earickson   --with-DCE
 HP-UX  11.00   hp700   ansi-c          1.5.5b1 Alek Komarnitsky --with-C2
 HP-UX  11.00   hp700   bundled cc      1.5.5p5 Lynn Osburn      none
 HP-UX  11.00   hp700   HP C compiler   1.6.2   Jeff Earickson   --with-pam
-HP-UX  10.20   hp700   gcc 2.95.2      1.6.2   Jeff Earickson   --with-DCE
+HP-UX  11.11   hp800   HP C compiler   1.6.5p2 Bill Marmagas    --with-pam
 Ultrix 4.3     mips    bundled cc      1.6.3b2 Todd Miller      none
 Ultrix 4.3     mips    gcc2.7.2.1      1.5.9   Todd Miller      --with-skey
 IRIX   4.05H   mips    gcc2.6.3        1.5.3   Todd Miller      none
@@ -55,8 +56,8 @@ IRIX  5.2     mips    MipsPro C       1.5.6p1 Brian Jackson    none
 IRIX   5.3     mips    MipsPro C       1.5.6p1 Brian Jackson    none 
 IRIX   6.2     mips    MipsPro C       1.5.6p1 Brian Jackson    none 
 IRIX   6.5     mips    MipsPro C       1.5.6p1 Brian Jackson    none 
-IRIX   5.3     mips    unbundled cc    1.6.5p1 Todd Miller      none
-IRIX   5.3     mips    gcc2.9.5.2      1.6.5p1 Todd Miller      --with-skey
+IRIX   5.3     mips    unbundled cc    1.6.6   Todd Miller      none
+IRIX   5.3     mips    gcc2.9.5.2      1.6.6   Todd Miller      --with-skey
 IRIX   5.3     mips    gcc2.7.2.1      1.5.3   Todd Miller      --with-kerb4
 IRIX   5.3     mips    unbundled cc    1.4     Wallace Winfrey  --with-C2
 IRIX   6.2     mips    unbundled cc    1.5     Alek Komarnitsky --with-C2
@@ -68,17 +69,19 @@ IRIX        6.5     mips    unbundled cc    1.5.4   Brian Jackson    --with-C2
 IRIX   6.5     mips    MipsPro 7.2.1   1.6     Brian Jackson    none
 IRIX   6.5     mips    gcc 2.8.1       1.6rc1  Jordan Baker     none
 IRIX   6.5     mips    egcs 1.1.2      1.5.9p4 Scott Kinnane    none
+IRIX   6.5     mips    MipsPRO 7.3.1   1.6.5p2 David Kaelbling  --with-pam
+IRIX   6.5     mips    MipsPRO 7.3.1   1.6.5p2 David Kaelbling  --with-C2
 NEXTSTEP 2.1   m68k    bundled cc      1.3.7   Todd Miller      none
 NEXTSTEP 3.2   m68k    bundled cc      1.5.5b4 Todd Miller      --with-skey
 NEXTSTEP 3.2   i386    bundled cc      1.3.2   Jonathan Adams   none
 NEXTSTEP 3.3   i386    bundled cc      1.4     Jonathan Adams   none
 NEXTSTEP 3.3   sparc   bundled cc      1.5.3   Mike Kienenberger none
 DEC UNIX 3.2c  alpha   bundled cc      1.5.3   Todd Miller      none
-DEC UNIX 4.0D  alpha   bundled cc      1.6.5p1 Todd Miller      --with-skey
+DEC UNIX 4.0D  alpha   bundled cc      1.6.6   Todd Miller      --with-skey
 DEC UNIX 4.0   alpha   gcc-2.7.2.1     1.5.3   Todd Miller      --with-kerb4
 DEC UNIX 4.0D  alpha   bundled cc      1.5.3   Randall R. Cable --with-C2
 DEC UNIX 4.0E  alpha   bundled cc      1.5.9p2 Vangelis Haniotakis none
-Tru64  5.1     alpha   bundled cc      1.6.5p1 Todd Miller      none
+Tru64  5.1     alpha   bundled cc      1.6.6   Todd Miller      none
 AIX    3.2.X   rs6000  bundled cc      1.4     Todd Miller      none
 AIX    4.1.3   PowerPC gcc-2.7.0       1.4     Bob Shair        none
 AIX    4.1.4   rs6000  gcc-2.8.1       1.6.2p2 Todd Miller      none
@@ -93,8 +96,8 @@ AIX   4.3.2   rs6000  egcs 1.1.2      1.5.9p4 Scott Kinnane    none
 ConvexOS 9.1   convex  bundled cc      1.3.6   Todd Miller      none
 ConvexOS 9.1   convex  gcc2.4.5        1.3.6   Todd Miller      none
 BSD/OS 4.1     i386    cc              1.6.3   Todd Miller      --with-skey
-OpenBSD        2.X     all     gcc-2.95.2      1.6.5p1 Todd Miller      none
-OpenBSD        3.0     all     gcc-2.95.3      1.6.5p1 Todd Miller      none
+OpenBSD        2.X     all     gcc-2.95.2      1.6.6   Todd Miller      none
+OpenBSD        3.0     all     gcc-2.95.3      1.6.6   Todd Miller      none
 FreeBSD        1.1     i386    gcc             1.3.2   Dworkin Muller   none
 FreeBSD        2.0.5   i386    gcc             1.3.4   Dworkin Muller   none
 FreeBSD        3.2     i386    gcc 2.7.2.1     1.6     Brian Jackson    none
@@ -105,11 +108,12 @@ Linux     2.0.34  i586    egcs-2.91.57    1.5.6p2 Darrin Chandler  none
 Linux  2.0.36  i586    gcc-2.7.2.3     1.5.7p4 Nathan Haney     none
 Linux  2.0.33pl1 m68k  gcc 2.7.2.3     1.5.6   James Troup      none
 Linux  2.2.12  i586    gcc-2.95.2      1.6.3   Todd Miller      --with-pam
-Linux  2.4.9   i686    gcc-2.96        1.6.5p1 Todd Miller      --with-pam
+Linux  2.4.9   i686    gcc-2.96        1.6.6   Todd Miller      --with-pam
 Linux  2.2.13  alpha   egcs-2.91.66    1.6.3   Todd Miller      --with-pam
 Linux  2.2.6-15 ppc    egcs-1.1.2      1.5.9p4 Barbara Schelkle none
 Linux  2.0.34  mips    gcc-2.7.2       1.6     Tristan Roddis   none
 UnixWare 1.1.4 i386    gcc-2.7.2       1.4     Michael Hancock  none
+UnixWare 7.1.1 i686    cc              1.6.5p1 Mike Petkau      none
 Pyramid DC/OSx 1.1     bundled cc      1.4     Les Schuettpelz  none
 ATT    SVR4.x  i486    Metaware CC     1.4     Chris Ellington  none
 SINIX  5.42    R4000   bundled cc      1.4     Paul Tuininga    none

diff --git a/TODO b/TODO
index a6f32ce3123b049fe4b7c70b55231fa71061ad7c..8bfda23ce7e7e0f0488536c0cdef6e8b9a403391 100644 (file)
--- a/TODO
+++ b/TODO
@@ -83,7 +83,9 @@ TODO list (most will be addressed in sudo 2.0)
     to go with it.  (See MINUS_I.patch)
 
 32) Some people want to be able to specify a special password in sudoers
-    in addition or instead of the normal one.
+    in addition or instead of the normal one.  The best argument for
+    this so far is to be able to use separate passwords for the
+    target users that are not the passwd file ones.
 
 33) Add support for trusted users.  E.g. allow user to run a certain
     command regardless of what dir it is in if it is owned by the