summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/sudo/ChangeLog82
-rw-r--r--usr.bin/sudo/auth/pam.c6
2 files changed, 84 insertions, 4 deletions
diff --git a/usr.bin/sudo/ChangeLog b/usr.bin/sudo/ChangeLog
index 37b2d111d87..63023fc1c1d 100644
--- a/usr.bin/sudo/ChangeLog
+++ b/usr.bin/sudo/ChangeLog
@@ -1,3 +1,83 @@
+2008-12-14 17:40 millert
+
+ * TODO: sync
+
+2008-12-09 18:48 millert
+
+ * auth/pam.c: Return PAM_AUTH_ERR instead of PAM_CONV_ERR if user
+ enters ^C at the password prompt.
+
+2008-12-09 16:13 millert
+
+ * configure.in, configure: Don't try to build sudo_noexec.so on
+ HP-UX with the bundled compiler as it cannot generate shared
+ objects.
+
+2008-12-09 15:55 millert
+
+ * glob.c, lbuf.c, tgetpass.c, emul/charclass.h: K&R compilation
+ fixes
+
+2008-12-09 08:49 millert
+
+ * parse.c: Use tq_foreach_fwd when checking pseudo-commands to make
+ it clear that we are not short-circuiting on last match. When
+ pwcheck is 'all', initialize nopass to TRUE and override it with
+ the first non-TRUE entry.
+
+2008-12-08 10:02 millert
+
+ * parse.c: Do not short circuit pseudo commands when we get a match
+ since, depending on the settings, we may need to examine all
+ commands for tags.
+
+2008-12-03 15:58 millert
+
+ * sudoers.cat, sudoers.man.in: regen
+
+2008-12-03 15:57 millert
+
+ * sudoers.pod: hostnames may also contain wildcards
+
+2008-12-03 15:40 millert
+
+ * Makefile.in: remove stamp-* files and linux core files in clean
+ target
+
+2008-12-02 12:30 millert
+
+ * config.h.in, configure, configure.in, auth/sudo_auth.h: Use
+ HAVE_SIA_SES_INIT instead of HAVE_SIA for Digital UNIX
+
+2008-11-26 15:10 millert
+
+ * configure, configure.in: correctly enable SIA on Digital UNIX
+
+2008-11-25 20:06 millert
+
+ * TODO: checkpoint
+
+2008-11-25 20:05 millert
+
+ * ChangeLog: sync
+
+2008-11-25 12:01 millert
+
+ * check.c, sudo.h, tgetpass.c: Even if neither stdin nor stdout are
+ ttys we may still have /dev/tty available to us.
+
+2008-11-24 10:09 millert
+
+ * sudoers.cat, sudoers.man.in: regen
+
+2008-11-24 10:08 millert
+
+ * sudoers.pod: fix typos; Markus Lude
+
+2008-11-24 07:08 millert
+
+ * ChangeLog: sync
+
2008-11-23 19:42 millert
* toke.c: regen
@@ -4426,7 +4506,7 @@
2004-10-01 10:58 millert
* sample.pam, sample.sudoers, sample.syslog.conf, sudoers: Add
- $Sudo: ChangeLog,v 1.17 2008/11/24 12:08:55 millert Exp $ tags.
+ $Sudo: ChangeLog,v 1.19 2008/12/19 17:40:39 millert Exp $ tags.
2004-10-01 10:47 millert
diff --git a/usr.bin/sudo/auth/pam.c b/usr.bin/sudo/auth/pam.c
index add9c804c51..cefb6d55516 100644
--- a/usr.bin/sudo/auth/pam.c
+++ b/usr.bin/sudo/auth/pam.c
@@ -73,7 +73,7 @@
#endif
#ifndef lint
-__unused static const char rcsid[] = "$Sudo: pam.c,v 1.65 2008/11/22 18:17:44 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: pam.c,v 1.66 2008/12/09 23:48:19 millert Exp $";
#endif /* lint */
static int sudo_conv __P((int, PAM_CONST struct pam_message **,
@@ -259,7 +259,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
int n, flags, std_prompt;
if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL)
- return(PAM_CONV_ERR);
+ return(PAM_SYSTEM_ERR);
zero_bytes(*response, num_msg * sizeof(struct pam_response));
for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) {
@@ -331,5 +331,5 @@ err:
zero_bytes(*response, num_msg * sizeof(struct pam_response));
free(*response);
*response = NULL;
- return(PAM_CONV_ERR);
+ return(gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR);
}