diff options
| author | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
| commit | 72a8e501f778fe56e3ec3c32d99f77e20b9b24be (patch) | |
| tree | 038040484c6082020b918a9c208a38e77fd09e7d /crypto/openssh/ssh.h | |
| parent | 96f831106bfe6170a73a8112d39a8b123156c6f2 (diff) | |
| download | FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.zip FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.tar.gz | |
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/ssh.h')
| -rw-r--r-- | crypto/openssh/ssh.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index e23bb1d..ea71a56 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -1,4 +1,5 @@ -/* $OpenBSD: ssh.h,v 1.70 2002/06/03 12:04:07 deraadt Exp $ */ +/* $OpenBSD: ssh.h,v 1.71 2002/06/22 02:00:29 stevesk Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -65,8 +66,8 @@ #endif /* - * Name of the environment variable containing the pathname of the - * authentication socket. + * Name of the environment variable containing the process ID of the + * authentication agent. */ #define SSH_AGENTPID_ENV_NAME "SSH_AGENT_PID" |
