- niklas@cvs.openbsd.org 2001/01/2001
     [atomicio.h canohost.h clientloop.h deattack.h dh.h dispatch.h
      groupaccess.c groupaccess.h hmac.h hostfile.h includes.h kex.h
      key.h log.h login.h match.h misc.h myproposal.h nchan.ms pathnames.h
      radix.h readpass.h rijndael.h serverloop.h session.h sftp.h ssh-add.1
      ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config
      sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h]
     $OpenBSD$
diff --git a/ChangeLog b/ChangeLog
index 7c38653..b1f276a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 20010128
  - (bal) Put USE_PIPES back into sco3.2v5
+ - (bal) OpenBSD Sync
+   - niklas@cvs.openbsd.org 2001/01/2001
+     [atomicio.h canohost.h clientloop.h deattack.h dh.h dispatch.h
+      groupaccess.c groupaccess.h hmac.h hostfile.h includes.h kex.h
+      key.h log.h login.h match.h misc.h myproposal.h nchan.ms pathnames.h
+      radix.h readpass.h rijndael.h serverloop.h session.h sftp.h ssh-add.1
+      ssh-dss.h ssh-keygen.1 ssh-keyscan.1 ssh-rsa.h ssh1.h ssh_config
+      sshconnect.h sshd_config tildexpand.h uidswap.h uuencode.h]
+     $OpenBSD$
 
 20010126
  - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen 
diff --git a/atomicio.h b/atomicio.h
index 15fc025..d025249 100644
--- a/atomicio.h
+++ b/atomicio.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: atomicio.h,v 1.2 2001/01/29 01:58:14 niklas Exp $	*/
+
 /*
  * Copyright (c) 1995,1999 Theo de Raadt
  * All rights reserved.
diff --git a/canohost.h b/canohost.h
index 572adb0..ba04c59 100644
--- a/canohost.h
+++ b/canohost.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: canohost.h,v 1.2 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/clientloop.h b/clientloop.h
index 58a1a7a..550c556 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: clientloop.h,v 1.3 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/deattack.h b/deattack.h
index 22930f6..3907159 100644
--- a/deattack.h
+++ b/deattack.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: deattack.h,v 1.5 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Cryptographic attack detector for ssh - Header file
  *
diff --git a/dh.h b/dh.h
index 09b11fd..f08d70e 100644
--- a/dh.h
+++ b/dh.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: dh.h,v 1.2 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  *
diff --git a/dispatch.h b/dispatch.h
index e60174c..0bee03b 100644
--- a/dispatch.h
+++ b/dispatch.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: dispatch.h,v 1.4 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/groupaccess.c b/groupaccess.c
index 9f72e57..ac9e00a 100644
--- a/groupaccess.c
+++ b/groupaccess.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: groupaccess.c,v 1.3 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
  *
diff --git a/groupaccess.h b/groupaccess.h
index 7e8584b..b4e5e42 100644
--- a/groupaccess.h
+++ b/groupaccess.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: groupaccess.h,v 1.2 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
  *
diff --git a/hmac.h b/hmac.h
index 9872b29..d9dc048 100644
--- a/hmac.h
+++ b/hmac.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: hmac.h,v 1.4 2001/01/29 01:58:15 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/hostfile.h b/hostfile.h
index dbdbd8f..e1f5d16 100644
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: hostfile.h,v 1.6 2001/01/29 01:58:16 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/includes.h b/includes.h
index fc269e8..18693c7 100644
--- a/includes.h
+++ b/includes.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: includes.h,v 1.14 2001/01/29 01:58:16 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/kex.h b/kex.h
index 143769a..f07e3d4 100644
--- a/kex.h
+++ b/kex.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: kex.h,v 1.12 2001/01/29 01:58:16 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/key.h b/key.h
index 00e7183..23a7634 100644
--- a/key.h
+++ b/key.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: key.h,v 1.9 2001/01/29 01:58:16 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/log.h b/log.h
index 4b82ee3..786e86d 100644
--- a/log.h
+++ b/log.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: log.h,v 1.2 2001/01/29 01:58:16 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/login.h b/login.h
index fc9b5de..4630eed 100644
--- a/login.h
+++ b/login.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: login.h,v 1.2 2001/01/29 01:58:16 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/match.h b/match.h
index 5afbe32..285ad55 100644
--- a/match.h
+++ b/match.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: match.h,v 1.6 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/misc.h b/misc.h
index 8205a60..1637042 100644
--- a/misc.h
+++ b/misc.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: misc.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/myproposal.h b/myproposal.h
index 5abb0e5..9dfecda 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: myproposal.h,v 1.10 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/nchan.ms b/nchan.ms
index 1679d39..2d08022 100644
--- a/nchan.ms
+++ b/nchan.ms
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: nchan.ms,v 1.7 2001/01/29 01:58:17 niklas Exp $
+.\"
 .\" 
 .\" Copyright (c) 1999 Markus Friedl.  All rights reserved.
 .\" 
diff --git a/pathnames.h b/pathnames.h
index 223d5a2..85d8a1f 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: pathnames.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/radix.h b/radix.h
index 993fa58..57592d8 100644
--- a/radix.h
+++ b/radix.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: radix.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Copyright (c) 1999 Dug Song.  All rights reserved.
  *
diff --git a/readpass.h b/readpass.h
index fa64b4b..d8da448 100644
--- a/readpass.h
+++ b/readpass.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: readpass.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/rijndael.h b/rijndael.h
index 09c4257..01b342e 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: rijndael.h,v 1.6 2001/01/29 01:58:17 niklas Exp $	*/
+
 #ifndef _RIJNDAEL_H_
 #define _RIJNDAEL_H_
 
