head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1.2.1
	RELENG_4_11:1.1.1.1.2.1.0.10
	RELENG_4_11_BP:1.1.1.1.2.1
	RELENG_4_10_0_RELEASE:1.1.1.1.2.1
	RELENG_4_10:1.1.1.1.2.1.0.8
	RELENG_4_10_BP:1.1.1.1.2.1
	RELENG_5_2_1_RELEASE:1.1.1.1
	RELENG_5_2_0_RELEASE:1.1.1.1
	RELENG_5_2:1.1.1.1.0.8
	RELENG_5_2_BP:1.1.1.1
	RELENG_4_9_0_RELEASE:1.1.1.1.2.1
	RELENG_4_9:1.1.1.1.2.1.0.6
	RELENG_4_9_BP:1.1.1.1.2.1
	RELENG_5_1_0_RELEASE:1.1.1.1
	RELENG_5_1:1.1.1.1.0.6
	RELENG_5_1_BP:1.1.1.1
	OpenSSH_3_6_1p1:1.1.1.1
	RELENG_4_8_0_RELEASE:1.1.1.1.2.1
	RELENG_4_8:1.1.1.1.2.1.0.4
	RELENG_4_8_BP:1.1.1.1.2.1
	RELENG_5_0_0_RELEASE:1.1.1.1
	RELENG_5_0:1.1.1.1.0.4
	RELENG_5_0_BP:1.1.1.1
	OpenSSH_3_5p1:1.1.1.1
	OPENSSH:1.1.1
	RELENG_4_7_0_RELEASE:1.1.1.1.2.1
	RELENG_4_7:1.1.1.1.2.1.0.2
	RELENG_4_7_BP:1.1.1.1.2.1
	RELENG_4:1.1.1.1.0.2
	OpenSSH_3_4p1:1.1.1.1
	OpenSSH_3_3p1:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2004.01.07.11.16.27;	author des;	state dead;
branches;
next	1.1;

1.1
date	2002.06.27.22.31.20;	author des;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.06.27.22.31.20;	author des;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2004.01.08.09.33.46;	author des;	state dead;
branches;
next	;

1.1.1.1.2.1
date	2002.07.03.22.12.07;	author des;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Resolve conflicts and remove obsolete files.

Sponsored by:	registrar.no
@
text
@ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAt6ttBacbgvLPsF1VWWfT51t55/5Mj62Xp8EaoH5SNSaLiGIgrrja077lKEept75U4uKFUYU5JJX9GPE9A7Y43LXv+/A6Jm4rEj/U0s4H8tf0UmzVC3t6xh0sRK0hYVNILyoHnIAgdY8CmOiybw7p6DxJY8MRAehD3n9+kFcachU= root@@xenon
1024 35 132789427207755621599908461558918671787816692978751485815532032934821830960131244604702969298486352138126114080367609979552547448841583955126231410604842765726397407176910594168641969541792069550006878863592030567875913190224374005367884774859544943329148178663694126456638431428703289837638970464685771819219 root@@xenon
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Vendor import of OpenSSH 3.3p1.
@
text
@@


1.1.1.2
log
@Remove obsolete files on the vendor branch.
@
text
@@


1.1.1.1.2.1
log
@Synch up to OpenSSH 3.4p1 - very nearly the same sources as in -CURRENT,
with a slightly different config.h to account for differences between
-CURRENT and -STABLE.

Privilege separation defaults to off for now as it breaks some aspects
of Kerberos authentication.

Sponsored by:	DARPA, NAI Labs
@
text
@@

