This patch will upgrade Sudo version 1.6.8 patchlevel 8 to version 1.6.8
patchlevel 9.  To apply:

    $ cd sudo-1.6.8p8
    $ patch -p1 < sudo-1.6.8p9.patch

diff -ura sudo-1.6.8p8/CHANGES sudo-1.6.8p9/CHANGES
--- sudo-1.6.8p8/CHANGES	Tue Mar 29 21:40:03 2005
+++ sudo-1.6.8p9/CHANGES	Sun Jun 19 14:31:35 2005
@@ -1786,3 +1786,10 @@
 564) Fixed a bug that prevented Heimdal authentication from working.
 
 Sudo 1.6.8p8 released.
+
+565) Updated config.guess and config.sub entries for OpenBSD.
+
+566) A sudoers entry with sudo ALL no longer overwrites the value of
+     safe_cmnd.
+
+Sudo 1.6.8p9 released.
diff -ura sudo-1.6.8p8/Makefile.in sudo-1.6.8p9/Makefile.in
--- sudo-1.6.8p8/Makefile.in	Fri Mar 11 12:08:52 2005
+++ sudo-1.6.8p9/Makefile.in	Sun Jun 19 14:03:50 2005
@@ -130,7 +130,7 @@
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.8p8
+VERSION = 1.6.8p9
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
 	    LICENSE Makefile.in PORTING README README.LDAP RUNSON TODO \
diff -ura sudo-1.6.8p8/config.guess sudo-1.6.8p9/config.guess
--- sudo-1.6.8p8/config.guess	Mon Aug  9 17:04:35 2004
+++ sudo-1.6.8p9/config.guess	Tue May 31 15:11:19 2005
@@ -197,35 +197,9 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
diff -ura sudo-1.6.8p8/config.sub sudo-1.6.8p9/config.sub
--- sudo-1.6.8p8/config.sub	Mon Jan 20 14:07:51 2003
+++ sudo-1.6.8p9/config.sub	Tue May 31 15:11:38 2005
@@ -369,6 +369,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
diff -ura sudo-1.6.8p8/ldap.c sudo-1.6.8p9/ldap.c
--- sudo-1.6.8p8/ldap.c	Tue Nov 30 20:28:46 2004
+++ sudo-1.6.8p9/ldap.c	Sun Jun 19 15:31:51 2005
@@ -278,8 +278,6 @@
     /* Match against ALL ? */
     if (!strcasecmp(*p,"ALL")) {
       ret=1;
-      if (safe_cmnd) free (safe_cmnd);
-      safe_cmnd=estrdup(user_cmnd);
       if (ldap_conf.debug>1) printf(" MATCH!\n");
       continue;
     }
diff -ura sudo-1.6.8p8/parse.yacc sudo-1.6.8p9/parse.yacc
--- sudo-1.6.8p8/parse.yacc	Wed Aug 11 12:29:10 2004
+++ sudo-1.6.8p9/parse.yacc	Sun Jun 19 12:24:32 2005
@@ -676,10 +676,6 @@
 			    }
 
 			    $$ = TRUE;
-
-			    if (safe_cmnd)
-				free(safe_cmnd);
-			    safe_cmnd = estrdup(user_cmnd);
 			}
 		|	ALIAS {
 			    aliasinfo *aip;
diff -ura sudo-1.6.8p8/sudo.c sudo-1.6.8p9/sudo.c
--- sudo-1.6.8p8/sudo.c	Thu Mar 24 18:56:41 2005
+++ sudo-1.6.8p9/sudo.c	Sun Jun 19 14:35:46 2005
@@ -275,6 +275,8 @@
 	/* Validate the user but don't search for pseudo-commands. */
 	validated = sudoers_lookup(pwflag);
     }
+    if (safe_cmnd == NULL)
+	safe_cmnd = user_cmnd;
 
     /*
      * If we are using set_perms_posix() and the stay_setuid flag was not set,
@@ -389,14 +391,6 @@
 	    sudo_ldap_list_matches();
 #endif
 	    exit(0);
-	}
-
-	/* This *must* have been set if we got a match but... */
-	if (safe_cmnd == NULL) {
-	    log_error(MSG_ONLY,
-		"internal error, safe_cmnd never got set for %s; %s",
-		user_cmnd,
-		"please report this error at http://courtesan.com/sudo/bugs/");
 	}
 
 	/* Override user's umask if configured to do so. */
