summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUGS4
-rw-r--r--CHANGES14
-rw-r--r--Makefile.binary2
-rw-r--r--Makefile.in2
-rw-r--r--README2
-rw-r--r--RUNSON18
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--sudo.cat12
-rw-r--r--sudo.man6
-rw-r--r--sudoers.cat26
-rw-r--r--sudoers.man12
-rw-r--r--tgetpass.c41
-rw-r--r--version.h2
-rw-r--r--visudo.cat6
-rw-r--r--visudo.man6
16 files changed, 86 insertions, 71 deletions
diff --git a/BUGS b/BUGS
index a7c381f4f..767c285fe 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
-Known bugs in sudo version 1.6
-==============================
+Known bugs in sudo version 1.6.1
+================================
1) "make install-man" should substitute correct paths into the
man pages themselves.
diff --git a/CHANGES b/CHANGES
index 84455bd66..7493c453d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1184,3 +1184,17 @@ Sudo 1.5.9 released.
to be character at a time.
372) sudo now turns off core dumps via setrlimit (probably paranoia).
+
+Sudo 1.6 released.
+
+373) Better diagnostics on PAM failure.
+
+374) Killed shell_noargs option, it cannot work since the command needs to
+ be set before sudoers is parsed.
+
+375) Fixed the following Defaults options: set_home, fqdn, syslog
+
+376) When using select() in tgetpass(), do a separate select before
+ each read to be sure we can timeout correctly.
+
+377) Hopefully fix SecurID support.
diff --git a/Makefile.binary b/Makefile.binary
index 4740321a2..045707b4b 100644
--- a/Makefile.binary
+++ b/Makefile.binary
@@ -78,7 +78,7 @@ SHELL = /bin/sh
PROGS = sudo visudo
-VERSION = 1.6
+VERSION = 1.6.1
all: $(PROGS)
@echo run 'make install' to install sudo
diff --git a/Makefile.in b/Makefile.in
index 5bac3f5d3..11e9a1d95 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,7 +138,7 @@ TESTOBJS = interfaces.o testsudoers.o $(PARSEOBJS)
LIBOBJS = @LIBOBJS@ @ALLOCA@
-VERSION = 1.6
+VERSION = 1.6.1
DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES FAQ HISTORY INSTALL INSTALL.configure \
LICENSE Makefile.in PORTING README RUNSON TODO TROUBLESHOOTING \
diff --git a/README b/README
index 3f878db23..43145d2b1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Sudo version 1.6
+This is Sudo version 1.6.1
The sudo philosophy
===================
diff --git a/RUNSON b/RUNSON
index 7d235bf92..a6dc5d143 100644
--- a/RUNSON
+++ b/RUNSON
@@ -7,14 +7,14 @@ 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.4 Todd Miller none
-SunOS 4.1.3 sun4 gcc2.7.2.1 1.6 Todd Miller none
+SunOS 4.1.3 sun4 gcc2.7.2.1 1.6.1 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.7.2.1 1.6 Todd Miller --with-skey
+SunOS 4.1.3 sun4 gcc2.7.2.1 1.6.1 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
-Solaris 2.6 sparc gcc2.7.2.1 1.6 Todd Miller none
-Solaris 2.6 i386 gcc2.7.2.1 1.6 Todd Miller none
+Solaris 2.6 sparc gcc2.7.2.1 1.6.1 Todd Miller none
+Solaris 2.6 i386 gcc2.7.2.1 1.6.1 Todd Miller none
Solaris 2.6 sparc unbundled cc 1.5.7 Giff Hammar none
Solaris 2.6 i386 unbundled cc 1.5.8p2 Udo Keller none
Solaris 7 i386 gcc 2.8.1 1.6 Brian Jackson none
@@ -31,7 +31,7 @@ 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.20 hp700 gcc2.7.2.1 1.6 Todd Miller --with-skey
+HP-UX 10.20 hp700 gcc2.7.2.1 1.6.1 Todd Miller --with-skey
HP-UX 10.10 hp700 unbundled cc 1.5.5b4 Todd Miller --with-skey
HP-UX 10.20 PA-RISC1.1 bundled cc 1.5.4 Leon von Stauber none
HP-UX 10.20 PA-RISC2.0 bundled cc 1.5.4 Leon von Stauber none
@@ -47,7 +47,7 @@ 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.4 Todd Miller none
-IRIX 5.3 mips gcc2.7.2.1 1.6 Todd Miller --with-skey
+IRIX 5.3 mips gcc2.7.2.1 1.6.1 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
@@ -65,7 +65,7 @@ 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 gcc-2.7.2.1 1.6 Todd Miller --with-skey
+DEC UNIX 4.0D alpha gcc-2.7.2.1 1.6.1 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
@@ -81,7 +81,7 @@ 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 2.1 i386 shlicc 1.5.3 Todd Miller none
-OpenBSD 2.X i586 gcc-2.8.1 1.6 Todd Miller none
+OpenBSD 2.X i586 gcc-2.8.1 1.6.1 Todd Miller none
OpenBSD 2.X alpha gcc-2.8.1 1.5.9 Todd Miller none
OpenBSD 2.X m68k gcc-2.8.1 1.5.9 Todd Miller none
FreeBSD 1.1 i386 gcc 1.3.2 Dworkin Muller none
@@ -90,7 +90,7 @@ FreeBSD 3.2 i386 gcc 2.7.2.1 1.6 Brian Jackson none
Linux 1.2.13 i486 gcc-2.7.0 1.4 Michael Forman none
Linux 1.2.8 i486 gcc-2.5.8 1.3.5 Ted Coady --with-C2
Linux 2.0.15 i586 gcc-2.7.2.1 1.5 Danny Barron none
-Linux 2.0.36 i586 gcc 2.8.1 1.6 Todd Miller none
+Linux 2.0.36 i586 gcc 2.8.1 1.6.1 Todd Miller none
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.34 alpha egcs-2.90.27 1.5.3 Karl Schlitt none
diff --git a/configure b/configure
index a46383dbf..798728a78 100755
--- a/configure
+++ b/configure
@@ -657,7 +657,7 @@ fi
-echo "Configuring Sudo version 1.6"
+echo "Configuring Sudo version 1.6.1"
PROGS="sudo visudo"
CPPFLAGS=""
LDFLAGS=""
diff --git a/configure.in b/configure.in
index 8b01e3946..6cdd1d3dd 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AC_CONFIG_HEADER(config.h pathnames.h)
dnl
dnl This won't work before AC_INIT()
dnl
-echo "Configuring Sudo version 1.6"
+echo "Configuring Sudo version 1.6.1"
dnl
dnl Variables that get substituted in the Makefile
dnl
diff --git a/sudo.cat b/sudo.cat
index e23615a04..746808c23 100644
--- a/sudo.cat
+++ b/sudo.cat
@@ -61,7 +61,7 @@ OOOOPPPPTTTTIIIIOOOONNNNSSSS
-28/Nov/1999 1.6 1
+4/Dec/1999 1.6.1 1
@@ -127,7 +127,7 @@ RRRREEEETTTTUUUURRRRNNNN VVVVAAAALLLLUUUUEEEES
-28/Nov/1999 1.6 2
+4/Dec/1999 1.6.1 2
@@ -193,7 +193,7 @@ SSSSEEEECCCCUUUURRRRIIIITTTTYYYY NNNNOOOOTTTTE
-28/Nov/1999 1.6 3
+4/Dec/1999 1.6.1 3
@@ -259,7 +259,7 @@ FFFFIIIILLLLEEEESSSS
-28/Nov/1999 1.6 4
+4/Dec/1999 1.6.1 4
@@ -325,7 +325,7 @@ CCCCAAAAVVVVEEEEAAAATTTTSSSS
-28/Nov/1999 1.6 5
+4/Dec/1999 1.6.1 5
@@ -391,6 +391,6 @@ SSSSEEEEEEEE AAAALLLLSSSSOOOO
-28/Nov/1999 1.6 6
+4/Dec/1999 1.6.1 6
diff --git a/sudo.man b/sudo.man
index 7092eab99..eda71d91a 100644
--- a/sudo.man
+++ b/sudo.man
@@ -2,8 +2,8 @@
''' $RCSfile$$Revision$$Date$
'''
''' $Log$
-''' Revision 1.41 1999/11/29 01:57:04 millert
-''' fix some syntactic goofs
+''' Revision 1.42 1999/12/05 02:18:47 millert
+''' crank version to 1.6
'''
'''
.de Sh
@@ -96,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH sudo 8 "1.6" "28/Nov/1999" "MAINTENANCE COMMANDS"
+.TH sudo 8 "1.6.1" "4/Dec/1999" "MAINTENANCE COMMANDS"
.UC
.if n .hy 0
.if n .na
diff --git a/sudoers.cat b/sudoers.cat
index d6c3b8978..439b52848 100644
--- a/sudoers.cat
+++ b/sudoers.cat
@@ -61,7 +61,7 @@ DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
-2/Dec/1999 1.6 1
+4/Dec/1999 1.6.1 1
@@ -127,7 +127,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 2
+4/Dec/1999 1.6.1 2
@@ -193,7 +193,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 3
+4/Dec/1999 1.6.1 3
@@ -259,7 +259,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 4
+4/Dec/1999 1.6.1 4
@@ -325,7 +325,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 5
+4/Dec/1999 1.6.1 5
@@ -391,7 +391,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 6
+4/Dec/1999 1.6.1 6
@@ -457,7 +457,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 7
+4/Dec/1999 1.6.1 7
@@ -523,7 +523,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 8
+4/Dec/1999 1.6.1 8
@@ -589,7 +589,7 @@ EEEEXXXXAAAAMMMMPPPPLLLLEEEESSSS
-2/Dec/1999 1.6 9
+4/Dec/1999 1.6.1 9
@@ -655,7 +655,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 10
+4/Dec/1999 1.6.1 10
@@ -721,7 +721,7 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 11
+4/Dec/1999 1.6.1 11
@@ -787,7 +787,7 @@ SSSSEEEEEEEE AAAALLLLSSSSOOOO
-2/Dec/1999 1.6 12
+4/Dec/1999 1.6.1 12
@@ -853,6 +853,6 @@ sudoers(5) FILE FORMATS sudoers(5)
-2/Dec/1999 1.6 13
+4/Dec/1999 1.6.1 13
diff --git a/sudoers.man b/sudoers.man
index 3f043bfc8..c583af43e 100644
--- a/sudoers.man
+++ b/sudoers.man
@@ -2,14 +2,8 @@
''' $RCSfile$$Revision$$Date$
'''
''' $Log$
-''' Revision 1.17 1999/12/02 20:31:24 millert
-''' o Kill shell_noargs option, it cannot work since the command needs to
-''' be set before sudoers is parsed.
-''' o Fix the "set_home" sudoers option (only worked at compile time).
-''' o Fix "fqdn" sudoers option. We now set host/shost via set_fqdn which
-''' gets called when the "fqdn" option is set in sudoers.
-''' o Move the openlog() to store_syslogfac() so this gets overridden
-''' correctly from the sudoers file.
+''' Revision 1.18 1999/12/05 02:18:47 millert
+''' crank version to 1.6
'''
'''
.de Sh
@@ -102,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH sudoers 5 "1.6" "2/Dec/1999" "FILE FORMATS"
+.TH sudoers 5 "1.6.1" "4/Dec/1999" "FILE FORMATS"
.UC
.if n .hy 0
.if n .na
diff --git a/tgetpass.c b/tgetpass.c
index df079888c..0a4213e0a 100644
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -188,6 +188,9 @@ tgetline(fd, buf, bufsiz, timeout)
if (bufsiz == 0)
return(NULL); /* sanity */
+ cp = buf;
+ left = bufsiz;
+
/*
* Timeout of <= 0 means no timeout.
*/
@@ -196,29 +199,33 @@ tgetline(fd, buf, bufsiz, timeout)
n = howmany(fd + 1, NFDBITS) * sizeof(fd_mask);
readfds = (fd_set *) emalloc(n);
(void) memset((VOID *)readfds, 0, n);
- FD_SET(fd, readfds);
/* Set timeout for select */
tv.tv_sec = timeout;
tv.tv_usec = 0;
- /*
- * Make sure there is something to read or timeout
- */
- while ((n = select(fd + 1, readfds, 0, 0, &tv)) == -1 &&
- errno == EINTR)
- ;
- if (n == 0)
- return(NULL); /* timeout */
- }
- if (readfds)
+ while (--left) {
+ FD_SET(fd, readfds);
+
+ /* Make sure there is something to read (or timeout) */
+ while ((n = select(fd + 1, readfds, 0, 0, &tv)) == -1 &&
+ errno == EINTR)
+ ;
+ if (n == 0)
+ return(NULL); /* timeout */
+
+ /* Read a character, exit loop on error, EOF or EOL */
+ n = read(fd, &c, 1);
+ if (n != 1 || c == '\n')
+ break;
+ *cp++ = c;
+ }
free(readfds);
-
- /* Keep reading until out of space, EOF, error, or newline */
- cp = buf;
- left = bufsiz;
- while (--left && (n = read(fd, &c, 1)) == 1 && c != '\n')
- *cp++ = c;
+ } else {
+ /* Keep reading until out of space, EOF, error, or newline */
+ while (--left && (n = read(fd, &c, 1)) == 1 && c != '\n')
+ *cp++ = c;
+ }
*cp = '\0';
return(cp == buf ? NULL : buf);
diff --git a/version.h b/version.h
index 9107259e9..a92ab76c2 100644
--- a/version.h
+++ b/version.h
@@ -37,6 +37,6 @@
#ifndef _SUDO_VERSION_H
#define _SUDO_VERSION_H
-static const char version[] = "1.6";
+static const char version[] = "1.6.1";
#endif /* _SUDO_VERSION_H */
diff --git a/visudo.cat b/visudo.cat
index fc8843ca2..bf8a04b2f 100644
--- a/visudo.cat
+++ b/visudo.cat
@@ -61,7 +61,7 @@ EEEERRRRRRRROOOORRRRSSSS
-28/Nov/1999 1.6 1
+4/Dec/1999 1.6.1 1
@@ -127,7 +127,7 @@ SSSSEEEEEEEE AAAALLLLSSSSOOOO
-28/Nov/1999 1.6 2
+4/Dec/1999 1.6.1 2
@@ -193,6 +193,6 @@ visudo(8) MAINTENANCE COMMANDS visudo(8)
-28/Nov/1999 1.6 3
+4/Dec/1999 1.6.1 3
diff --git a/visudo.man b/visudo.man
index 45d3ff99a..713d3d7ef 100644
--- a/visudo.man
+++ b/visudo.man
@@ -2,8 +2,8 @@
''' $RCSfile$$Revision$$Date$
'''
''' $Log$
-''' Revision 1.13 1999/11/29 01:57:04 millert
-''' fix some syntactic goofs
+''' Revision 1.14 1999/12/05 02:18:47 millert
+''' crank version to 1.6
'''
'''
.de Sh
@@ -96,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH visudo 8 "1.6" "28/Nov/1999" "MAINTENANCE COMMANDS"
+.TH visudo 8 "1.6.1" "4/Dec/1999" "MAINTENANCE COMMANDS"
.UC
.if n .hy 0
.if n .na
View Lorry Controller Status