diff options
| author | kris <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
| commit | 24372e6c107e496b6909e6a488fe2303cef77299 (patch) | |
| tree | 3c5f04df23b54861f107ea20953c1aa478ade5f7 /crypto/openssh/readconf.h | |
| parent | 06ca4c9ec0ae64896cd4d42f586cdf3fa0c033ef (diff) | |
| download | FreeBSD-src-24372e6c107e496b6909e6a488fe2303cef77299.zip FreeBSD-src-24372e6c107e496b6909e6a488fe2303cef77299.tar.gz | |
Resolve conflicts and update for OpenSSH 2.2.0
Reviewed by: gshapiro, peter, green
Diffstat (limited to 'crypto/openssh/readconf.h')
| -rw-r--r-- | crypto/openssh/readconf.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crypto/openssh/readconf.h b/crypto/openssh/readconf.h index d7f44be..59b1b4c 100644 --- a/crypto/openssh/readconf.h +++ b/crypto/openssh/readconf.h @@ -1,20 +1,18 @@ /* - * - * readconf.h - * * Author: Tatu Ylonen <ylo@cs.hut.fi> - * * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved - * - * Created: Sat Apr 22 00:25:29 1995 ylo - * * Functions for reading the configuration file. * - * $FreeBSD$ + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$Id: readconf.h,v 1.18 2000/05/08 17:12:15 markus Exp $"); */ +/* RCSID("$OpenBSD: readconf.h,v 1.21 2000/09/07 20:27:53 deraadt Exp $"); */ +/* $FreeBSD$ */ #ifndef READCONF_H #define READCONF_H @@ -31,6 +29,7 @@ typedef struct { typedef struct { int forward_agent; /* Forward authentication agent. */ int forward_x11; /* Forward X11 display. */ + char *xauth_location; /* Location for xauth program */ int gateway_ports; /* Allow remote connects to forwarded ports. */ int use_privileged_port; /* Don't use privileged port if false. */ int rhosts_authentication; /* Try rhosts authentication. */ |