diff -ura sudo-1.6.8p8/sudo.cat sudo-1.6.8p9/sudo.cat
--- sudo-1.6.8p8/sudo.cat	Fri Mar 11 12:17:21 2005
+++ sudo-1.6.8p9/sudo.cat	Sun Jun 19 14:28:34 2005
@@ -61,7 +61,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          1
+1.6.8p9                  June, 20 2005                          1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          2
+1.6.8p9                  June, 20 2005                          2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          3
+1.6.8p9                  June, 20 2005                          3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          4
+1.6.8p9                  June, 20 2005                          4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          5
+1.6.8p9                  June, 20 2005                          5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          6
+1.6.8p9                  June, 20 2005                          6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          7
+1.6.8p9                  June, 20 2005                          7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          8
+1.6.8p9                  June, 20 2005                          8
 
 
 
@@ -589,6 +589,6 @@
 
 
 
-1.6.8p8                 March, 12 2005                          9
+1.6.8p9                  June, 20 2005                          9
 
 
diff -ura sudo-1.6.8p8/sudo.man.in sudo-1.6.8p9/sudo.man.in
--- sudo-1.6.8p8/sudo.man.in	Fri Mar 11 12:11:31 2005
+++ sudo-1.6.8p9/sudo.man.in	Sun Jun 19 14:05:34 2005
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "March 12, 2005" "1.6.8p8" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudo, sudoedit \- execute a command as another user
 .SH "SYNOPSIS"
diff -ura sudo-1.6.8p8/sudo.tab.c sudo-1.6.8p9/sudo.tab.c
--- sudo-1.6.8p8/sudo.tab.c	Wed Aug 11 12:29:36 2004
+++ sudo-1.6.8p9/sudo.tab.c	Sun Jun 19 14:07:26 2005
@@ -4,7 +4,7 @@
 #if __GNUC__ >= 2
   __attribute__ ((unused))
 #endif /* __GNUC__ >= 2 */
-  = "$OpenBSD: skeleton.c,v 1.23 2004/03/12 13:39:50 henning Exp $";
+  = "$OpenBSD: skeleton.c,v 1.24 2005/06/10 16:40:45 pvalchev Exp $";
 #endif
 #include <stdlib.h>
 #define YYBYACC 1
@@ -89,7 +89,7 @@
 #endif /* HAVE_LSEARCH */
 
 #ifndef lint
