Remove more Kerberos cruft.

ok jca@ jmc@

diff --git a/Makefile.cross b/Makefile.cross
index a73209c..7945ffe 100644 (file)
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.69 2014/03/18 22:36:27 miod Exp $
+# $OpenBSD: Makefile.cross,v 1.70 2014/04/23 18:24:23 ajacoutot Exp $
 
 cross-tools:   cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -107,8 +107,7 @@ BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
 .endfor
 
 # no libcrypto.... these won't build
-#NO_CROSS+=    dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet \
-#              ftp gzsig sasyncd vnconfig
+#NO_CROSS+=    dc passwd ppp tcpdump telnet ftp gzsig sasyncd vnconfig
                
 # explicit cross-compile
 NO_CROSS+=bind

diff --git a/libexec/login_reject/login_reject.8 b/libexec/login_reject/login_reject.8
index c44d4c3..d9b8175 100644 (file)
--- a/libexec/login_reject/login_reject.8
+++ b/libexec/login_reject/login_reject.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login_reject.8,v 1.6 2007/05/31 19:19:40 jmc Exp $
+.\" $OpenBSD: login_reject.8,v 1.7 2014/04/23 18:24:23 ajacoutot Exp $
 .\"
 .\" Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -32,7 +32,7 @@
 .\"
 .\"    BSDI    $From: login_reject.8,v 1.2 1996/08/01 21:02:26 prb Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 23 2014 $
 .Dt LOGIN_REJECT 8
 .Os
 .Sh NAME
@@ -61,11 +61,11 @@ For example, a class entry (see
 .Xr login.conf 5 )
 may contain:
 .Bd -literal -offset indent
-:auth=krb-or-pwd,kerberos,passwd:
+:auth=passwd:
 :auth-ftp=reject:
 .Ed
 .Pp
-which would allow authentication for this class in most situations
+which would allow password authentication for this class
 but would reject attempts to authenticate from
 .Xr ftpd 8 .
 .Sh SEE ALSO

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index c9e49fd..e651be7 100644 (file)
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.README,v 1.54 2014/04/22 11:05:22 henning Exp $
+#      $OpenBSD: bsd.README,v 1.55 2014/04/23 18:24:23 ajacoutot Exp $
 #      $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #      @(#)bsd.README  5.1 (Berkeley) 5/11/90
 
@@ -335,9 +335,7 @@ DPADD               Additional dependencies for the program.  Usually used for
 
                The following libraries are predefined for DPADD:
 
-                       LIBASN1         /usr/lib/libasn1.a
                        LIBC            /usr/lib/libc.a
-                       LIBCOM_ERR      /usr/lib/libcom_err.a
                        LIBCRYPTO       /usr/lib/libcrypto.a
                        LIBCURSES       /usr/lib/libcurses.a
                        LIBEDIT         /usr/lib/libedit.a
@@ -345,13 +343,7 @@ DPADD              Additional dependencies for the program.  Usually used for
                        LIBEXPAT        /usr/lib/libexpat.a
                        LIBFORM         /usr/lib/libform.a
                        LIBFORMW        /usr/lib/libformw.a
-                       LIBGSSAPI       /usr/lib/libgssapi.a
-                       LIBHDB          /usr/lib/libhdb.a
-                       LIBKADM5CLNT    /usr/lib/libkadm5clnt.a
-                       LIBKADM5SRV     /usr/lib/libkadm5srv.a
-                       LIBKAFS         /usr/lib/libkafs.a
                        LIBKEYNOTE      /usr/lib/libkeynote.a
-                       LIBKRB5         /usr/lib/libkrb5.a
                        LIBKVM          /usr/lib/libkvm.a
                        LIBL            /usr/lib/libl.a
                        LIBM            /usr/lib/libm.a
@@ -364,7 +356,6 @@ DPADD               Additional dependencies for the program.  Usually used for
                        LIBPCAP         /usr/lib/libpcap.a
                        LIBPERL         /usr/lib/libperl.a
                        LIBPTHREAD      /usr/lib/libpthread.a
-                       LIBROKEN        /usr/lib/libroken.a
                        LIBRPCSVC       /usr/lib/librpcsvc.a
                        LIBSKEY         /usr/lib/libskey.a
                        LIBSNDIO        /usr/lib/libsndio.a
@@ -373,8 +364,6 @@ DPADD               Additional dependencies for the program.  Usually used for
                        LIBTERMLIB      /usr/lib/libtermlib.a
                        LIBUSB          /usr/lib/libusbhid.a
                        LIBUTIL         /usr/lib/libutil.a
-                       LIBWIND         /usr/lib/libwind.a
-                       LIBWRAP         /usr/lib/libwrap.a
                        LIBY            /usr/lib/liby.a
                        LIBZ            /usr/lib/libz.a
                        LIBARCH         arch-dependent stuff

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 5cd14a3..488c18a 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: bsd.prog.mk,v 1.62 2013/12/04 22:58:24 deraadt Exp $
+#      $OpenBSD: bsd.prog.mk,v 1.63 2014/04/23 18:24:23 ajacoutot Exp $
 #      $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #      @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
 
@@ -27,9 +27,7 @@ CRTBEGIN?=       ${DESTDIR}/usr/lib/crtbegin.o
 CRTEND?=         ${DESTDIR}/usr/lib/crtend.o
 
 LIBCRT0?=      ${DESTDIR}/usr/lib/crt0.o
