- stevesk@cvs.openbsd.org 2002/03/04 17:27:39

     [auth-krb5.c auth-options.h auth.h authfd.h authfile.h bufaux.h buffer.h
      channels.h cipher.h compat.h compress.h crc32.h deattack.c getput.h
      groupaccess.c misc.c mpaux.h packet.h readconf.h rsa.h scard.h
      servconf.h ssh-agent.c ssh.h ssh2.h sshpty.h sshtty.c ttymodes.h
      uuencode.c xmalloc.h]
     $OpenBSD$ and RCSID() cleanup: don't use RCSID() in .h files; add
     missing RCSID() to .c files and remove dup /*$OpenBSD$*/ from .c
     files.  ok markus@

31 files changed, 66 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index d9c50409e..84d76a039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,15 @@
      error-> debug, because O_NONBLOCK for /dev/null causes too many different 
      errnos; ok stevesk@, deraadt@
      unused include
+   - stevesk@cvs.openbsd.org 2002/03/04 17:27:39
+     [auth-krb5.c auth-options.h auth.h authfd.h authfile.h bufaux.h buffer.h 
+      channels.h cipher.h compat.h compress.h crc32.h deattack.c getput.h 
+      groupaccess.c misc.c mpaux.h packet.h readconf.h rsa.h scard.h 
+      servconf.h ssh-agent.c ssh.h ssh2.h sshpty.h sshtty.c ttymodes.h 
+      uuencode.c xmalloc.h]
+     $OpenBSD$ and RCSID() cleanup: don't use RCSID() in .h files; add
+     missing RCSID() to .c files and remove dup /*$OpenBSD$*/ from .c
+     files.  ok markus@
 
 20020226
  - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
@@ -7776,4 +7785,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1903 2002/03/05 01:48:09 mouring Exp $
+$Id: ChangeLog,v 1.1904 2002/03/05 01:53:02 mouring Exp $
diff --git a/auth-krb5.c b/auth-krb5.c
index aaf146e76..2da0669ae 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -2,10 +2,11 @@
  *    Kerberos v5 authentication and ticket-passing routines.
  * 
  * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $
- * $OpenBSD: auth-krb5.c,v 1.5 2002/02/15 23:54:10 markus Exp $
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: auth-krb5.c,v 1.6 2002/03/04 17:27:39 stevesk Exp $");
+
 #include "ssh.h"
 #include "ssh1.h"
 #include "packet.h"
diff --git a/auth-options.h b/auth-options.h
index 3b2ce344b..aa6270fd6 100644
--- a/auth-options.h
+++ b/auth-options.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: auth-options.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $       */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* $OpenBSD: auth-options.h,v 1.10 2001/06/26 17:27:22 markus Exp $ */
-
 #ifndef AUTH_OPTIONS_H
 #define AUTH_OPTIONS_H
 
diff --git a/auth.h b/auth.h
index 841928093..c7175405d 100644
--- a/auth.h
+++ b/auth.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: auth.h,v 1.29 2002/03/04 17:27:39 stevesk Exp $       */
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -21,8 +23,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $OpenBSD: auth.h,v 1.28 2002/02/17 19:42:32 millert Exp $
  */
+
 #ifndef AUTH_H
 #define AUTH_H
 
diff --git a/authfd.h b/authfd.h
index f4901f4a1..0f2ca7a2e 100644
--- a/authfd.h
+++ b/authfd.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: authfd.h,v 1.23 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: authfd.h,v 1.22 2002/02/24 19:14:59 markus Exp $"); */
-
 #ifndef AUTHFD_H
 #define AUTHFD_H
 
diff --git a/authfile.h b/authfile.h
index c8b31fbe6..c614ca12c 100644
--- a/authfile.h
+++ b/authfile.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: authfile.h,v 1.9 2002/03/04 17:27:39 stevesk Exp $    */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -10,8 +12,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* $OpenBSD: authfile.h,v 1.8 2001/06/26 17:27:22 markus Exp $ */
-
 #ifndef AUTHFILE_H
 #define AUTHFILE_H
 
diff --git a/bufaux.h b/bufaux.h
index a5bbd6f4b..75b5a5a29 100644
--- a/bufaux.h
+++ b/bufaux.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: bufaux.h,v 1.16 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -10,8 +12,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: bufaux.h,v 1.15 2001/12/28 14:13:13 markus Exp $"); */
-
 #ifndef BUFAUX_H
 #define BUFAUX_H
 
diff --git a/buffer.h b/buffer.h
index badd16f3b..5e4c41244 100644
--- a/buffer.h
+++ b/buffer.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: buffer.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: buffer.h,v 1.10 2001/12/19 17:16:13 stevesk Exp $"); */
-
 #ifndef BUFFER_H
 #define BUFFER_H
 
