This patch will upgrade Sudo version 1.6.8 patchlevel 3 to version 1.6.8
patchlevel 4.  To apply:

    cd sudo-1.6.8p3
    patch -p1 < sudo-1.6.8p4.patch

diff -ura sudo-1.6.8p3/CHANGES sudo-1.6.8p4/CHANGES
--- sudo-1.6.8p3/CHANGES	Tue Nov 16 13:58:56 2004
+++ sudo-1.6.8p4/CHANGES	Wed Nov 17 09:34:18 2004
@@ -1746,3 +1746,8 @@
      lacks a trailing slash.
 
 Sudo 1.6.8p3 released.
+
+552) The KRB5CCNAME environment variable is preserved during sudo
+     execution for password lookups that use GSSAPI.
+
+Sudo 1.6.8p4 released.
diff -ura sudo-1.6.8p3/Makefile.in sudo-1.6.8p4/Makefile.in
--- sudo-1.6.8p3/Makefile.in	Tue Nov 16 13:57:30 2004
+++ sudo-1.6.8p4/Makefile.in	Wed Nov 17 09:25:32 2004
@@ -130,7 +130,7 @@
 
 LIBOBJS = @LIBOBJS@ @ALLOCA@
 
-VERSION = 1.6.8p3
+VERSION = 1.6.8p4
 
 DISTFILES = $(SRCS) $(HDRS) BUGS CHANGES HISTORY INSTALL INSTALL.configure \
 	    LICENSE Makefile.in PORTING README README.LDAP RUNSON TODO \
diff -ura sudo-1.6.8p3/env.c sudo-1.6.8p4/env.c
--- sudo-1.6.8p3/env.c	Tue Nov 16 13:55:47 2004
+++ sudo-1.6.8p4/env.c	Wed Nov 17 09:45:19 2004
@@ -142,7 +142,7 @@
 static size_t env_len;		/* number of slots used, not counting NULL */
 
 /*
- * Zero out environment and replace with a minimal set of
+ * Zero out environment and replace with a minimal set of KRB5CCNAME
  * USER, LOGNAME, HOME, TZ, PATH (XXX - should just set path to default)
  * May set user_path, user_shell, and/or user_prompt as side effects.
  */
@@ -150,8 +150,9 @@
 zero_env(envp)
     char **envp;
 {
-    static char *newenv[8];
+    static char *newenv[9];
     char **ep, **nep = newenv;
+    char **ne_last = &newenv[(sizeof(newenv) / sizeof(newenv[0])) - 1];
     extern char *prev_user;
 
     for (ep = envp; *ep; ep++) {
@@ -160,6 +161,10 @@
 		if (strncmp("HOME=", *ep, 5) == 0)
 		    break;
 		continue;
+	    case 'K':
+		if (strncmp("KRB5CCNAME=", *ep, 11) == 0)
+		    break;
+		continue;
 	    case 'L':
 		if (strncmp("LOGNAME=", *ep, 8) == 0)
 		    break;
@@ -196,8 +201,12 @@
 	    if (**nep == **ep)
 		break;
 	}
-	if (*nep == NULL)
-	    *nep++ = *ep;
+	if (*nep == NULL) {
+	    if (nep < ne_last)
+		*nep++ = *ep;
+	    else
+		errx(1, "internal error, attempt to write outside newenv");
+	}
     }
 
 #ifdef HAVE_LDAP
@@ -206,7 +215,10 @@
      * or files in the current directory.
      *
      */	     
-    *nep++ = "LDAPNOINIT=1";
+    if (nep < ne_last)
+	*nep++ = "LDAPNOINIT=1";
+    else
+	errx(1, "internal error, attempt to write outside newenv");
 #endif
 
     return(&newenv[0]);
diff -ura sudo-1.6.8p3/sudo.cat sudo-1.6.8p4/sudo.cat
--- sudo-1.6.8p3/sudo.cat	Tue Nov 16 13:57:00 2004
+++ sudo-1.6.8p4/sudo.cat	Wed Nov 17 09:23:12 2004
@@ -61,7 +61,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       1
+1.6.8p4                 November 17, 2004                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       2
+1.6.8p4                 November 17, 2004                       2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       3
+1.6.8p4                 November 17, 2004                       3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       4
+1.6.8p4                 November 17, 2004                       4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       5
+1.6.8p4                 November 17, 2004                       5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       6
+1.6.8p4                 November 17, 2004                       6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       7
+1.6.8p4                 November 17, 2004                       7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       8
+1.6.8p4                 November 17, 2004                       8
 
 
 
@@ -589,6 +589,6 @@
 
 
 
-1.6.8p3                 November 16, 2004                       9
+1.6.8p4                 November 17, 2004                       9
 
 
diff -ura sudo-1.6.8p3/sudo.man.in sudo-1.6.8p4/sudo.man.in
--- sudo-1.6.8p3/sudo.man.in	Tue Nov 16 13:56:54 2004
+++ sudo-1.6.8p4/sudo.man.in	Wed Nov 17 09:22:25 2004
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDO @mansectsu@"
-.TH SUDO @mansectsu@ "November 16, 2004" "1.6.8p3" "MAINTENANCE COMMANDS"
+.TH SUDO @mansectsu@ "November 17, 2004" "1.6.8p4" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudo, sudoedit \- execute a command as another user
 .SH "SYNOPSIS"
diff -ura sudo-1.6.8p3/sudo_edit.c sudo-1.6.8p4/sudo_edit.c
--- sudo-1.6.8p3/sudo_edit.c	Tue Nov 16 13:55:29 2004
+++ sudo-1.6.8p4/sudo_edit.c	Wed Nov 17 08:42:32 2004
@@ -96,7 +96,7 @@
     else
 	tmpdir = _PATH_TMP;
     tmplen = strlen(tmpdir);
