summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2007-09-21 08:15:30 +0000
committerDamien Miller <djm@cvs.openbsd.org>2007-09-21 08:15:30 +0000
commitb7d34ffd4ad67446fdc4af94d1f761f575d7a0a3 (patch)
treea92353ff54def80621c9be63341f8b6c598665c0 /usr.bin/ssh/sshd
parent0f01e992d3d8a3d3204138d2f60fe570d1eb1981 (diff)
unifdef -DBSD_AUTH
unifdef -USKEY These options have been in use for some years; ok markus@ "no objection" millert@
Diffstat (limited to 'usr.bin/ssh/sshd')
-rw-r--r--usr.bin/ssh/sshd/Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index b8f3544c443..ddf954a1898 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2007/08/23 02:49:43 djm Exp $
+# $OpenBSD: Makefile,v 1.66 2007/09/21 08:15:29 djm Exp $
.PATH: ${.CURDIR}/..
@@ -7,13 +7,12 @@ BINOWN= root
BINMODE=555
BINDIR= /usr/sbin
MAN= sshd.8 sshd_config.5
-CFLAGS+=-DBSD_AUTH
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
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 \
- auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
+ auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
auth2-none.c auth2-passwd.c auth2-pubkey.c \
monitor_mm.c monitor.c monitor_wrap.c \
kexdhs.c kexgexs.c
@@ -40,9 +39,3 @@ CFLAGS+= -DLIBWRAP
DPADD+= ${LIBWRAP}
LDADD+= -lwrap
.endif
-
-#.if (${SKEY:L} == "yes")
-#CFLAGS+= -DSKEY
-#DPADD+= ${SKEY}
-#LDADD+= -lskey
-#.endif