head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.1.2.5
	RELENG_4_11:1.1.1.1.2.5.0.10
	RELENG_4_11_BP:1.1.1.1.2.5
	RELENG_4_10_0_RELEASE:1.1.1.1.2.5
	RELENG_4_10:1.1.1.1.2.5.0.8
	RELENG_4_10_BP:1.1.1.1.2.5
	RELENG_4_9_0_RELEASE:1.1.1.1.2.5
	RELENG_4_9:1.1.1.1.2.5.0.6
	RELENG_4_9_BP:1.1.1.1.2.5
	RELENG_4_8_0_RELEASE:1.1.1.1.2.5
	RELENG_4_8:1.1.1.1.2.5.0.4
	RELENG_4_8_BP:1.1.1.1.2.5
	RELENG_4_7_0_RELEASE:1.1.1.1.2.5
	RELENG_4_7:1.1.1.1.2.5.0.2
	RELENG_4_7_BP:1.1.1.1.2.5
	RELENG_4_6_2_RELEASE:1.1.1.1.2.4.4.1
	RELENG_4_6_1_RELEASE:1.1.1.1.2.4.4.1
	OpenSSH_3_3:1.1.1.8
	RELENG_4_6_0_RELEASE:1.1.1.1.2.4
	RELENG_4_6:1.1.1.1.2.4.0.4
	RELENG_4_6_BP:1.1.1.1.2.4
	OpenSSH_3_1:1.1.1.7
	RELENG_4_5_0_RELEASE:1.1.1.1.2.4
	RELENG_4_5:1.1.1.1.2.4.0.2
	RELENG_4_5_BP:1.1.1.1.2.4
	RELENG_4_4_0_RELEASE:1.1.1.1.2.3
	RELENG_4_4:1.1.1.1.2.3.0.4
	RELENG_4_4_BP:1.1.1.1.2.3
	OpenSSH_2_9:1.1.1.6
	RELENG_4_3_0_RELEASE:1.1.1.1.2.3
	RELENG_4_3:1.1.1.1.2.3.0.2
	RELENG_4_3_BP:1.1.1.1.2.3
	OpenSSH_2_3_0:1.1.1.5
	OpenBSD:1.1.1
	RELENG_4_2_0_RELEASE:1.1.1.1.2.2
	RELENG_4_1_1_RELEASE:1.1.1.1.2.1
	v_2_2_0_2000_09_09:1.1.1.4
	PRE_SMPNG:1.1.1.3
	RELENG_4_1_0_RELEASE:1.1.1.1.2.1
	v_2_1_0_2000_05_30:1.1.1.3
	v_2_1:1.1.1.3
	v_1_2_3_2000_03_25:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v_1_2_2000_02_24:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


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

1.1
date	2000.02.24.14.29.47;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.02.24.14.29.47;	author markm;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2000.03.26.07.07.24;	author kris;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.05.15.04.37.24;	author kris;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2000.09.10.08.31.17;	author kris;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2000.12.05.02.20.19;	author green;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2001.05.04.03.57.05;	author green;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2002.03.18.09.55.03;	author des;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2002.06.23.14.01.54;	author des;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2000.06.09.07.10.31;	author kris;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2000.10.28.23.01.05;	author kris;	state Exp;
branches;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2001.01.12.04.26.21;	author green;	state Exp;
branches;
next	1.1.1.1.2.4;

1.1.1.1.2.4
date	2001.09.28.01.33.51;	author green;	state Exp;
branches
	1.1.1.1.2.4.4.1;
next	1.1.1.1.2.5;

1.1.1.1.2.5
date	2002.07.03.22.12.16;	author des;	state dead;
branches;
next	;

1.1.1.1.2.4.4.1
date	2002.07.16.12.33.21;	author des;	state dead;
branches;
next	;


desc
@@


1.2
log
@Forcibly revert to mainline.
@
text
@.PATH:		${.CURDIR}/..

PROG=	sshd
BINOWN=	root
BINMODE=555
BINDIR=	/usr/sbin
MAN=	sshd.8

SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
	pty.c log-server.c login.c servconf.c serverloop.c

.include <bsd.own.mk> # for KERBEROS and AFS

.if (${KERBEROS} == "yes")
CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
SRCS+=	auth-krb4.c
LDADD+=	 -lkrb
DPADD+=	 ${LIBKRB}
.if (${AFS} == "yes")
CFLAGS+= -DAFS
LDADD+=  -lkafs
DPADD+=  ${LIBKRBAFS}
.endif # AFS
.endif # KERBEROS

.if (${SKEY} == "yes")
SRCS+=	auth-skey.c
.endif

.include <bsd.prog.mk>

LDADD+=	-lcrypto -lutil -lz
DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}

.if (${TCP_WRAPPERS} == "yes")
CFLAGS+= -DLIBWRAP
LDADD+= -lwrap
DPADD+= ${LIBWRAP}
.endif

.if (${SKEY} == "yes")
CFLAGS+= -DSKEY
LDADD+= -lskey
DPADD+= ${SKEY}
.endif
@


1.1
log
@Initial revision
@
text
@@


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


1.1.1.1.2.1
log
@MFC: OpenSSH 2.1.0 snapshot
@
text
@d10 1
a10 2
	pty.c log-server.c login.c servconf.c serverloop.c \
	auth.c auth1.c auth2.c session.c