-LIBASN1?=      ${DESTDIR}/usr/lib/libasn1.a
 LIBC?=         ${DESTDIR}/usr/lib/libc.a
-LIBCOM_ERR?=   ${DESTDIR}/usr/lib/libcom_err.a
 LIBCRYPTO?=    ${DESTDIR}/usr/lib/libcrypto.a
 LIBCURSES?=    ${DESTDIR}/usr/lib/libcurses.a
 LIBEDIT?=      ${DESTDIR}/usr/lib/libedit.a
@@ -37,13 +35,7 @@ LIBEVENT?=   ${DESTDIR}/usr/lib/libevent.a
 LIBEXPAT?=     ${DESTDIR}/usr/lib/libexpat.a
 LIBFORM?=      ${DESTDIR}/usr/lib/libform.a
 LIBFORMW?=     ${DESTDIR}/usr/lib/libformw.a
-LIBGSSAPI?=    ${DESTDIR}/usr/lib/libgssapi.a
-LIBHDB?=       ${DESTDIR}/usr/lib/libhdb.a
-LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a
-LIBKADM5SRV?=  ${DESTDIR}/usr/lib/libkadm5srv.a
-LIBKAFS?=      ${DESTDIR}/usr/lib/libkafs.a
 LIBKEYNOTE?=   ${DESTDIR}/usr/lib/libkeynote.a
-LIBKRB5?=      ${DESTDIR}/usr/lib/libkrb5.a
 LIBKVM?=       ${DESTDIR}/usr/lib/libkvm.a
 LIBL?=         ${DESTDIR}/usr/lib/libl.a
 LIBM?=         ${DESTDIR}/usr/lib/libm.a
@@ -56,7 +48,6 @@ LIBPANELW?=   ${DESTDIR}/usr/lib/libpanelw.a
 LIBPCAP?=      ${DESTDIR}/usr/lib/libpcap.a
 LIBPERL?=      ${DESTDIR}/usr/lib/libperl.a
 LIBPTHREAD?=   ${DESTDIR}/usr/lib/libpthread.a
-LIBROKEN?=     ${DESTDIR}/usr/lib/libroken.a
 LIBRPCSVC?=    ${DESTDIR}/usr/lib/librpcsvc.a
 LIBSKEY?=      ${DESTDIR}/usr/lib/libskey.a
 LIBSNDIO?=     ${DESTDIR}/usr/lib/libsndio.a
@@ -65,8 +56,6 @@ LIBTERMCAP?=  ${DESTDIR}/usr/lib/libtermcap.a
 LIBTERMLIB?=   ${DESTDIR}/usr/lib/libtermlib.a
 LIBUSB?=       ${DESTDIR}/usr/lib/libusbhid.a
 LIBUTIL?=      ${DESTDIR}/usr/lib/libutil.a
-LIBWIND?=      ${DESTDIR}/usr/lib/libwind.a
-LIBWRAP?=      ${DESTDIR}/usr/lib/libwrap.a
 LIBY?=         ${DESTDIR}/usr/lib/liby.a
 LIBZ?=         ${DESTDIR}/usr/lib/libz.a
 

diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index ef8af4c..6523695 100644 (file)
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,8 +1,8 @@
-.\"    $OpenBSD: skeyinit.1,v 1.37 2014/03/20 20:39:13 naddy Exp $
+.\"    $OpenBSD: skeyinit.1,v 1.38 2014/04/23 18:24:23 ajacoutot Exp $
 .\"    $NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"    @(#)skeyinit.1  1.1     10/28/93
 .\"
-.Dd $Mdocdate: March 20 2014 $
+.Dd $Mdocdate: April 23 2014 $
 .Dt SKEYINIT 1
 .Os
 .Sh NAME
@@ -69,8 +69,7 @@ The options are as follows:
 Before an S/Key entry can be initialised,
 the user must authenticate themselves to the system.
 This option allows the authentication type to be specified, such as
-.Dq krb5 ,
-.Dq passwd ,
+.Dq passwd
 or
 .Dq skey .
 .It Fl C

diff --git a/usr.bin/skeyinit/skeyinit.c b/usr.bin/skeyinit/skeyinit.c
index 9a20ddb..6554261 100644 (file)
--- a/usr.bin/skeyinit/skeyinit.c
+++ b/usr.bin/skeyinit/skeyinit.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: skeyinit.c,v 1.53 2014/03/20 20:39:13 naddy Exp $     */
+/*     $OpenBSD: skeyinit.c,v 1.54 2014/04/23 18:24:23 ajacoutot Exp $ */
 
 /* OpenBSD S/Key (skeyinit.c)
  *
@@ -184,7 +184,7 @@ main(int argc, char **argv)
 "secure mode this is normally done via an existing S/Key key.  However, since\n"
 "you do not have an entry in the S/Key database you will have to specify an\n"
 "alternate authentication type via the `-a' flag, e.g.\n"
-"    \"skeyinit -s -a krb5\" or \"skeyinit -s -a passwd\"\n\n"
+"    \"skeyinit -s -a passwd\"\n\n"
 "Note that entering a plaintext password over a non-secure link defeats the\n"
 "purpose of using S/Key in the fist place.\n");
                        exit(1);