Date: Fri, 1 Jun 2001 22:25:55 -0400 From: "John W. De Boskey" <jwd@bsdwins.com> To: Mark Murray <mark@grondar.za> Cc: Nick Sayer <nsayer@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/kerberosIV/usr.bin/telnet Makefile src/kerberosIV/libexec/telnetd Makefile Message-ID: <20010601222555.A10127@bsdwins.com> In-Reply-To: <3B181EF0.8030005@quack.kfu.com>; from nsayer@quack.kfu.com on Fri, Jun 01, 2001 at 04:02:08PM -0700 References: <200105312255.f4VMtju99383@freefall.freebsd.org> <200106010630.f516UY690860@gratis.grondar.za> <3B181EF0.8030005@quack.kfu.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Is this more like what you're looking for? http://people.freebsd.org/~jwd/kerb2.patch I'll commit this if you'd like. -John (or, with tabs messed up)... Index: kerberosIV/libexec/telnetd/Makefile =================================================================== RCS file: /home/ncvs/src/kerberosIV/libexec/telnetd/Makefile,v retrieving revision 1.7.2.2 diff -u -r1.7.2.2 Makefile --- kerberosIV/libexec/telnetd/Makefile 2001/05/31 22:55:45 1.7.2.2 +++ kerberosIV/libexec/telnetd/Makefile 2001/06/02 02:15:22 @@ -16,7 +16,13 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \ ${LIBCRYPT} ${LIBCOM_ERR} LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \ - -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lpam + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp + +.if !defined(NOPAM) +CFLAGS+=-DUSE_PAM +DPADD+= ${LIBPAM} +LDADD+= ${MINUSLPAM} +.endif .include <bsd.prog.mk> Index: kerberosIV/usr.bin/telnet/Makefile =================================================================== RCS file: /home/ncvs/src/kerberosIV/usr.bin/telnet/Makefile,v retrieving revision 1.8.2.1 diff -u -r1.8.2.1 Makefile --- kerberosIV/usr.bin/telnet/Makefile 2001/05/31 22:55:44 1.8.2.1 +++ kerberosIV/usr.bin/telnet/Makefile 2001/06/02 02:17:32 @@ -12,8 +12,13 @@ DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBIPSEC} LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto \ - -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec \ - -lpam + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec + +.if !defined(NOPAM) +CFLAGS+=-DUSE_PAM +DPADD+= ${LIBPAM} +LDADD+= ${MINUSLPAM} +.endif .include <bsd.prog.mk> ----- Nick Sayer's Original Message ----- > Mark Murray wrote: > > >> nsayer 2001/05/31 15:55:45 PDT > >> > >> Modified files: (Branch: RELENG_4) > >> kerberosIV/usr.bin/telnet Makefile > >> kerberosIV/libexec/telnetd Makefile > >> Log: > >> Add -lpam to telnet build to fix world breakage caused by SRA MFC. > > > > > > This is the wrong way to do this. > > > > Check src/libexec/ftpd/Makefile for the right way :-) > > > > M > > My goal of unbreaking the world was accomplished. At this point I will > step back and let a real Kerberos maintainer step in. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010601222555.A10127>