Remove old $Sudo$ tags; the main sudo tree no longer lives in cvs.

76 files changed, 2 insertions, 242 deletions

diff --git a/usr.bin/sudo/Makefile.in b/usr.bin/sudo/Makefile.in
index 245e77e28a9..09f6b301413 100644
--- a/usr.bin/sudo/Makefile.in
+++ b/usr.bin/sudo/Makefile.in
@@ -21,8 +21,6 @@
 #
 # @configure_input@
 #
-# $Sudo: Makefile.in,v 1.340 2009/06/15 21:18:53 millert Exp $
-#
 
 #### Start of system configuration section. ####
 
@@ -405,9 +403,6 @@ sudoers.ldap.cat: sudoers.ldap.man
 @DEV@LICENSE: license.pod
 @DEV@	pod2text -l -i0 $> | sed '1,2d' > $@
 
-ChangeLog:
-	cvs2cl --follow-only trunk
-
 install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-man
 
 install-dirs:
@@ -531,5 +526,3 @@ depot:
 	  gzip -f --best sudo-$(VERSION).depot; \
 	  rm -rf tmp.depot ; \
 	)
-
-.PHONY:	ChangeLog
diff --git a/usr.bin/sudo/alias.c b/usr.bin/sudo/alias.c
index e8fec56c07e..e389c711393 100644
--- a/usr.bin/sudo/alias.c
+++ b/usr.bin/sudo/alias.c
@@ -46,10 +46,6 @@
 #include "redblack.h"
 #include <gram.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: alias.c,v 1.18 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 /*
  * Globals
  */
diff --git a/usr.bin/sudo/alloc.c b/usr.bin/sudo/alloc.c
index c2405bf1c69..d8bd857cee2 100644
--- a/usr.bin/sudo/alloc.c
+++ b/usr.bin/sudo/alloc.c
@@ -48,10 +48,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: alloc.c,v 1.33 2008/11/09 14:13:12 millert Exp $";
-#endif /* lint */
-
 /*
  * If there is no SIZE_MAX or SIZE_T_MAX we have to assume that size_t
  * could be signed (as it is on SunOS 4.x).  This just means that
diff --git a/usr.bin/sudo/auth/afs.c b/usr.bin/sudo/auth/afs.c
index fed48ba0673..337cd4d2069 100644
--- a/usr.bin/sudo/auth/afs.c
+++ b/usr.bin/sudo/auth/afs.c
@@ -50,10 +50,6 @@
 #include <afs/stds.h>
 #include <afs/kautils.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: afs.c,v 1.15 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 int
 afs_verify(pw, pass, auth)
     struct passwd *pw;
diff --git a/usr.bin/sudo/auth/aix_auth.c b/usr.bin/sudo/auth/aix_auth.c
index 853ceb8b1ac..919fa998196 100644
--- a/usr.bin/sudo/auth/aix_auth.c
+++ b/usr.bin/sudo/auth/aix_auth.c
@@ -46,10 +46,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: aix_auth.c,v 1.27 2009/05/25 12:02:42 millert Exp $";
-#endif /* lint */
-
 /*
  * For a description of the AIX authentication API, see
  * http://publib16.boulder.ibm.com/doc_link/en_US/a_doc_lib/libs/basetrf1/authenticate.htm
diff --git a/usr.bin/sudo/auth/bsdauth.c b/usr.bin/sudo/auth/bsdauth.c
index aae7fd68991..f70e90b004a 100644
--- a/usr.bin/sudo/auth/bsdauth.c
+++ b/usr.bin/sudo/auth/bsdauth.c
@@ -51,10 +51,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: bsdauth.c,v 1.23 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 extern char *login_style;		/* from sudo.c */
 
 int
diff --git a/usr.bin/sudo/auth/dce.c b/usr.bin/sudo/auth/dce.c
index f8ddcbae5d9..943e064c838 100644
--- a/usr.bin/sudo/auth/dce.c
+++ b/usr.bin/sudo/auth/dce.c
@@ -64,10 +64,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: dce.c,v 1.14 2005/02/12 22:56:07 millert Exp $";
-#endif /* lint */
-
 static int check_dce_status __P((error_status_t, char *));
 
 int
diff --git a/usr.bin/sudo/auth/fwtk.c b/usr.bin/sudo/auth/fwtk.c
index d09b132d7fa..853fc3ba346 100644
--- a/usr.bin/sudo/auth/fwtk.c
+++ b/usr.bin/sudo/auth/fwtk.c
@@ -49,10 +49,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: fwtk.c,v 1.29 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 int
 fwtk_init(pw, promptp, auth)
     struct passwd *pw;