diff --git a/serverloop.h b/serverloop.h
index 915bffe..652c1d9 100644
--- a/serverloop.h
+++ b/serverloop.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: serverloop.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/session.h b/session.h
index ee2e244..133e923 100644
--- a/session.h
+++ b/session.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: session.h,v 1.5 2001/01/29 01:58:18 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/sftp.h b/sftp.h
index 4fdc2b6..763056f 100644
--- a/sftp.h
+++ b/sftp.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: sftp.h,v 1.2 2001/01/29 01:58:18 niklas Exp $	*/
+
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
diff --git a/ssh-add.1 b/ssh-add.1
index 7d641c0..0656f62 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: ssh-add.1,v 1.20 2001/01/29 01:58:18 niklas Exp $
+.\"
 .\"  -*- nroff -*-
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/ssh-dss.h b/ssh-dss.h
index 4252f39..0e6a20a 100644
--- a/ssh-dss.h
+++ b/ssh-dss.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: ssh-dss.h,v 1.3 2001/01/29 01:58:18 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 9a9fac0..4fc7910 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: ssh-keygen.1,v 1.29 2001/01/29 01:58:18 niklas Exp $
+.\"
 .\"  -*- nroff -*-
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 31bae33..9f71705 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: ssh-keyscan.1,v 1.3 2001/01/29 01:58:18 niklas Exp $
+.\"
 .Dd January 1, 1996
 .Dt ssh-keyscan 1
 .Os
diff --git a/ssh-rsa.h b/ssh-rsa.h
index fac96c7..af2b2fe 100644
--- a/ssh-rsa.h
+++ b/ssh-rsa.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: ssh-rsa.h,v 1.3 2001/01/29 01:58:18 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/ssh1.h b/ssh1.h
index a7782ce..770c5e4 100644
--- a/ssh1.h
+++ b/ssh1.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: ssh1.h,v 1.2 2001/01/29 01:58:18 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/ssh_config b/ssh_config
index fdac131..e7dabbf 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,3 +1,5 @@
+#	$OpenBSD: ssh_config,v 1.7 2001/01/29 01:58:18 niklas Exp $
+
 # This is ssh client systemwide configuration file.  This file provides 
 # defaults for users, and the values can be changed in per-user configuration
 # files or on the command line.
diff --git a/sshconnect.h b/sshconnect.h
index 4e16f2d..8337cb7 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: sshconnect.h,v 1.5 2001/01/29 01:58:18 niklas Exp $	*/
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
diff --git a/sshd_config b/sshd_config
index ad8db27..25c0ec3 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,3 +1,5 @@
+#	$OpenBSD: sshd_config,v 1.27 2001/01/29 01:58:19 niklas Exp $
+
 # This is ssh server systemwide configuration file.
 
 Port 22
diff --git a/tildexpand.h b/tildexpand.h
index fc99977..88734f4 100644
--- a/tildexpand.h
+++ b/tildexpand.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: tildexpand.h,v 1.2 2001/01/29 01:58:19 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/uidswap.h b/uidswap.h
index 72f17d0..ab1a79c 100644
--- a/uidswap.h
+++ b/uidswap.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: uidswap.h,v 1.6 2001/01/29 01:58:19 niklas Exp $	*/
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/uuencode.h b/uuencode.h
index 2972e2d..42f83c2 100644
--- a/uuencode.h
+++ b/uuencode.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: uuencode.h,v 1.5 2001/01/29 01:58:19 niklas Exp $	*/
+
 /*
  * Copyright (c) 1999 Markus Friedl.  All rights reserved.
  *