diff --git a/src/lib/libutil/check_expire.c b/src/lib/libutil/check_expire.c
index e782d16a..ddae3325 100644
--- a/src/lib/libutil/check_expire.c
+++ b/src/lib/libutil/check_expire.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_expire.c,v 1.5 2002/02/19 19:06:05 mpech Exp $	*/
+/*	$OpenBSD: check_expire.c,v 1.6 2002/06/09 22:18:43 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
@@ -88,7 +88,7 @@ login_check_expire(back, pwd, class, lastchance)
 			warn = 0;
 		} else {
 			dead = login_getcaptime(lc, "password-dead", 0, 0);
-			warn = login_getcaptime(lc, "password-warn", 
+			warn = login_getcaptime(lc, "password-warn",
 			    2 * DAYSPERWEEK * SECSPERDAY,
 			    2 * DAYSPERWEEK * SECSPERDAY);
 			if (dead < 0) {
diff --git a/src/lib/libutil/fparseln.c b/src/lib/libutil/fparseln.c
index 63c4e851..ceb1143b 100644
--- a/src/lib/libutil/fparseln.c
+++ b/src/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $
+/*	$OpenBSD: fparseln.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $	*/
 /*	$NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $";
+static const char rcsid[] = "$OpenBSD: fparseln.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
diff --git a/src/lib/libutil/getmaxpartitions.c b/src/lib/libutil/getmaxpartitions.c
index 0afe6e7a..1efab27a 100644
--- a/src/lib/libutil/getmaxpartitions.c
+++ b/src/lib/libutil/getmaxpartitions.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getmaxpartitions.c,v 1.2 1996/06/17 07:46:01 downsj Exp $	*/
+/*	$OpenBSD: getmaxpartitions.c,v 1.3 2002/06/09 22:18:43 fgsch Exp $	*/
 /*	$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $";
+static const char rcsid[] = "$NetBSD: getmaxpartitions.c,v 1.1 1996/05/16 07:03:31 thorpej Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/src/lib/libutil/getrawpartition.c b/src/lib/libutil/getrawpartition.c
index 346701d1..69a34980 100644
--- a/src/lib/libutil/getrawpartition.c
+++ b/src/lib/libutil/getrawpartition.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getrawpartition.c,v 1.2 1996/06/17 07:46:02 downsj Exp $	*/
+/*	$OpenBSD: getrawpartition.c,v 1.3 2002/06/09 22:18:43 fgsch Exp $	*/
 /*	$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $";
+static const char rcsid[] = "$NetBSD: getrawpartition.c,v 1.1 1996/05/16 07:03:33 thorpej Exp $";
 #endif
 
 #include <sys/param.h>
@@ -50,7 +50,7 @@ int
 getrawpartition()
 {
 	int rawpart, mib[2];
-	size_t varlen; 
+	size_t varlen;
 
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_RAWPARTITION;
diff --git a/src/lib/libutil/login.c b/src/lib/libutil/login.c
index ae76b8a2..b82b58d9 100644
--- a/src/lib/libutil/login.c
+++ b/src/lib/libutil/login.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login.c,v 1.6 2001/02/05 09:46:50 deraadt Exp $	*/
+/*	$OpenBSD: login.c,v 1.7 2002/06/09 22:18:43 fgsch Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: login.c,v 1.6 2001/02/05 09:46:50 deraadt Exp $";
+static const char rcsid[] = "$Id: login.c,v 1.7 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/src/lib/libutil/login_tty.c b/src/lib/libutil/login_tty.c
index 8b88f4f6..b6580eb2 100644
--- a/src/lib/libutil/login_tty.c
+++ b/src/lib/libutil/login_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_tty.c,v 1.3 1996/06/17 07:46:02 downsj Exp $	*/
+/*	$OpenBSD: login_tty.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: login_tty.c,v 1.3 1996/06/17 07:46:02 downsj Exp $";
+static const char rcsid[] = "$Id: login_tty.c,v 1.4 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/src/lib/libutil/logout.c b/src/lib/libutil/logout.c
index ca7c6873..60ac6f87 100644
--- a/src/lib/libutil/logout.c
+++ b/src/lib/libutil/logout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logout.c,v 1.4 1998/07/13 02:11:13 millert Exp $	*/
+/*	$OpenBSD: logout.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: logout.c,v 1.4 1998/07/13 02:11:13 millert Exp $";
+static const char rcsid[] = "$Id: logout.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/src/lib/libutil/logwtmp.c b/src/lib/libutil/logwtmp.c
index cc9df123..86a0fabc 100644
--- a/src/lib/libutil/logwtmp.c
+++ b/src/lib/libutil/logwtmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logwtmp.c,v 1.4 1999/08/17 09:13:13 millert Exp $	*/
+/*	$OpenBSD: logwtmp.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: logwtmp.c,v 1.4 1999/08/17 09:13:13 millert Exp $";
+static const char rcsid[] = "$Id: logwtmp.c,v 1.5 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/src/lib/libutil/opendev.c b/src/lib/libutil/opendev.c
index 00426632..5e3f9076 100644
--- a/src/lib/libutil/opendev.c
+++ b/src/lib/libutil/opendev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opendev.c,v 1.6 2000/04/30 17:37:46 millert Exp $ */
+/*	$OpenBSD: opendev.c,v 1.7 2002/06/09 22:18:43 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2000, Todd C. Miller.  All rights reserved.
diff --git a/src/lib/libutil/passwd.c b/src/lib/libutil/passwd.c
index fa1830d3..68f718b7 100644
--- a/src/lib/libutil/passwd.c
+++ b/src/lib/libutil/passwd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: passwd.c,v 1.33 2002/05/24 21:27:38 deraadt Exp $	*/
+/*	$OpenBSD: passwd.c,v 1.34 2002/06/09 22:18:43 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: passwd.c,v 1.33 2002/05/24 21:27:38 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: passwd.c,v 1.34 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/src/lib/libutil/pty.c b/src/lib/libutil/pty.c
index c2493f2a..a03f2c0a 100644
--- a/src/lib/libutil/pty.c
+++ b/src/lib/libutil/pty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pty.c,v 1.8 2002/05/24 22:04:02 deraadt Exp $	*/
+/*	$OpenBSD: pty.c,v 1.9 2002/06/09 22:18:43 fgsch Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)pty.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: pty.c,v 1.8 2002/05/24 22:04:02 deraadt Exp $";
+static const char rcsid[] = "$Id: pty.c,v 1.9 2002/06/09 22:18:43 fgsch Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -94,10 +94,10 @@ openpty(amaster, aslave, name, termp, winp)
 						strlcpy(name, line, 16);
 					}
 					if (termp)
-						(void) tcsetattr(slave, 
+						(void) tcsetattr(slave,
 						    TCSAFLUSH, termp);
 					if (winp)
-						(void) ioctl(slave, TIOCSWINSZ, 
+						(void) ioctl(slave, TIOCSWINSZ,
 						    (char *)winp);
 					return (0);
 				}
@@ -125,7 +125,7 @@ forkpty(amaster, name, termp, winp)
 	case -1:
 		return (-1);
 	case 0:
-		/* 
+		/*
 		 * child
 		 */
 		(void) close(master);