-    while (tmpdir[tmplen - 1] == '/')
+    while (tmplen > 0 && tmpdir[tmplen - 1] == '/')
 	tmplen--;
 
     /*
diff -ura sudo-1.6.8p3/sudoers.cat sudo-1.6.8p4/sudoers.cat
--- sudo-1.6.8p3/sudoers.cat	Tue Nov 16 13:57:02 2004
+++ sudo-1.6.8p4/sudoers.cat	Wed Nov 17 09:23:37 2004
@@ -61,7 +61,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       1
+1.6.8p4                 November 17, 2004                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       2
+1.6.8p4                 November 17, 2004                       2
 
 
 
@@ -193,7 +193,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       3
+1.6.8p4                 November 17, 2004                       3
 
 
 
@@ -259,7 +259,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       4
+1.6.8p4                 November 17, 2004                       4
 
 
 
@@ -325,7 +325,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       5
+1.6.8p4                 November 17, 2004                       5
 
 
 
@@ -391,7 +391,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       6
+1.6.8p4                 November 17, 2004                       6
 
 
 
@@ -457,7 +457,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       7
+1.6.8p4                 November 17, 2004                       7
 
 
 
@@ -523,7 +523,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       8
+1.6.8p4                 November 17, 2004                       8
 
 
 
@@ -589,7 +589,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       9
+1.6.8p4                 November 17, 2004                       9
 
 
 
@@ -655,7 +655,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      10
+1.6.8p4                 November 17, 2004                      10
 
 
 
@@ -721,7 +721,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      11
+1.6.8p4                 November 17, 2004                      11
 
 
 
@@ -787,7 +787,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      12
+1.6.8p4                 November 17, 2004                      12
 
 
 
@@ -853,7 +853,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      13
+1.6.8p4                 November 17, 2004                      13
 
 
 
@@ -919,7 +919,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      14
+1.6.8p4                 November 17, 2004                      14
 
 
 
@@ -985,7 +985,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      15
+1.6.8p4                 November 17, 2004                      15
 
 
 
@@ -1051,7 +1051,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      16
+1.6.8p4                 November 17, 2004                      16
 
 
 
@@ -1117,7 +1117,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      17
+1.6.8p4                 November 17, 2004                      17
 
 
 
@@ -1183,7 +1183,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      18
+1.6.8p4                 November 17, 2004                      18
 
 
 
@@ -1249,7 +1249,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      19
+1.6.8p4                 November 17, 2004                      19
 
 
 
@@ -1315,7 +1315,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      20
+1.6.8p4                 November 17, 2004                      20
 
 
 
@@ -1381,7 +1381,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      21
+1.6.8p4                 November 17, 2004                      21
 
 
 
@@ -1447,7 +1447,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                      22
+1.6.8p4                 November 17, 2004                      22
 
 
 
@@ -1513,6 +1513,6 @@
 
 
 
-1.6.8p3                 November 16, 2004                      23
+1.6.8p4                 November 17, 2004                      23
 
 
diff -ura sudo-1.6.8p3/sudoers.man.in sudo-1.6.8p4/sudoers.man.in
--- sudo-1.6.8p3/sudoers.man.in	Tue Nov 16 13:56:56 2004
+++ sudo-1.6.8p4/sudoers.man.in	Wed Nov 17 09:22:31 2004
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SUDOERS @mansectform@"
-.TH SUDOERS @mansectform@ "November 16, 2004" "1.6.8p3" "MAINTENANCE COMMANDS"
+.TH SUDOERS @mansectform@ "November 17, 2004" "1.6.8p4" "MAINTENANCE COMMANDS"
 .SH "NAME"
 sudoers \- list of which users may execute what
 .SH "DESCRIPTION"
diff -ura sudo-1.6.8p3/version.h sudo-1.6.8p4/version.h
--- sudo-1.6.8p3/version.h	Tue Nov 16 13:57:33 2004
+++ sudo-1.6.8p4/version.h	Wed Nov 17 09:25:27 2004
@@ -23,6 +23,6 @@
 #ifndef _SUDO_VERSION_H
 #define _SUDO_VERSION_H
 
-static const char version[] = "1.6.8p3";
+static const char version[] = "1.6.8p4";
 
 #endif /* _SUDO_VERSION_H */
diff -ura sudo-1.6.8p3/visudo.cat sudo-1.6.8p4/visudo.cat
--- sudo-1.6.8p3/visudo.cat	Tue Nov 16 13:57:16 2004
+++ sudo-1.6.8p4/visudo.cat	Wed Nov 17 09:23:53 2004
@@ -61,7 +61,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       1
+1.6.8p4                 November 17, 2004                       1
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-1.6.8p3                 November 16, 2004                       2
+1.6.8p4                 November 17, 2004                       2
 
 
 
@@ -193,6 +193,6 @@
 
 
 
-1.6.8p3                 November 16, 2004                       3
+1.6.8p4                 November 17, 2004                       3
 
 
diff -ura sudo-1.6.8p3/visudo.man.in sudo-1.6.8p4/visudo.man.in
--- sudo-1.6.8p3/visudo.man.in	Tue Nov 16 13:56:58 2004
+++ sudo-1.6.8p4/visudo.man.in	Wed Nov 17 09:22:38 2004
@@ -149,7 +149,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VISUDO @mansectsu@"
-.TH VISUDO @mansectsu@ "November 16, 2004" "1.6.8p3" "MAINTENANCE COMMANDS"
+.TH VISUDO @mansectsu@ "November 17, 2004" "1.6.8p4" "MAINTENANCE COMMANDS"
 .SH "NAME"
 visudo \- edit the sudoers file
 .SH "SYNOPSIS"