From fbc5e6341f6aa5d16101c8e2d363f567b761ada1 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Thu, 5 Jul 2018 17:04:51 +0800 Subject: [PATCH] telnet(1): Disable PAM for the rescue version This avoids several PAM-related libraries when crunching telnet, and reduces the size by about 200 KB. --- initrd/rescue.libcrypto/Makefile | 3 +-- lib/libtelnet/Makefile | 4 ++++ usr.bin/telnet/Makefile | 10 ++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/initrd/rescue.libcrypto/Makefile b/initrd/rescue.libcrypto/Makefile index aee088f97a..858d678a78 100644 --- a/initrd/rescue.libcrypto/Makefile +++ b/initrd/rescue.libcrypto/Makefile @@ -65,8 +65,7 @@ CRUNCH_LIBS+= -lfetch # fetch CRUNCH_LIBS+= -larchive # cpio, tar CRUNCH_LIBS+= -llzma # cpio, tar CRUNCH_LIBS+= -lbz2 # cpio, tar -CRUNCH_LIBS+= -lpam -lcrypt -lradius -ltacplus -lopie -lypclnt # telnet -CRUNCH_LIBS+= -lprivate_ncurses # telnet +CRUNCH_LIBS+= -lprivate_ncurses -lcrypt # telnet CRUNCH_LIBS+= -lprivate_ssl # fetch, wpa_supplicant CRUNCH_LIBS+= -lprivate_ssh # ssh CRUNCH_LIBS+= -lprivate_crypto diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 76ecaa2f7c..580f41111b 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -12,4 +12,8 @@ WARNS?= 2 CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include +.if defined(RESCUE) +CFLAGS+= -DNOPAM +.endif + .include diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index b82424a00f..d3b1f9c4df 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -22,8 +22,14 @@ CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} -LDADD+= -lprivate_crypto -lcrypt ${MINUSLPAM} CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include +DPADD+= ${LIBCRYPTO} ${LIBCRYPT} +LDADD+= -lprivate_crypto -lcrypt + +.if !defined(RESCUE) +# libtelnet requires PAM by default +DPADD+= ${LIBPAM} +LDADD+= ${MINUSLPAM} +.endif .include -- 2.41.0