summaryrefslogtreecommitdiff
path: root/crypto/openssh
diff options
context:
space:
mode:
authorKen Smith <kensmith@FreeBSD.org>2011-02-16 16:18:46 +0000
committerKen Smith <kensmith@FreeBSD.org>2011-02-16 16:18:46 +0000
commitdec99dafe5763ba1db6950342aa80a634169c083 (patch)
tree1bd9f5a688ac947b00e690c3c69ccb8df203768d /crypto/openssh
parent045f17e533c0209bbcddcccbbb0192d61ffd6c9c (diff)
Diffstat (limited to 'crypto/openssh')
-rw-r--r--crypto/openssh/FREEBSD-tricks2
-rw-r--r--crypto/openssh/FREEBSD-upgrade2
-rw-r--r--crypto/openssh/FREEBSD-vendor2
-rw-r--r--crypto/openssh/auth-krb5.c2
-rw-r--r--crypto/openssh/auth-pam.c2
-rw-r--r--crypto/openssh/auth.c2
-rw-r--r--crypto/openssh/auth2.c2
-rw-r--r--crypto/openssh/readconf.c2
-rw-r--r--crypto/openssh/schnorr.c2
-rw-r--r--crypto/openssh/servconf.c2
-rw-r--r--crypto/openssh/session.c2
-rw-r--r--crypto/openssh/sftp-server.82
-rw-r--r--crypto/openssh/sftp.12
-rw-r--r--crypto/openssh/ssh-agent.12
-rw-r--r--crypto/openssh/ssh-agent.c2
-rw-r--r--crypto/openssh/ssh-keygen.12
-rw-r--r--crypto/openssh/ssh-keyscan.12
-rw-r--r--crypto/openssh/ssh.12
-rw-r--r--crypto/openssh/ssh.c2
-rw-r--r--crypto/openssh/ssh_config2
-rw-r--r--crypto/openssh/ssh_config.52
-rw-r--r--crypto/openssh/ssh_namespace.h2
-rw-r--r--crypto/openssh/sshconnect.c2
-rw-r--r--crypto/openssh/sshd.82
-rw-r--r--crypto/openssh/sshd.c2
-rw-r--r--crypto/openssh/sshd_config2
-rw-r--r--crypto/openssh/sshd_config.52
-rw-r--r--crypto/openssh/version.c2
-rw-r--r--crypto/openssh/version.h2
29 files changed, 29 insertions, 29 deletions
diff --git a/crypto/openssh/FREEBSD-tricks b/crypto/openssh/FREEBSD-tricks
index 480bffc1db19..cc66fbfbc607 100644
--- a/crypto/openssh/FREEBSD-tricks
+++ b/crypto/openssh/FREEBSD-tricks
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/FREEBSD-tricks,v 1.7.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
# Shell code to remove FreeBSD tags before merging
grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index 03b7dbf0fe1d..00be6f941438 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -121,4 +121,4 @@ Suzanne Vega, and a Sanford's #69 Deluxe Marker.
-- des@FreeBSD.org
-$FreeBSD$
+$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.15.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
diff --git a/crypto/openssh/FREEBSD-vendor b/crypto/openssh/FREEBSD-vendor
index 0fa56d03f5d5..b89c67d10d4b 100644
--- a/crypto/openssh/FREEBSD-vendor
+++ b/crypto/openssh/FREEBSD-vendor
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/FREEBSD-vendor,v 1.2.4.2.6.1 2010/12/21 17:09:25 kensmith Exp $
Project: Portable OpenSSH
ProjectURL: http://www.openssh.com/portable.html
Version: 5.2p1
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index d019fe202c5e..70e2fd8d84d5 100644
--- a/crypto/openssh/auth-krb5.c
+++ b/crypto/openssh/auth-krb5.c
@@ -2,7 +2,7 @@
/*
* 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 $
+ * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.24.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
*/
/*
* Copyright (c) 2002 Daniel Kouril. All rights reserved.
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
index fc79dee80e81..c18739f89954 100644
--- a/crypto/openssh/auth-pam.c
+++ b/crypto/openssh/auth-pam.c
@@ -45,7 +45,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* Based on $FreeBSD$ */
+/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $ */
#include "includes.h"
#include <sys/types.h>
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c
index 2917414304d8..a399ff16c7da 100644
--- a/crypto/openssh/auth.c
+++ b/crypto/openssh/auth.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.22.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c
index 50fb3396f04c..581c9365b418 100644
--- a/crypto/openssh/auth2.c
+++ b/crypto/openssh/auth2.c
@@ -24,7 +24,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 6c4bb34537aa..aa2c6654c000 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.31.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/crypto/openssh/schnorr.c b/crypto/openssh/schnorr.c
index daeec0627a38..19d944099f72 100644
--- a/crypto/openssh/schnorr.c
+++ b/crypto/openssh/schnorr.c
@@ -1,5 +1,5 @@
/* $OpenBSD: schnorr.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/schnorr.c,v 1.1.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $ */
/*
* Copyright (c) 2008 Damien Miller. All rights reserved.
*
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index a1ef484d042b..d0168fce9def 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -11,7 +11,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/servconf.c,v 1.51.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index aad0979e7fdf..8f82c6b725f4 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -34,7 +34,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.52.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/param.h>
diff --git a/crypto/openssh/sftp-server.8 b/crypto/openssh/sftp-server.8
index feff8e3f1020..7e71f3a7b919 100644
--- a/crypto/openssh/sftp-server.8
+++ b/crypto/openssh/sftp-server.8
@@ -1,5 +1,5 @@
.\" $OpenBSD: sftp-server.8,v 1.19 2010/01/09 03:36:00 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sftp-server.8,v 1.3.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
.\"
diff --git a/crypto/openssh/sftp.1 b/crypto/openssh/sftp.1
index 86dc5b2350de..9120d9d1c831 100644
--- a/crypto/openssh/sftp.1
+++ b/crypto/openssh/sftp.1
@@ -1,5 +1,5 @@
.\" $OpenBSD: sftp.1,v 1.83 2010/02/08 10:50:20 markus Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sftp.1,v 1.4.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
diff --git a/crypto/openssh/ssh-agent.1 b/crypto/openssh/ssh-agent.1
index 99e9326698a1..687a5edd8fc4 100644
--- a/crypto/openssh/ssh-agent.1
+++ b/crypto/openssh/ssh-agent.1
@@ -1,5 +1,5 @@
.\" $OpenBSD: ssh-agent.1,v 1.50 2010/01/17 21:49:09 tedu Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh-agent.1,v 1.3.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 320591bf91e9..1c3d49cca73b 100644
--- a/crypto/openssh/ssh-agent.c
+++ b/crypto/openssh/ssh-agent.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/ssh-agent.c,v 1.29.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/param.h>
diff --git a/crypto/openssh/ssh-keygen.1 b/crypto/openssh/ssh-keygen.1
index 71c9c0bf5e28..c874b661e019 100644
--- a/crypto/openssh/ssh-keygen.1
+++ b/crypto/openssh/ssh-keygen.1
@@ -1,5 +1,5 @@
.\" $OpenBSD: ssh-keygen.1,v 1.88 2010/03/08 00:28:55 djm Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh-keygen.1,v 1.4.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.\" -*- nroff -*-
.\"
diff --git a/crypto/openssh/ssh-keyscan.1 b/crypto/openssh/ssh-keyscan.1
index 47a7c6e93b66..b1942c400718 100644
--- a/crypto/openssh/ssh-keyscan.1
+++ b/crypto/openssh/ssh-keyscan.1
@@ -1,5 +1,5 @@
.\" $OpenBSD: ssh-keyscan.1,v 1.28 2010/01/09 23:04:13 dtucker Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh-keyscan.1,v 1.4.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.\"
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
.\"
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1
index 2b6e6622734f..dfc2ea15051a 100644
--- a/crypto/openssh/ssh.1
+++ b/crypto/openssh/ssh.1
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: ssh.1,v 1.302 2010/03/05 10:28:21 djm Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.38.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.Dd March 5, 2010
.Dt SSH 1
.Os
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index 884d7e97821e..83a9df16deab 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -41,7 +41,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/ssh.c,v 1.34.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 1edf1648c706..32b150e690bc 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -1,5 +1,5 @@
# $OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/ssh_config,v 1.34.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
# This is the ssh client system-wide configuration file. See
# ssh_config(5) for more information. This file provides defaults for
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index 49ea5d167547..73104fb885d1 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.26.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.Dd March 5, 2010
.Dt SSH_CONFIG 5
.Os
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index caa14c8ca04d..3298eaeac552 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -9,7 +9,7 @@
*
* nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
*
- * $FreeBSD$
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.6.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
*/
#define a2port ssh_a2port
diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c
index a54d94270b97..d2587c678293 100644
--- a/crypto/openssh/sshconnect.c
+++ b/crypto/openssh/sshconnect.c
@@ -1,5 +1,5 @@
/* $OpenBSD: sshconnect.c,v 1.220 2010/03/04 10:36:03 djm Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/sshconnect.c,v 1.35.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
diff --git a/crypto/openssh/sshd.8 b/crypto/openssh/sshd.8
index 96bb26ea86b8..77369d201b33 100644
--- a/crypto/openssh/sshd.8
+++ b/crypto/openssh/sshd.8
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd.8,v 1.255 2010/03/05 06:50:35 jmc Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd.8,v 1.37.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.Dd March 5, 2010
.Dt SSHD 8
.Os
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 9cc12a3de498..8dce14a6b0bf 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -43,7 +43,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.48.2.4.4.1 2010/12/21 17:09:25 kensmith Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 44b75821e833..5a4943b3e0ae 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -1,5 +1,5 @@
# $OpenBSD: sshd_config,v 1.81 2009/10/08 14:03:41 markus Exp $
-# $FreeBSD$
+# $FreeBSD: src/crypto/openssh/sshd_config,v 1.49.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 4b2a681c9a18..36388608e245 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd_config.5,v 1.120 2010/03/04 23:17:25 djm Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.32.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $
.Dd March 4, 2010
.Dt SSHD_CONFIG 5
.Os
diff --git a/crypto/openssh/version.c b/crypto/openssh/version.c
index 88361ae651a3..e80c69132e67 100644
--- a/crypto/openssh/version.c
+++ b/crypto/openssh/version.c
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/crypto/openssh/version.c,v 1.7.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $");
#include <string.h>
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index d1d1452e99d1..1eabf89d2adf 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,5 +1,5 @@
/* $OpenBSD: version.h,v 1.57 2010/03/07 22:01:32 djm Exp $ */
-/* $FreeBSD$ */
+/* $FreeBSD: src/crypto/openssh/version.h,v 1.37.2.2.4.1 2010/12/21 17:09:25 kensmith Exp $ */
#ifndef SSH_VERSION