diff --git a/src/lib/libutil/util.h b/src/lib/libutil/util.h
index dee86c93..7245ed03 100644
--- a/src/lib/libutil/util.h
+++ b/src/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.20 2002/02/17 19:42:26 millert Exp $	*/
+/*	$OpenBSD: util.h,v 1.21 2002/06/09 22:18:43 fgsch Exp $	*/
 /*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
 
 /*-
@@ -111,7 +111,7 @@ void	login_fbtab(char *, uid_t, gid_t);
 int	login_check_expire(struct __sFILE *, struct passwd *, char *, int);
 char   *readlabelfs(char *, int);
 const char *uu_lockerr(int _uu_lockresult);
-int     uu_lock(const char *_ttyname); 
+int     uu_lock(const char *_ttyname);
 int	uu_lock_txfr(const char *_ttyname, pid_t _pid);
 int     uu_unlock(const char *_ttyname);
 __END_DECLS
diff --git a/src/lib/libutil/uucplock.c b/src/lib/libutil/uucplock.c
index ff12b636..bbdf1fa3 100644
--- a/src/lib/libutil/uucplock.c
+++ b/src/lib/libutil/uucplock.c
@@ -1,4 +1,4 @@
-/* * $OpenBSD: uucplock.c,v 1.9 2002/05/26 09:29:02 deraadt Exp $*/
+/*	$OpenBSD: uucplock.c,v 1.10 2002/06/09 22:18:43 fgsch Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.