diff --git a/channels.h b/channels.h
index b637ab32c..707d9a925 100644
--- a/channels.h
+++ b/channels.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: channels.h,v 1.65 2002/03/04 17:27:39 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -32,7 +34,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.64 2002/02/14 23:28:00 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
diff --git a/cipher.h b/cipher.h
index b800c9614..b3b0303c7 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: cipher.h,v 1.32 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -32,8 +34,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* RCSID("$OpenBSD: cipher.h,v 1.31 2002/02/18 13:05:32 markus Exp $"); */
-
 #ifndef CIPHER_H
 #define CIPHER_H
 
diff --git a/compat.h b/compat.h
index b6609efb0..0eeb782e8 100644
--- a/compat.h
+++ b/compat.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: compat.h,v 1.30 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -21,7 +23,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: compat.h,v 1.29 2001/09/20 13:50:40 markus Exp $"); */
 
 #ifndef COMPAT_H
 #define COMPAT_H
diff --git a/compress.h b/compress.h
index 2721d450c..e364f4bdc 100644
--- a/compress.h
+++ b/compress.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: compress.h,v 1.11 2002/03/04 17:27:39 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: compress.h,v 1.10 2001/06/26 17:27:23 markus Exp $"); */
-
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
diff --git a/crc32.h b/crc32.h
index bdabc1b09..cd1832ff6 100644
--- a/crc32.h
+++ b/crc32.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: crc32.h,v 1.13 2002/03/04 17:27:39 stevesk Exp $      */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1992 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: crc32.h,v 1.12 2001/06/26 17:27:23 markus Exp $"); */
-
 #ifndef CRC32_H
 #define CRC32_H
 
diff --git a/deattack.c b/deattack.c
index 12849a32d..0442501e7 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,5 +1,3 @@
-/*      $OpenBSD: deattack.c,v 1.17 2001/12/19 07:18:56 deraadt Exp $   */
-
 /*
  * Cryptographic attack detector for ssh - source code
  *
@@ -20,6 +18,8 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: deattack.c,v 1.18 2002/03/04 17:27:39 stevesk Exp $");
+
 #include "deattack.h"
 #include "log.h"
 #include "crc32.h"
diff --git a/getput.h b/getput.h
index 1a19d22cd..20cf8f20b 100644
--- a/getput.h
+++ b/getput.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: getput.h,v 1.8 2002/03/04 17:27:39 stevesk Exp $      */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: getput.h,v 1.7 2001/01/10 22:56:22 markus Exp $"); */
-
 #ifndef GETPUT_H
 #define GETPUT_H
 
diff --git a/groupaccess.c b/groupaccess.c
index cbfe72035..66dfa68fe 100644
--- a/groupaccess.c
+++ b/groupaccess.c
@@ -1,5 +1,3 @@
-/*      $OpenBSD: groupaccess.c,v 1.4 2001/06/26 17:27:23 markus Exp $  */
-
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
  *
@@ -25,6 +23,7 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: groupaccess.c,v 1.5 2002/03/04 17:27:39 stevesk Exp $");
 
 #include "groupaccess.h"
 #include "xmalloc.h"
diff --git a/misc.c b/misc.c
index 9e5a5aba6..e9fcef6ca 100644
--- a/misc.c
+++ b/misc.c
@@ -1,5 +1,3 @@
-/*      $OpenBSD: misc.c,v 1.18 2002/03/04 13:10:46 markus Exp $        */
-
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -25,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.18 2002/03/04 13:10:46 markus Exp $");
+RCSID("$OpenBSD: misc.c,v 1.19 2002/03/04 17:27:39 stevesk Exp $");
 
 #include "misc.h"
 #include "log.h"
diff --git a/mpaux.h b/mpaux.h
index 082b7fd47..2a312f5cb 100644
--- a/mpaux.h
+++ b/mpaux.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: mpaux.h,v 1.12 2002/03/04 17:27:39 stevesk Exp $      */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,8 +14,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: mpaux.h,v 1.11 2001/06/26 17:27:24 markus Exp $"); */
-
 #ifndef MPAUX_H
 #define MPAUX_H
 
diff --git a/packet.h b/packet.h
index 4caca34c8..d6bf2aab4 100644
--- a/packet.h
+++ b/packet.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: packet.h,v 1.33 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: packet.h,v 1.32 2001/12/28 14:50:54 markus Exp $"); */
-
 #ifndef PACKET_H
 #define PACKET_H
 
diff --git a/readconf.h b/readconf.h
index b1f01734d..4fa9040c9 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: readconf.h,v 1.42 2002/03/04 17:27:39 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: readconf.h,v 1.41 2002/02/10 01:07:05 deraadt Exp $"); */
-
 #ifndef READCONF_H
 #define READCONF_H
 
