From 228f109a4303db018f3e52db0822f8d70dc10d43 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sun, 3 Apr 2005 19:32:20 +0000 Subject: [PATCH] remove-insecure-and-ntp-20050403 rcmds, inetd, ftpd and ntp are gone. leaving the files in the cvs head for now. --- Makefile.in | 73 +++------------------------------------------------- acinclude.m4 | 10 +------ configure.in | 6 ----- 3 files changed, 4 insertions(+), 85 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2caf9d931..93627d371 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,6 @@ include @TOP_OBJDIR@/src/config/Makefile.config # Enable build+install of obsolete and insecure packages # Set to anything other than YES, or comment out to disable the build WITH_OBSOLETE=@WITH_OBSOLETE@ -WITH_INSECURE=@WITH_INSECURE@ ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@ @@ -275,7 +274,7 @@ scout: cmd comerr gtx fsprobe uss: des kauth cmd comerr rx vlserver vol volser ${COMPILE_PART1} uss ${COMPILE_PART2} -bozo: cmd comerr ntp audit +bozo: cmd comerr audit ${COMPILE_PART1} bozo ${COMPILE_PART2} vfsck: vol @@ -663,12 +662,6 @@ clean2: -${COMPILE_PART1} finale ${COMPILE_CLEAN} -${COMPILE_PART1} mpp ${COMPILE_CLEAN} -${COMPILE_PART1} package ${COMPILE_CLEAN} - -${COMPILE_PART1} ntp ${COMPILE_CLEAN} - -${COMPILE_PART1} ftpd43+ ${COMPILE_CLEAN} - -${COMPILE_PART1} inetd ${COMPILE_CLEAN} - -${COMPILE_PART1} rsh ${COMPILE_CLEAN} - -${COMPILE_PART1} rlogind ${COMPILE_CLEAN} - -${COMPILE_PART1} rcp ${COMPILE_CLEAN} -${COMPILE_PART1} libafs ${COMPILE_CLEAN} -${COMPILE_PART1} libuafs ${COMPILE_CLEAN} -${COMPILE_PART1} tests ${COMPILE_CLEAN} @@ -717,9 +710,7 @@ distclean: clean src/finale/Makefile \ src/fsint/Makefile \ src/fsprobe/Makefile \ - src/ftpd43+/Makefile \ src/gtx/Makefile \ - src/inetd/Makefile \ src/kauth/test/Makefile \ src/kauth/Makefile \ src/libacl/test/Makefile \ @@ -750,7 +741,6 @@ distclean: clean src/lwp/test/Makefile \ src/lwp/Makefile \ src/mpp/Makefile \ - src/ntp/Makefile \ src/null/Makefile \ src/package/Makefile \ src/pam/Makefile \ @@ -759,9 +749,6 @@ distclean: clean src/procmgmt/Makefile \ src/procmgmt/test/Makefile \ src/ptserver/Makefile \ - src/rcp/Makefile \ - src/rlogind/Makefile \ - src/rsh/Makefile \ src/rx/Makefile \ src/rx/bulk.example/Makefile \ src/rx/bulktest/Makefile \ @@ -811,8 +798,8 @@ pristine: distclean maintainer-clean: pristine # -# Below targets are all deprecated, insecure, or obsolte, -# see README.OBSOLETE and README.INSECURE for more info +# Below targets are all deprecated, obsolete, +# see README.OBSOLETE for more info # mpp: project @@ -833,57 +820,3 @@ package.files: package *) echo skipping deprecated target: package.files ;; \ esac -ntp: project volser - @case ${WITH_OBSOLETE} in \ - YES) case ${SYS_NAME} in \ - sun4x_58 | sunx86_* | *linux* | *fbsd* | *_darwin* | *nbsd*) echo skipping ntp for ${SYS_NAME} ;; \ - * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \ - esac ;; \ - *) echo skipping deprecated target: ntp ;; \ - esac - -ftpd43+: project kauth rxkad - @case ${WITH_INSECURE} in \ - YES) case ${SYS_NAME} in \ - rs_aix* | sun4x_55 | *linux*) \ - ${COMPILE_PART1} ftpd43+ ${COMPILE_PART2} ;; \ - *) echo skip ftpd43+ for ${SYS_NAME} ;; \ - esac ;; \ - *) echo skipping deprecated target: ftpd43+ ;; \ - esac - -inetd: project kauth rxkad - @case ${WITH_INSECURE} in \ - YES) ${COMPILE_PART1} inetd ${COMPILE_PART2} ;; \ - *) echo skipping deprecated target: inetd ;; \ - esac - -rsh: project inetd - @case ${WITH_INSECURE} in \ - YES) ${COMPILE_PART1} rsh ${COMPILE_PART2} ;; \ - *) echo skipping deprecated target: rsh ;; \ - esac - -rlogind: project rsh ftpd43+ login - @case ${WITH_INSECURE} in \ - YES) case ${SYS_NAME} in \ - rs_aix*) ${COMPILE_PART1} rlogind ${COMPILE_PART2} ;; \ - *) echo skipping rlogind for ${SYS_NAME} ;; \ - esac ;; \ - *) echo skipping deprecated target: rlogind ;; \ - esac - -rcp: project rsh inetd - @case ${WITH_INSECURE} in \ - YES) case ${SYS_NAME} in \ - sgi_* ) echo skip rcp for ${SYS_NAME} ;; \ - *) ${COMPILE_PART1} rcp ${COMPILE_PART2} ;; \ - esac ;; \ - *) echo skipping deprecated target: rcp ;; \ - esac - -allrcmds: project rcp rlogind - - - - diff --git a/acinclude.m4 b/acinclude.m4 index fb5909c68..0a57fd9c9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -14,9 +14,7 @@ AC_ARG_WITH(afs-sysname, [ --with-afs-sysname=sys use sys for the afs sysname] ) AC_ARG_ENABLE( obsolete, -[ --enable-obsolete enable obsolete portions of AFS (mpp, ntp and package)],, enable_obsolete="no") -AC_ARG_ENABLE( insecure, -[ --enable-insecure enable insecure portions of AFS (ftpd, inetd, rcp, rlogind and rsh)],, enable_insecure="no") +[ --enable-obsolete enable obsolete portions of AFS (mpp and package)],, enable_obsolete="no") AC_ARG_ENABLE( afsdb, [ --disable-afsdb disable AFSDB RR support],, enable_afsdb="yes") AC_ARG_ENABLE( pam, @@ -883,11 +881,6 @@ if test "$enable_obsolete" = "yes"; then WITH_OBSOLETE=YES fi -WITH_INSECURE=NO -if test "$enable_insecure" = "yes"; then - WITH_INSECURE=YES -fi - if test "x$with_bsd_kernel_headers" != "x"; then BSD_KERNEL_PATH="$with_bsd_kernel_headers" else @@ -1068,7 +1061,6 @@ AC_SUBST(TOP_INCDIR) AC_SUBST(TOP_LIBDIR) AC_SUBST(DEST) AC_SUBST(WITH_OBSOLETE) -AC_SUBST(WITH_INSECURE) AC_SUBST(DARWIN_INFOFILE) AC_SUBST(IRIX_BUILD_IP35) diff --git a/configure.in b/configure.in index 76956d14d..31032993f 100644 --- a/configure.in +++ b/configure.in @@ -39,9 +39,7 @@ src/export/Makefile \ src/finale/Makefile \ src/fsint/Makefile \ src/fsprobe/Makefile \ -src/ftpd43+/Makefile \ src/gtx/Makefile \ -src/inetd/Makefile \ src/JAVA/libjafs/Makefile \ src/kauth/test/Makefile \ src/kauth/Makefile \ @@ -71,7 +69,6 @@ src/login/Makefile \ src/lwp/test/Makefile \ src/lwp/Makefile \ src/mpp/Makefile \ -src/ntp/Makefile \ src/null/Makefile \ src/package/Makefile \ src/pam/Makefile \ @@ -80,9 +77,6 @@ src/pinstall/Makefile \ src/procmgmt/Makefile \ src/procmgmt/test/Makefile \ src/ptserver/Makefile \ -src/rcp/Makefile \ -src/rlogind/Makefile \ -src/rsh/Makefile \ src/rx/Makefile \ src/rx/bulk.example/Makefile \ src/rx/bulktest/Makefile \ -- 2.39.5