diff --git a/usr.bin/sudo/auth/kerb4.c b/usr.bin/sudo/auth/kerb4.c
index 2f6c1099c9c..4b3e38147a1 100644
--- a/usr.bin/sudo/auth/kerb4.c
+++ b/usr.bin/sudo/auth/kerb4.c
@@ -47,10 +47,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: kerb4.c,v 1.16 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 int
 kerb4_init(pw, promptp, auth)
     struct passwd *pw;
diff --git a/usr.bin/sudo/auth/kerb5.c b/usr.bin/sudo/auth/kerb5.c
index fd43950d55b..d03bd9a791c 100644
--- a/usr.bin/sudo/auth/kerb5.c
+++ b/usr.bin/sudo/auth/kerb5.c
@@ -53,10 +53,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: kerb5.c,v 1.37 2009/11/03 14:51:20 millert Exp $";
-#endif /* lint */
-
 #ifdef HAVE_HEIMDAL
 # define extract_name(c, p)		krb5_principal_get_comp_string(c, p, 1)
 # define krb5_free_data_contents(c, d)	krb5_data_free(d)
diff --git a/usr.bin/sudo/auth/pam.c b/usr.bin/sudo/auth/pam.c
index b03a1f75b12..f4269b841bf 100644
--- a/usr.bin/sudo/auth/pam.c
+++ b/usr.bin/sudo/auth/pam.c
@@ -72,10 +72,6 @@
 # define PAM_CONST
 #endif
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: pam.c,v 1.69 2009/08/07 14:21:51 millert Exp $";
-#endif /* lint */
-
 static int sudo_conv __P((int, PAM_CONST struct pam_message **,
 			  struct pam_response **, void *));
 static char *def_prompt = "Password:";
diff --git a/usr.bin/sudo/auth/passwd.c b/usr.bin/sudo/auth/passwd.c
index 7746a7016aa..e35130664c9 100644
--- a/usr.bin/sudo/auth/passwd.c
+++ b/usr.bin/sudo/auth/passwd.c
@@ -46,10 +46,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: passwd.c,v 1.17 2005/02/12 22:56:07 millert Exp $";
-#endif /* lint */
-
 #define DESLEN			13
 #define HAS_AGEINFO(p, l)	(l == 18 && p[DESLEN] == ',')
 
diff --git a/usr.bin/sudo/auth/rfc1938.c b/usr.bin/sudo/auth/rfc1938.c
index 8da824b32a2..1769e6f7fd8 100644
--- a/usr.bin/sudo/auth/rfc1938.c
+++ b/usr.bin/sudo/auth/rfc1938.c
@@ -63,10 +63,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: rfc1938.c,v 1.20 2005/02/12 22:56:07 millert Exp $";
-#endif /* lint */
-
 int
 rfc1938_setup(pw, promptp, auth)
     struct passwd *pw;
diff --git a/usr.bin/sudo/auth/secureware.c b/usr.bin/sudo/auth/secureware.c
index d398a60d5de..d2171270646 100644
--- a/usr.bin/sudo/auth/secureware.c
+++ b/usr.bin/sudo/auth/secureware.c
@@ -53,10 +53,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: secureware.c,v 1.13 2005/02/12 22:56:07 millert Exp $";
-#endif /* lint */
-
 int
 secureware_init(pw, promptp, auth)
     struct passwd *pw;
diff --git a/usr.bin/sudo/auth/securid.c b/usr.bin/sudo/auth/securid.c
index 8ec7bbeff7c..4edddb4e515 100644
--- a/usr.bin/sudo/auth/securid.c
+++ b/usr.bin/sudo/auth/securid.c
@@ -53,10 +53,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: securid.c,v 1.18 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 union config_record configure;
 
 int
diff --git a/usr.bin/sudo/auth/securid5.c b/usr.bin/sudo/auth/securid5.c
index db254c2f51a..b59bf8f5d83 100644
--- a/usr.bin/sudo/auth/securid5.c
+++ b/usr.bin/sudo/auth/securid5.c
@@ -55,10 +55,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: securid5.c,v 1.13 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 /*
  * securid_init - Initialises communications with ACE server
  * Arguments in:
diff --git a/usr.bin/sudo/auth/sia.c b/usr.bin/sudo/auth/sia.c
index 852e8c77dc5..1f919f48108 100644
--- a/usr.bin/sudo/auth/sia.c
+++ b/usr.bin/sudo/auth/sia.c
@@ -49,10 +49,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sia.c,v 1.19 2008/11/09 14:13:13 millert Exp $";
-#endif /* lint */
-
 static int sudo_collect	__P((int, int, uchar_t *, int, prompt_t *));
 
 static char *def_prompt;
diff --git a/usr.bin/sudo/auth/sudo_auth.c b/usr.bin/sudo/auth/sudo_auth.c
index fa1419f28c5..58a079bb098 100644
--- a/usr.bin/sudo/auth/sudo_auth.c
+++ b/usr.bin/sudo/auth/sudo_auth.c
@@ -52,10 +52,6 @@
 #include "sudo_auth.h"
 #include "insults.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sudo_auth.c,v 1.40 2009/05/25 12:02:42 millert Exp $";