diff --git a/rsa.h b/rsa.h
index 2f596d491..957d86552 100644
--- a/rsa.h
+++ b/rsa.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: rsa.h,v 1.15 2002/03/04 17:27:39 stevesk Exp $        */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: rsa.h,v 1.14 2001/06/27 05:42:24 markus Exp $"); */
-
 #ifndef RSA_H
 #define RSA_H
 
diff --git a/scard.h b/scard.h
index 57189df1c..6ca99169b 100644
--- a/scard.h
+++ b/scard.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: scard.h,v 1.7 2002/03/04 17:27:39 stevesk Exp $       */
+
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -22,8 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $OpenBSD: scard.h,v 1.6 2001/08/01 22:03:33 markus Exp $ */
-
 #include <openssl/engine.h>
 
 #ifndef SCARD_H
diff --git a/servconf.h b/servconf.h
index 911725583..3134b222a 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: servconf.h,v 1.54 2002/03/04 17:27:39 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,8 +13,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: servconf.h,v 1.53 2002/01/29 14:32:03 markus Exp $"); */
-
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
diff --git a/ssh-agent.c b/ssh-agent.c
index 3b5d06c51..91d5d9459 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,5 +1,3 @@
-/*      $OpenBSD: ssh-agent.c,v 1.81 2002/02/05 15:50:12 stevesk Exp $  */
-
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,7 +34,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.81 2002/02/05 15:50:12 stevesk Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.82 2002/03/04 17:27:39 stevesk Exp $");
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
diff --git a/ssh.h b/ssh.h
index 383c7fe9b..fdf554df0 100644
--- a/ssh.h
+++ b/ssh.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: ssh.h,v 1.64 2002/03/04 17:27:39 stevesk Exp $        */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -10,8 +12,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: ssh.h,v 1.63 2001/05/24 18:57:53 stevesk Exp $"); */
-
 #ifndef SSH_H
 #define SSH_H
 
diff --git a/ssh2.h b/ssh2.h
index 77b4d0890..091e52b13 100644
--- a/ssh2.h
+++ b/ssh2.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: ssh2.h,v 1.8 2002/03/04 17:27:39 stevesk Exp $        */
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -52,7 +54,6 @@
  *
  *     192-255  Local extensions
  */
-/* RCSID("$OpenBSD: ssh2.h,v 1.7 2002/01/11 13:36:43 markus Exp $"); */
 
 /* ranges */
 
diff --git a/sshpty.h b/sshpty.h
index 4eb479f76..df65e284e 100644
--- a/sshpty.h
+++ b/sshpty.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: sshpty.h,v 1.4 2002/03/04 17:27:39 stevesk Exp $      */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,8 +14,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: sshpty.h,v 1.3 2001/06/26 17:27:25 markus Exp $"); */
-
 #ifndef SSHPTY_H
 #define SSHPTY_H
 
diff --git a/sshtty.c b/sshtty.c
index eed8cfdc2..5c016f80a 100644
--- a/sshtty.c
+++ b/sshtty.c
@@ -1,4 +1,3 @@
-/* $OpenBSD: sshtty.c,v 1.2 2001/12/19 07:18:56 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,6 +35,7 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: sshtty.c,v 1.3 2002/03/04 17:27:39 stevesk Exp $");
 
 #include "sshtty.h"
 #include "log.h"
diff --git a/ttymodes.h b/ttymodes.h
index ad980e98c..687059281 100644
--- a/ttymodes.h
+++ b/ttymodes.h
@@ -1,4 +1,5 @@
-/* RCSID("$OpenBSD: ttymodes.h,v 1.11 2001/04/14 16:33:20 stevesk Exp $"); */
+/*      $OpenBSD: ttymodes.h,v 1.12 2002/03/04 17:27:39 stevesk Exp $   */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/uuencode.c b/uuencode.c
index 685d2dfa7..89fcb0815 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,5 +1,3 @@
-/*      $OpenBSD: uuencode.c,v 1.14 2002/02/25 16:33:27 markus Exp $    */
-
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -27,8 +25,7 @@
 #include "includes.h"
 #include "xmalloc.h"
 #include "uuencode.h"
-
-RCSID("$OpenBSD: uuencode.c,v 1.14 2002/02/25 16:33:27 markus Exp $");
+RCSID("$OpenBSD: uuencode.c,v 1.15 2002/03/04 17:27:39 stevesk Exp $");
 
 int
 uuencode(u_char *src, u_int srclength,
diff --git a/xmalloc.h b/xmalloc.h
index e14d0141d..338a2d22d 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,3 +1,5 @@
+/*      $OpenBSD: xmalloc.h,v 1.8 2002/03/04 17:27:39 stevesk Exp $     */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,8 +16,6 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: xmalloc.h,v 1.7 2001/06/26 17:27:25 markus Exp $"); */
-
 #ifndef XMALLOC_H
 #define XMALLOC_H