2 files changed, 6 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 367127ebc..665044558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
  - (dtucker) [openbsd-compat/{LOTS}] Move the "OPENBSD ORIGINAL" markers to
    after the copyright notices.  Having them at the top next to the CVSIDs
    guarantees a conflict for each and every sync.
+ - (dtucker) [openbsd-compat/strlcpy.c] Update from OpenBSD 1.8 -> 1.10.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3259,4 +3260,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3962 2005/11/10 05:18:56 dtucker Exp $
+$Id: ChangeLog,v 1.3963 2005/11/10 05:26:17 dtucker Exp $
diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c
index 736421202..679a5b291 100644
--- a/openbsd-compat/strlcpy.c
+++ b/openbsd-compat/strlcpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
+/*      $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $      */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -21,10 +21,6 @@
 #include "includes.h"
 #ifndef HAVE_STRLCPY
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <string.h>
 
@@ -36,9 +32,9 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp
 size_t
 strlcpy(char *dst, const char *src, size_t siz)
 {
-        register char *d = dst;
-        register const char *s = src;
-        register size_t n = siz;
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
 
         /* Copy as many bytes as will fit */
         if (n != 0 && --n != 0) {