d15 4
a23 4
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
SRCS+=	auth-krb4.c
LDADD+=	 -lkrb
DPADD+=	 ${LIBKRB}
@


1.1.1.1.2.2
log
@MFC: OpenSSH 2.2.0
@
text
@a7 1
CFLAGS+=-DHAVE_LOGIN_CAP
d11 1
a11 1
	auth.c auth1.c auth2.c auth-options.c session.c
d15 2
a16 2
.if (${KERBEROS:L} == "yes")
.if (${AFS:L} == "yes")
d27 1
a27 1
.if (${SKEY:L} == "yes")
d36 1
a36 1
.if (${TCP_WRAPPERS:L} == "yes")
d42 1
a42 1
.if (${SKEY:L} == "yes")
@


1.1.1.1.2.3
log
@MFC: OpenSSH 2.3.0

Reviewed by:	freefall
@
text
@d12 1
a12 1
	auth.c auth1.c auth2.c auth-options.c session.c dh.c
d29 1
a29 1
SRCS+=	auth-skey.c auth2-skey.c
@


1.1.1.1.2.4
log
@MFC: OpenSSH 2.9

The only difference between this and what's in -CURRENT is that the
default /etc/ssh/ssh_config sets "Protocol 1,2" for all hosts.  This can
be overrided entirely in user ~/.ssh/config files, as always.
@
text
@a0 2
#	$OpenBSD: Makefile,v 1.38 2001/03/29 21:17:40 markus Exp $

d11 2
a12 3
	sshpty.c sshlogin.c servconf.c serverloop.c \
	auth.c auth1.c auth2.c auth-options.c session.c \
	auth-chall.c auth2-chall.c groupaccess.c
d27 4
@


1.1.1.1.2.4.4.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@@


1.1.1.1.2.5
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
@@


1.1.1.2
log
@Virgin import of OpenSSH sources dated 2000/03/25
@
text
@d15 4
a23 4
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
SRCS+=	auth-krb4.c
LDADD+=	 -lkrb
DPADD+=	 ${LIBKRB}
@


1.1.1.3
log
@Initial import of OpenSSH v2.1.
@
text
@d10 1
a10 2
	pty.c log-server.c login.c servconf.c serverloop.c \
	auth.c auth1.c auth2.c session.c
@


1.1.1.4
log
@Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09
@
text
@a7 1
CFLAGS+=-DHAVE_LOGIN_CAP
d11 1
a11 1
	auth.c auth1.c auth2.c auth-options.c session.c
d15 2
a16 2
.if (${KERBEROS:L} == "yes")
.if (${AFS:L} == "yes")
d27 1
a27 1
.if (${SKEY:L} == "yes")
d36 1
a36 1
.if (${TCP_WRAPPERS:L} == "yes")
d42 1
a42 1
.if (${SKEY:L} == "yes")
@


1.1.1.5
log
@Import of OpenSSH 2.3.0 (virgin OpenBSD source release).
@
text
@d12 1
a12 1
	auth.c auth1.c auth2.c auth-options.c session.c dh.c
d29 1
a29 1
SRCS+=	auth-skey.c auth2-skey.c
@


1.1.1.6
log
@Say "hi" to the latest in the OpenSSH series, version 2.9!

Happy birthday to:	rwatson
@
text
@a0 2
#	$OpenBSD: Makefile,v 1.38 2001/03/29 21:17:40 markus Exp $

d11 2
a12 3
	sshpty.c sshlogin.c servconf.c serverloop.c \
	auth.c auth1.c auth2.c auth-options.c session.c \
	auth-chall.c auth2-chall.c groupaccess.c
d27 4
@


1.1.1.7
log
@Vendor import of OpenSSH 3.1
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.46 2002/03/05 00:49:51 deraadt Exp $
d10 1
a10 1
CFLAGS+=-DHAVE_LOGIN_CAP -DBSD_AUTH
d15 1
a15 2
	auth-chall.c auth2-chall.c groupaccess.c \
	auth-skey.c auth-bsdauth.c
a18 7
.if (${KERBEROS5:L} == "yes")
CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV
SRCS+=  auth-krb5.c
LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1}
.endif # KERBEROS5

d33 1
a33 1
LDADD+=	-lcrypto -lutil -lz -ldes
d42 5
a46 5
#.if (${SKEY:L} == "yes")
#CFLAGS+= -DSKEY
#LDADD+= -lskey
#DPADD+= ${SKEY}
#.endif
@


1.1.1.8
log
@Vendor import of OpenSSH 3.3.
@
text
@d1 1
a1 1
#	$OpenBSD: Makefile,v 1.51 2002/06/20 19:56:07 stevesk Exp $
d9 1
a9 1
MAN=	sshd.8 sshd_config.5
d13 1
a13 1
	sshpty.c sshlogin.c servconf.c serverloop.c uidswap.c \
d16 1
a16 3
	auth-skey.c auth-bsdauth.c monitor_mm.c monitor.c \
	auth2-none.c auth2-passwd.c auth2-pubkey.c \
	auth2-hostbased.c auth2-kbdint.c
d24 1
a24 1
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR}
d31 1
a31 1
DPADD+=  ${LIBKAFS}
d42 1
a42 1
DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES}
@


