2 files changed, 4 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 59c06c0fb..5a1be997f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
    guarantees a conflict for each and every sync.
  - (dtucker) [openbsd-compat/strlcpy.c] Update from OpenBSD 1.8 -> 1.10.
  - (dtucker) [openbsd-compat/sigact.h] Add "OPENBSD ORIGINAL" marker.
+ - (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7.
+   Removal of rcsid, "whiteout" inode type.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3261,4 +3263,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.3964 2005/11/10 05:31:55 dtucker Exp $
+$Id: ChangeLog,v 1.3965 2005/11/10 05:38:54 dtucker Exp $
diff --git a/openbsd-compat/strmode.c b/openbsd-compat/strmode.c
index 0dbb23733..4a8161422 100644
--- a/openbsd-compat/strmode.c
+++ b/openbsd-compat/strmode.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: strmode.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,10 +33,6 @@
 #include "includes.h"
 #ifndef HAVE_STRMODE
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strmode.c,v 1.5 2003/06/11 21:08:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
@@ -72,11 +69,6 @@ strmode(int mode, char *p)
                 *p++ = 'p';
                 break;
 #endif
-#ifdef S_IFWHT
-        case S_IFWHT:                   /* whiteout */
-                *p++ = 'w';
-                break;
-#endif
         default:                        /* unknown */
                 *p++ = '?';
                 break;