Import of OpenSSH 3.7p1

[gssapi-openssh.git] / openssh / openbsd-compat / strmode.c

diff --git a/openssh/openbsd-compat/strmode.c b/openssh/openbsd-compat/strmode.c
index e64d19869ebc9f953d9f06054404429da9fadfcb..adf5e273e39cff146bde084f26c6cf26d6abd7da 100644 (file)
--- a/openssh/openbsd-compat/strmode.c
+++ b/openssh/openbsd-compat/strmode.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -35,15 +31,17 @@
 #ifndef HAVE_STRMODE
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strmode.c,v 1.3 1997/06/13 13:57:20 deraadt Exp $";
+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>
 
+/* XXX mode should be mode_t */
+
 void
-strmode(register mode_t mode, register char *p)
+strmode(int mode, char *p)
 {
         /* print type */
        switch (mode & S_IFMT) {