-static const char rcsid[] = "$Sudo: sudo.tab.c,v 1.76 2004/08/11 18:29:36 millert Exp $";
+static const char rcsid[] = "$Sudo: parse.yacc,v 1.204 2004/08/11 18:29:10 millert Exp $";
 #endif /* lint */
 
 /*
@@ -674,7 +674,7 @@
 short *yysslim;
 YYSTYPE *yyvs;
 int yystacksize;
-#line 890 "parse.yacc"
+#line 886 "parse.yacc"
 
 #define MOREALIASES (32)
 aliasinfo *aliases = NULL;
@@ -1740,14 +1740,10 @@
 			    }
 
 			    yyval.BOOLEAN = TRUE;
-
-			    if (safe_cmnd)
-				free(safe_cmnd);
-			    safe_cmnd = estrdup(user_cmnd);
 			}
 break;
 case 61:
-#line 684 "parse.yacc"
+#line 680 "parse.yacc"
 {
 			    aliasinfo *aip;
 
@@ -1779,7 +1775,7 @@
 			}
 break;
 case 62:
-#line 713 "parse.yacc"
+#line 709 "parse.yacc"
 {
 			    if (printmatches == TRUE) {
 				if (in_alias == TRUE) {
@@ -1807,11 +1803,11 @@
 			}
 break;
 case 65:
-#line 744 "parse.yacc"
+#line 740 "parse.yacc"
 { push; }
 break;
 case 66:
-#line 744 "parse.yacc"
+#line 740 "parse.yacc"
 {
 			    if ((MATCHED(host_matches) || pedantic) &&
 				!add_alias(yyvsp[-3].string, HOST_ALIAS, host_matches)) {
@@ -1822,7 +1818,7 @@
 			}
 break;
 case 71:
-#line 762 "parse.yacc"
+#line 758 "parse.yacc"
 {
 			    push;
 			    if (printmatches == TRUE) {
@@ -1835,7 +1831,7 @@
 			}
 break;
 case 72:
-#line 771 "parse.yacc"
+#line 767 "parse.yacc"
 {
 			    if ((MATCHED(cmnd_matches) || pedantic) &&
 				!add_alias(yyvsp[-3].string, CMND_ALIAS, cmnd_matches)) {
@@ -1850,11 +1846,11 @@
 			}
 break;
 case 73:
-#line 785 "parse.yacc"
+#line 781 "parse.yacc"
 { ; }
 break;
 case 77:
-#line 793 "parse.yacc"
+#line 789 "parse.yacc"
 {
 			    if (printmatches == TRUE) {
 				in_alias = TRUE;
@@ -1866,7 +1862,7 @@
 			}
 break;
 case 78:
-#line 801 "parse.yacc"
+#line 797 "parse.yacc"
 {
 			    if ((yyvsp[0].BOOLEAN != NOMATCH || pedantic) &&
 				!add_alias(yyvsp[-3].string, RUNAS_ALIAS, yyvsp[0].BOOLEAN)) {
@@ -1880,11 +1876,11 @@
 			}
 break;
 case 81:
-#line 818 "parse.yacc"
+#line 814 "parse.yacc"
 { push; }
 break;
 case 82:
-#line 818 "parse.yacc"
+#line 814 "parse.yacc"
 {
 			    if ((MATCHED(user_matches) || pedantic) &&
 				!add_alias(yyvsp[-3].string, USER_ALIAS, user_matches)) {
@@ -1896,19 +1892,19 @@
 			}
 break;
 case 85:
-#line 833 "parse.yacc"
+#line 829 "parse.yacc"
 {
 			    SETMATCH(user_matches, yyvsp[0].BOOLEAN);
 			}
 break;
 case 86:
-#line 836 "parse.yacc"
+#line 832 "parse.yacc"
 {
 			    SETNMATCH(user_matches, yyvsp[0].BOOLEAN);
 			}
 break;
 case 87:
-#line 841 "parse.yacc"
+#line 837 "parse.yacc"
 {
 			    if (userpw_matches(yyvsp[0].string, user_name, sudo_user.pw))
 				yyval.BOOLEAN = TRUE;
@@ -1918,7 +1914,7 @@
 			}
 break;
 case 88:
-#line 848 "parse.yacc"
+#line 844 "parse.yacc"
 {
 			    if (usergr_matches(yyvsp[0].string, user_name, sudo_user.pw))
 				yyval.BOOLEAN = TRUE;
@@ -1928,7 +1924,7 @@
 			}
 break;
 case 89:
-#line 855 "parse.yacc"
+#line 851 "parse.yacc"
 {
 			    if (netgr_matches(yyvsp[0].string, NULL, NULL, user_name))
 				yyval.BOOLEAN = TRUE;
@@ -1938,7 +1934,7 @@
 			}
 break;
 case 90:
-#line 862 "parse.yacc"
+#line 858 "parse.yacc"
 {
 			    aliasinfo *aip = find_alias(yyvsp[0].string, USER_ALIAS);
 
@@ -1963,12 +1959,12 @@
 			}
 break;
 case 91:
-#line 884 "parse.yacc"
+#line 880 "parse.yacc"
 {
 			    yyval.BOOLEAN = TRUE;
 			}
 break;
-#line 1920 "sudo.tab.c"
+#line 1916 "sudo.tab.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
diff -ura sudo-1.6.8p8/sudoers.cat sudo-1.6.8p9/sudoers.cat
--- sudo-1.6.8p8/sudoers.cat	Fri Mar 11 12:17:25 2005
+++ sudo-1.6.8p9/sudoers.cat	Sun Jun 19 14:28:46 2005
@@ -61,7 +61,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          1
+1.6.8p9                  June, 20 2005                          1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          2
+1.6.8p9                  June, 20 2005                          2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          3
+1.6.8p9                  June, 20 2005                          3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          4
+1.6.8p9                  June, 20 2005                          4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          5
+1.6.8p9                  June, 20 2005                          5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          6
+1.6.8p9                  June, 20 2005                          6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          7
+1.6.8p9                  June, 20 2005                          7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          8
+1.6.8p9                  June, 20 2005                          8
 
 
 
@@ -589,7 +589,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          9
+1.6.8p9                  June, 20 2005                          9
 
 
 
@@ -655,7 +655,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         10
+1.6.8p9                  June, 20 2005                         10
 
 
 
@@ -721,7 +721,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         11
+1.6.8p9                  June, 20 2005                         11
 
 
 
@@ -787,7 +787,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         12
+1.6.8p9                  June, 20 2005                         12
 
 
 
@@ -853,7 +853,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         13
+1.6.8p9                  June, 20 2005                         13
 
 
 
@@ -919,7 +919,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         14
+1.6.8p9                  June, 20 2005                         14
 
 
 
@@ -985,7 +985,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         15
+1.6.8p9                  June, 20 2005                         15
 
 
 
@@ -1051,7 +1051,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         16
+1.6.8p9                  June, 20 2005                         16
 
 
 
@@ -1117,7 +1117,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         17
+1.6.8p9                  June, 20 2005                         17
 
 
 
@@ -1183,7 +1183,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         18
+1.6.8p9                  June, 20 2005                         18
 
 
 
@@ -1249,7 +1249,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         19
+1.6.8p9                  June, 20 2005                         19
 
 
 
@@ -1315,7 +1315,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         20
+1.6.8p9                  June, 20 2005                         20
 
 
 
@@ -1381,7 +1381,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         21
+1.6.8p9                  June, 20 2005                         21
 
 
 
@@ -1447,7 +1447,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                         22
+1.6.8p9                  June, 20 2005                         22
 
 
 
@@ -1513,6 +1513,6 @@
 
 
 
-1.6.8p8                 March, 12 2005                         23
+1.6.8p9                  June, 20 2005                         23
 
 
diff -ura sudo-1.6.8p8/sudoers.man.in sudo-1.6.8p9/sudoers.man.in
--- sudo-1.6.8p8/sudoers.man.in	Fri Mar 11 12:11:49 2005
+++ sudo-1.6.8p9/sudoers.man.in	Sun Jun 19 14:05:43 2005
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "March 12, 2005" "1.6.8p8" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudoers \- list of which users may execute what
 .SH "DESCRIPTION"
diff -ura sudo-1.6.8p8/version.h sudo-1.6.8p9/version.h
--- sudo-1.6.8p8/version.h	Fri Mar 11 12:08:59 2005
+++ sudo-1.6.8p9/version.h	Sun Jun 19 14:03:47 2005
@@ -23,6 +23,6 @@
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.8p8";
+static const char version[] = "1.6.8p9";
 
 #endif /* _SUDO_VERSION_H */
diff -ura sudo-1.6.8p8/visudo.cat sudo-1.6.8p9/visudo.cat
--- sudo-1.6.8p8/visudo.cat	Fri Mar 11 12:17:28 2005
+++ sudo-1.6.8p9/visudo.cat	Sun Jun 19 14:28:50 2005
@@ -61,7 +61,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          1
+1.6.8p9                  June, 20 2005                          1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.6.8p8                 March, 12 2005                          2
+1.6.8p9                  June, 20 2005                          2
 
 
 
@@ -193,6 +193,6 @@
 
 
 
-1.6.8p8                 March, 12 2005                          3
+1.6.8p9                  June, 20 2005                          3
 
 
diff -ura sudo-1.6.8p8/visudo.man.in sudo-1.6.8p9/visudo.man.in
--- sudo-1.6.8p8/visudo.man.in	Fri Mar 11 12:12:49 2005
+++ sudo-1.6.8p9/visudo.man.in	Sun Jun 19 14:05:50 2005
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "March 12, 2005" "1.6.8p8" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "June 20, 2005" "1.6.8p9" "MAINTENANCE COMMANDS"
 .SH "NAME"
 visudo \- edit the sudoers file
 .SH "SYNOPSIS"