-#endif /* lint */
-
 sudo_auth auth_switch[] = {
 #ifdef AUTH_STANDALONE
     AUTH_STANDALONE
diff --git a/usr.bin/sudo/auth/sudo_auth.h b/usr.bin/sudo/auth/sudo_auth.h
index 42ac49b167d..a4efe141237 100644
--- a/usr.bin/sudo/auth/sudo_auth.h
+++ b/usr.bin/sudo/auth/sudo_auth.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: sudo_auth.h,v 1.29 2009/05/25 12:02:42 millert Exp $
  */
 
 #ifndef SUDO_AUTH_H
diff --git a/usr.bin/sudo/check.c b/usr.bin/sudo/check.c
index bdce34e23b7..817e406eb8c 100644
--- a/usr.bin/sudo/check.c
+++ b/usr.bin/sudo/check.c
@@ -58,10 +58,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: check.c,v 1.247 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 /* Status codes for timestamp_status() */
 #define TS_CURRENT		0
 #define TS_OLD			1
diff --git a/usr.bin/sudo/compat.h b/usr.bin/sudo/compat.h
index 39fcdd7e9bf..2d5f76ad082 100644
--- a/usr.bin/sudo/compat.h
+++ b/usr.bin/sudo/compat.h
@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: compat.h,v 1.90 2008/11/09 14:13:12 millert Exp $
  */
 
 #ifndef _SUDO_COMPAT_H
diff --git a/usr.bin/sudo/configure b/usr.bin/sudo/configure
index 06d55dcdd31..d04941853fd 100644
--- a/usr.bin/sudo/configure
+++ b/usr.bin/sudo/configure
@@ -15831,6 +15831,7 @@ LIBS=$ac_save_LIBS
 
 
 
+
 for ac_func in strchr strrchr memchr memcpy memset sysconf tzset \
 	       strftime setrlimit initgroups getgroups fstat gettimeofday \
 	       setlocale getaddrinfo setsid setenv setrlimit64
diff --git a/usr.bin/sudo/configure.in b/usr.bin/sudo/configure.in
index 81302b5d7cc..fcd0be869f3 100644
--- a/usr.bin/sudo/configure.in
+++ b/usr.bin/sudo/configure.in
@@ -1,6 +1,5 @@
 dnl
 dnl Process this file with GNU autoconf to produce a configure script.
-dnl $Sudo: configure.in,v 1.549 2009/06/13 20:52:50 millert Exp $
 dnl
 dnl Copyright (c) 1994-1996,1998-2010 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
diff --git a/usr.bin/sudo/defaults.c b/usr.bin/sudo/defaults.c
index 376fef79843..3b076618d77 100644
--- a/usr.bin/sudo/defaults.c
+++ b/usr.bin/sudo/defaults.c
@@ -49,10 +49,6 @@
 #include "parse.h"
 #include <gram.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: defaults.c,v 1.73 2008/11/09 14:13:12 millert Exp $";
-#endif /* lint */
-
 /*
  * For converting between syslog numbers and strings.
  */
diff --git a/usr.bin/sudo/defaults.h b/usr.bin/sudo/defaults.h
index aac0136a367..0035e9582f1 100644
--- a/usr.bin/sudo/defaults.h
+++ b/usr.bin/sudo/defaults.h
@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: defaults.h,v 1.33 2008/11/09 14:13:12 millert Exp $
  */
 
 #ifndef _SUDO_DEFAULTS_H
diff --git a/usr.bin/sudo/env.c b/usr.bin/sudo/env.c
index 3049dff9330..88e6553ea66 100644
--- a/usr.bin/sudo/env.c
+++ b/usr.bin/sudo/env.c
@@ -49,10 +49,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: env.c,v 1.106 2009/06/23 18:24:42 millert Exp $";
-#endif /* lint */
-
 /*
  * Flags used in rebuild_env()
  */
diff --git a/usr.bin/sudo/error.c b/usr.bin/sudo/error.c
index 6f8149bfade..317f10561cb 100644
--- a/usr.bin/sudo/error.c
+++ b/usr.bin/sudo/error.c
@@ -23,10 +23,6 @@
 #include <compat.h>
 #include "error.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: error.c,v 1.7 2005/11/18 01:39:58 millert Exp $";
-#endif /* lint */
-
 static void _warning	__P((int, const char *, va_list));
        void cleanup	__P((int));
 
diff --git a/usr.bin/sudo/error.h b/usr.bin/sudo/error.h
index e8d7b77f763..5ac3076005e 100644
--- a/usr.bin/sudo/error.h
+++ b/usr.bin/sudo/error.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: error.h,v 1.2 2004/11/19 17:32:25 millert Exp $
  */
 
 #ifndef _SUDO_ERROR_H_
diff --git a/usr.bin/sudo/fileops.c b/usr.bin/sudo/fileops.c
index 40cc86023a4..5e9d31dd67c 100644
--- a/usr.bin/sudo/fileops.c
+++ b/usr.bin/sudo/fileops.c
@@ -53,10 +53,6 @@
 # define LINE_MAX 2048
 #endif
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: fileops.c,v 1.19 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 /*
  * Update the access and modify times on an fd or file.
  */
diff --git a/usr.bin/sudo/find_path.c b/usr.bin/sudo/find_path.c
index 673cd0df559..59d94f3878c 100644
--- a/usr.bin/sudo/find_path.c
+++ b/usr.bin/sudo/find_path.c
@@ -45,10 +45,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: find_path.c,v 1.115 2005/03/29 14:29:46 millert Exp $";
-#endif /* lint */
-
 /*
  * This function finds the full pathname for a command and
  * stores it in a statically allocated array, filling in a pointer
diff --git a/usr.bin/sudo/getspwuid.c b/usr.bin/sudo/getspwuid.c
index c6848a75a45..8c07d151678 100644
--- a/usr.bin/sudo/getspwuid.c
+++ b/usr.bin/sudo/getspwuid.c
@@ -70,10 +70,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: getspwuid.c,v 1.78 2005/02/12 22:56:06 millert Exp $";
-#endif /* lint */
-
 /*
  * Exported for auth/secureware.c
  */
diff --git a/usr.bin/sudo/gettime.c b/usr.bin/sudo/gettime.c
index c864c9b08ad..f6de4753269 100644
--- a/usr.bin/sudo/gettime.c
+++ b/usr.bin/sudo/gettime.c
@@ -28,10 +28,6 @@
 
 #include <compat.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: gettime.c,v 1.8 2008/11/09 14:13:12 millert Exp $";
-#endif /* lint */
-
 /*
  * Get the current time via gettimeofday() for systems with
  * timespecs in struct stat or, otherwise, using time().
diff --git a/usr.bin/sudo/goodpath.c b/usr.bin/sudo/goodpath.c
index 1529404555b..258bc899a25 100644
--- a/usr.bin/sudo/goodpath.c
+++ b/usr.bin/sudo/goodpath.c
@@ -38,10 +38,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: goodpath.c,v 1.44 2005/02/12 22:56:06 millert Exp $";
-#endif /* lint */
-
 /*
  * Verify that path is a normal file and executable by root.
  */
diff --git a/usr.bin/sudo/gram.y b/usr.bin/sudo/gram.y
index 9ab395bfbd4..dce99b05c3b 100644
--- a/usr.bin/sudo/gram.y
+++ b/usr.bin/sudo/gram.y
@@ -53,10 +53,6 @@
 #include "sudo.h"
 #include "parse.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: gram.y,v 1.36 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 /*
  * We must define SIZE_MAX for yacc's skeleton.c.
  * If there is no SIZE_MAX or SIZE_T_MAX we have to assume that size_t
diff --git a/usr.bin/sudo/ins_2001.h b/usr.bin/sudo/ins_2001.h
index 8e3ff46b8e1..63a5d6400b8 100644
--- a/usr.bin/sudo/ins_2001.h
+++ b/usr.bin/sudo/ins_2001.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: ins_2001.h,v 1.29 2004/02/13 21:36:43 millert Exp $
  */
 
 #ifndef _SUDO_INS_2001_H
diff --git a/usr.bin/sudo/ins_classic.h b/usr.bin/sudo/ins_classic.h
index 4321f64d18f..b1942bd7839 100644
--- a/usr.bin/sudo/ins_classic.h
+++ b/usr.bin/sudo/ins_classic.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: ins_classic.h,v 1.30 2004/02/13 21:36:43 millert Exp $
  */
 
 #ifndef _SUDO_INS_CLASSIC_H
diff --git a/usr.bin/sudo/ins_csops.h b/usr.bin/sudo/ins_csops.h
index e94d8ae531d..20e9b02d8c9 100644
--- a/usr.bin/sudo/ins_csops.h
+++ b/usr.bin/sudo/ins_csops.h
@@ -13,8 +13,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: ins_csops.h,v 1.30 2008/11/09 14:13:12 millert Exp $
  */
 
 #ifndef _SUDO_INS_CSOPS_H
diff --git a/usr.bin/sudo/ins_goons.h b/usr.bin/sudo/ins_goons.h
index d938321ec6d..16a262acc8e 100644
--- a/usr.bin/sudo/ins_goons.h
+++ b/usr.bin/sudo/ins_goons.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: ins_goons.h,v 1.29 2004/02/13 21:36:43 millert Exp $
  */
 
 #ifndef _SUDO_INS_GOONS_H
diff --git a/usr.bin/sudo/install-sh b/usr.bin/sudo/install-sh
index 6dcd300a7bb..ac01297bb20 100644
--- a/usr.bin/sudo/install-sh
+++ b/usr.bin/sudo/install-sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ## (From INN-1.4, written by Rich Salz)
-##  $Revision: 1.10 $
+##  $Revision: 1.11 $
 ##  A script to install files and directories.
 
 PROGNAME=`basename $0`
diff --git a/usr.bin/sudo/insults.h b/usr.bin/sudo/insults.h
index 113fe361150..bdb3fc66a56 100644
--- a/usr.bin/sudo/insults.h
+++ b/usr.bin/sudo/insults.h
@@ -13,8 +13,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: insults.h,v 1.47 2008/11/09 14:13:12 millert Exp $
  */
 
 #ifndef _SUDO_INSULTS_H
diff --git a/usr.bin/sudo/interfaces.c b/usr.bin/sudo/interfaces.c
index 6272704c94a..eed07530150 100644
--- a/usr.bin/sudo/interfaces.c
+++ b/usr.bin/sudo/interfaces.c
@@ -84,10 +84,6 @@ struct rtentry;
 #include "sudo.h"
 #include "interfaces.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: interfaces.c,v 1.87 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 /* Minix apparently lacks IFF_LOOPBACK */
 #ifndef IFF_LOOPBACK
 # define IFF_LOOPBACK	0
diff --git a/usr.bin/sudo/interfaces.h b/usr.bin/sudo/interfaces.h
index d4d4dd0d204..b9591af45e0 100644
--- a/usr.bin/sudo/interfaces.h
+++ b/usr.bin/sudo/interfaces.h
@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: interfaces.h,v 1.12 2008/11/09 14:13:12 millert Exp $
  */
 
 #ifndef _SUDO_INTERFACES_H
diff --git a/usr.bin/sudo/lbuf.c b/usr.bin/sudo/lbuf.c
index 9e6bf0d10b0..5f9d766d89c 100644
--- a/usr.bin/sudo/lbuf.c
+++ b/usr.bin/sudo/lbuf.c
@@ -52,10 +52,6 @@
 #include "sudo.h"
 #include "lbuf.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: lbuf.c,v 1.9 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 #if !defined(TIOCGSIZE) && defined(TIOCGWINSZ)
 # define TIOCGSIZE	TIOCGWINSZ
 # define ttysize	winsize
diff --git a/usr.bin/sudo/lbuf.h b/usr.bin/sudo/lbuf.h
index 4633dee3de3..fbc9fdc0048 100644
--- a/usr.bin/sudo/lbuf.h
+++ b/usr.bin/sudo/lbuf.h
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Sudo: lbuf.h,v 1.2 2007/08/22 22:31:07 millert Exp $"
  */
 
 #ifndef _SUDO_LBUF_H
diff --git a/usr.bin/sudo/ldap.c b/usr.bin/sudo/ldap.c
index 33e65067c16..94ea4cbe4ad 100644
--- a/usr.bin/sudo/ldap.c
+++ b/usr.bin/sudo/ldap.c
@@ -81,10 +81,6 @@
 #include "parse.h"
 #include "lbuf.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: ldap.c,v 1.108 2009/05/29 13:43:12 millert Exp $";
-#endif /* lint */
-
 #ifndef LDAP_OPT_SUCCESS
 # define LDAP_OPT_SUCCESS LDAP_SUCCESS
 #endif
diff --git a/usr.bin/sudo/list.c b/usr.bin/sudo/list.c
index 2e6482ad2a8..60c1138026a 100644
--- a/usr.bin/sudo/list.c
+++ b/usr.bin/sudo/list.c
@@ -31,10 +31,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: list.c,v 1.6 2008/11/09 14:13:12 millert Exp $";
-#endif /* lint */
-
 struct list_proto {
     struct list_proto *prev;
     struct list_proto *next;
diff --git a/usr.bin/sudo/list.h b/usr.bin/sudo/list.h
index ddf610a1066..17aab415b1c 100644
--- a/usr.bin/sudo/list.h
+++ b/usr.bin/sudo/list.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: list.h,v 1.3 2007/09/11 19:42:48 millert Exp $
  */
 
 #ifndef _SUDO_LIST_H
diff --git a/usr.bin/sudo/logging.c b/usr.bin/sudo/logging.c
index 44df374be72..9a651ada8d5 100644
--- a/usr.bin/sudo/logging.c
+++ b/usr.bin/sudo/logging.c
@@ -57,10 +57,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: logging.c,v 1.205 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 static void do_syslog		__P((int, char *));
 static void do_logfile		__P((char *));
 static void send_mail		__P((char *));
diff --git a/usr.bin/sudo/logging.h b/usr.bin/sudo/logging.h
index d65a8abcb61..e8e5d8b6b70 100644
--- a/usr.bin/sudo/logging.h
+++ b/usr.bin/sudo/logging.h
@@ -13,8 +13,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: logging.h,v 1.15 2009/05/25 12:02:41 millert Exp $
  */
 
 #ifndef _LOGGING_H
diff --git a/usr.bin/sudo/match.c b/usr.bin/sudo/match.c
index 7d707a40036..78c2b3e1635 100644
--- a/usr.bin/sudo/match.c
+++ b/usr.bin/sudo/match.c
@@ -93,10 +93,6 @@
 # include "nonunix.h"
 #endif /* USING_NONUNIX_GROUPS */
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: match.c,v 1.48 2009/11/23 15:56:14 millert Exp $";
-#endif /* lint */
-
 static struct member_list empty;
 
 static int command_matches_dir __P((char *, size_t));
diff --git a/usr.bin/sudo/mkinstalldirs b/usr.bin/sudo/mkinstalldirs
index ce51f6ebbb0..0330343d68f 100644
--- a/usr.bin/sudo/mkinstalldirs
+++ b/usr.bin/sudo/mkinstalldirs
@@ -4,8 +4,6 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Sudo: mkinstalldirs,v 1.5 2003/04/03 15:16:22 millert Exp $
-
 umask 022
 errstatus=0
 dirmode=""
diff --git a/usr.bin/sudo/parse.c b/usr.bin/sudo/parse.c
index 818641d6fb7..61a88f44434 100644
--- a/usr.bin/sudo/parse.c
+++ b/usr.bin/sudo/parse.c
@@ -48,10 +48,6 @@
 #include "lbuf.h"
 #include <gram.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: parse.c,v 1.242 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 /* Characters that must be quoted in sudoers */
 #define SUDOERS_QUOTED	":\\,=#\""
 
diff --git a/usr.bin/sudo/parse.h b/usr.bin/sudo/parse.h
index 991856fd581..501e5f7c8d2 100644
--- a/usr.bin/sudo/parse.h
+++ b/usr.bin/sudo/parse.h
@@ -13,8 +13,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: parse.h,v 1.49 2009/05/25 12:02:41 millert Exp $
  */
 
 #ifndef _SUDO_PARSE_H
diff --git a/usr.bin/sudo/pathnames.h.in b/usr.bin/sudo/pathnames.h.in
index be46f904b17..aec34eb69d3 100644
--- a/usr.bin/sudo/pathnames.h.in
+++ b/usr.bin/sudo/pathnames.h.in
@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: pathnames.h.in,v 1.65 2009/05/25 12:02:41 millert Exp $
  */
 
 /*
diff --git a/usr.bin/sudo/pwutil.c b/usr.bin/sudo/pwutil.c
index bbc3174dddb..29471b6bee9 100644
--- a/usr.bin/sudo/pwutil.c
+++ b/usr.bin/sudo/pwutil.c
@@ -52,10 +52,6 @@
 #include "sudo.h"
 #include "redblack.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: pwutil.c,v 1.23 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 #ifdef MYPW
 extern void (*my_setgrent) __P((void));
 extern void (*my_endgrent) __P((void));
diff --git a/usr.bin/sudo/redblack.c b/usr.bin/sudo/redblack.c
index ac8ea2d2136..95ac095b05f 100644
--- a/usr.bin/sudo/redblack.c
+++ b/usr.bin/sudo/redblack.c
@@ -57,10 +57,6 @@
 #include "sudo.h"
 #include "redblack.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: redblack.c,v 1.12 2009/06/29 13:36:20 millert Exp $";
-#endif /* lint */
-
 static void rbrepair		__P((struct rbtree *, struct rbnode *));
 static void rotate_left		__P((struct rbtree *, struct rbnode *));
 static void rotate_right	__P((struct rbtree *, struct rbnode *));
diff --git a/usr.bin/sudo/redblack.h b/usr.bin/sudo/redblack.h
index 8c7ead71cd2..b1938cada56 100644
--- a/usr.bin/sudo/redblack.h
+++ b/usr.bin/sudo/redblack.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: redblack.h,v 1.4 2008/11/09 14:13:12 millert Exp $
  */
 
 #ifndef _SUDO_REDBLACK_H
diff --git a/usr.bin/sudo/sample.sudoers b/usr.bin/sudo/sample.sudoers
index 220df7fa8da..0ef1579ecce 100644
--- a/usr.bin/sudo/sample.sudoers
+++ b/usr.bin/sudo/sample.sudoers
@@ -4,8 +4,6 @@
 # This file MUST be edited with the 'visudo' command as root.
 #
 # See the sudoers man page for the details on how to write a sudoers file.
-#
-# $Sudo: sample.sudoers,v 1.29 2008/10/03 19:55:57 millert Exp $
 
 ##
 # Override built-in defaults
diff --git a/usr.bin/sudo/set_perms.c b/usr.bin/sudo/set_perms.c
index 4417330f976..244bc40a923 100644
--- a/usr.bin/sudo/set_perms.c
+++ b/usr.bin/sudo/set_perms.c
@@ -51,10 +51,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: set_perms.c,v 1.49 2009/06/25 12:44:33 millert Exp $";
-#endif /* lint */
-
 #ifdef __TANDEM
 # define ROOT_UID	65535
 #else
diff --git a/usr.bin/sudo/sudo.c b/usr.bin/sudo/sudo.c
index 27af77a68c4..3ec16e83dc8 100644
--- a/usr.bin/sudo/sudo.c
+++ b/usr.bin/sudo/sudo.c
@@ -104,10 +104,6 @@
 # include "nonunix.h"
 #endif
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sudo.c,v 1.517 2009/05/27 00:49:07 millert Exp $";
-#endif /* lint */
-
 /*
  * Prototypes
  */
diff --git a/usr.bin/sudo/sudo.h b/usr.bin/sudo/sudo.h
index afb4e4e0bda..20e047653ab 100644
--- a/usr.bin/sudo/sudo.h
+++ b/usr.bin/sudo/sudo.h
@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: sudo.h,v 1.273 2009/05/25 12:02:41 millert Exp $
  */
 
 #ifndef _SUDO_SUDO_H
diff --git a/usr.bin/sudo/sudo.pod b/usr.bin/sudo/sudo.pod
index 2e3b0724469..963338d05f0 100644
--- a/usr.bin/sudo/sudo.pod
+++ b/usr.bin/sudo/sudo.pod
@@ -18,7 +18,6 @@ Sponsored in part by the Defense Advanced Research Projects
 Agency (DARPA) and Air Force Research Laboratory, Air Force
 Materiel Command, USAF, under agreement number F39502-99-1-0512.
 
-$Sudo: sudo.pod,v 1.125 2009/09/25 00:31:35 millert Exp $
 =pod
 
 =head1 NAME
diff --git a/usr.bin/sudo/sudo_edit.c b/usr.bin/sudo/sudo_edit.c
index d6a4da66a8a..04d5d7434e4 100644
--- a/usr.bin/sudo/sudo_edit.c
+++ b/usr.bin/sudo/sudo_edit.c
@@ -55,10 +55,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sudo_edit.c,v 1.39 2009/09/30 13:50:58 millert Exp $";
-#endif /* lint */
-
 extern sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp;
 extern char **environ;
 
diff --git a/usr.bin/sudo/sudo_noexec.c b/usr.bin/sudo/sudo_noexec.c
index 084000abd53..eff07b9ee68 100644
--- a/usr.bin/sudo/sudo_noexec.c
+++ b/usr.bin/sudo/sudo_noexec.c
@@ -28,10 +28,6 @@
 
 #include <compat.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sudo_noexec.c,v 1.12 2005/03/12 23:43:40 millert Exp $";
-#endif /* lint */
-
 /*
  * Dummy versions of the execve() family of syscalls.  We don't need
  * to stub out all of them, just the ones that correspond to actual
diff --git a/usr.bin/sudo/sudo_nss.c b/usr.bin/sudo/sudo_nss.c
index 138c0e2ad60..4dcdf2cb601 100644
--- a/usr.bin/sudo/sudo_nss.c
+++ b/usr.bin/sudo/sudo_nss.c
@@ -44,10 +44,6 @@
 #include "sudo.h"
 #include "lbuf.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sudo_nss.c,v 1.8 2009/05/25 12:02:41 millert Exp $";
-#endif /* lint */
-
 extern struct sudo_nss sudo_nss_file;
 #ifdef HAVE_LDAP
 extern struct sudo_nss sudo_nss_ldap;
diff --git a/usr.bin/sudo/sudo_nss.h b/usr.bin/sudo/sudo_nss.h
index 1822465a373..f036add7936 100644
--- a/usr.bin/sudo/sudo_nss.h
+++ b/usr.bin/sudo/sudo_nss.h
@@ -12,8 +12,6 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Sudo: sudo_nss.h,v 1.7 2009/05/25 12:02:42 millert Exp $
  */
 
 struct lbuf;
diff --git a/usr.bin/sudo/sudo_usage.h.in b/usr.bin/sudo/sudo_usage.h.in
index e310b0c8b31..4c0e8f217a3 100644
--- a/usr.bin/sudo/sudo_usage.h.in
+++ b/usr.bin/sudo/sudo_usage.h.in
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Sudo: sudo_usage.h.in,v 1.10 2009/05/25 12:02:42 millert Exp $
  */
 
 #ifndef _SUDO_USAGE_H
diff --git a/usr.bin/sudo/sudoers.ldap.pod b/usr.bin/sudo/sudoers.ldap.pod
index 7d59cb2fe41..a194651ca28 100644
--- a/usr.bin/sudo/sudoers.ldap.pod
+++ b/usr.bin/sudo/sudoers.ldap.pod
@@ -14,7 +14,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$Sudo: sudoers.ldap.pod,v 1.14 2009/05/29 13:43:12 millert Exp $
 =pod
 
 =head1 NAME
diff --git a/usr.bin/sudo/sudoers.pod b/usr.bin/sudo/sudoers.pod
index bbc2264d2bd..2f85b4445e1 100644
--- a/usr.bin/sudo/sudoers.pod
+++ b/usr.bin/sudo/sudoers.pod
@@ -18,7 +18,6 @@ Sponsored in part by the Defense Advanced Research Projects
 Agency (DARPA) and Air Force Research Laboratory, Air Force
 Materiel Command, USAF, under agreement number F39502-99-1-0512.
 
-$Sudo: sudoers.pod,v 1.173 2009/06/30 12:41:09 millert Exp $
 =pod
 
 =head1 NAME
diff --git a/usr.bin/sudo/sudoers2ldif b/usr.bin/sudo/sudoers2ldif
index df51b9f2c35..0fe0ad15bfe 100644
--- a/usr.bin/sudo/sudoers2ldif
+++ b/usr.bin/sudo/sudoers2ldif
@@ -5,8 +5,6 @@ use strict;
 # Converts a sudoers file to LDIF format in prepration for loading into
 # the LDAP server.
 #
-# $Sudo: sudoers2ldif,v 1.5 2007/12/08 00:09:28 millert Exp $
-#
 
 # BUGS:
 #   Does not yet handle multiple lines with : in them
diff --git a/usr.bin/sudo/term.c b/usr.bin/sudo/term.c
index d962fe668da..f3d0302e2db 100644
--- a/usr.bin/sudo/term.c
+++ b/usr.bin/sudo/term.c
@@ -50,10 +50,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: term.c,v 1.4 2009/02/25 10:47:12 millert Exp $";
-#endif /* lint */
-
 #ifndef TCSASOFT
 # define TCSASOFT	0
 #endif
diff --git a/usr.bin/sudo/testsudoers.c b/usr.bin/sudo/testsudoers.c
index c961432edd7..5dce63c117f 100644
--- a/usr.bin/sudo/testsudoers.c
+++ b/usr.bin/sudo/testsudoers.c
@@ -70,11 +70,6 @@
 # include "emul/fnmatch.h"
 #endif /* HAVE_FNMATCH */
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: testsudoers.c,v 1.131 2009/05/25 12:02:42 millert Exp $";
-#endif /* lint */
-
-
 /*
  * Globals
  */
diff --git a/usr.bin/sudo/tgetpass.c b/usr.bin/sudo/tgetpass.c
index 503cb972d4a..5d1e89829c3 100644
--- a/usr.bin/sudo/tgetpass.c
+++ b/usr.bin/sudo/tgetpass.c
@@ -56,10 +56,6 @@
 
 #include "sudo.h"
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: tgetpass.c,v 1.131 2009/05/25 12:02:42 millert Exp $";
-#endif /* lint */
-
 static volatile sig_atomic_t signo;
 
 static void handler __P((int));
diff --git a/usr.bin/sudo/visudo.c b/usr.bin/sudo/visudo.c
index b48fc24745f..ae2028aec60 100644
--- a/usr.bin/sudo/visudo.c
+++ b/usr.bin/sudo/visudo.c
@@ -86,10 +86,6 @@
 #include "redblack.h"
 #include <gram.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: visudo.c,v 1.234 2009/05/25 12:02:42 millert Exp $";
-#endif /* lint */
-
 struct sudoersfile {
     char *path;
     char *tpath;
diff --git a/usr.bin/sudo/visudo.pod b/usr.bin/sudo/visudo.pod
index 63cb1131295..d5da5f763dc 100644
--- a/usr.bin/sudo/visudo.pod
+++ b/usr.bin/sudo/visudo.pod
@@ -18,7 +18,6 @@ Sponsored in part by the Defense Advanced Research Projects
 Agency (DARPA) and Air Force Research Laboratory, Air Force
 Materiel Command, USAF, under agreement number F39502-99-1-0512.
 
-$Sudo: visudo.pod,v 1.55 2008/11/15 18:34:01 millert Exp $
 =pod
 
 =head1 NAME
diff --git a/usr.bin/sudo/zero_bytes.c b/usr.bin/sudo/zero_bytes.c
index 8ce2eb581bc..7391780aa0c 100644
--- a/usr.bin/sudo/zero_bytes.c
+++ b/usr.bin/sudo/zero_bytes.c
@@ -19,10 +19,6 @@
 #include <config.h>
 #include <compat.h>
 
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: zero_bytes.c,v 1.7 2008/11/09 14:13:12 millert Exp $";
-#endif /* lint */
-
 /*
  * Like bzero(3) but with a volatile pointer.  The hope is that
  * the compiler will not be able to optimize away this function.