diff options
| author | Mark Murray <markm@FreeBSD.org> | 2001-08-12 18:47:56 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 2001-08-12 18:47:56 +0000 |
| commit | 37ee76af5208c8668d80e0c01e39f4c39e8468d3 (patch) | |
| tree | c3a9d8f372ba26276fb828e169b661c1372c0f30 | |
| parent | 9ab4f412312f92f6d0c4db702777c9956ce7cfa0 (diff) | |
| download | src-37ee76af5208c8668d80e0c01e39f4c39e8468d3.tar.gz src-37ee76af5208c8668d80e0c01e39f4c39e8468d3.zip | |
Remove the WANT_INSECURE_OPIE option - it is now a default. This is not
nearly as ominous as it sounds, and it allows OPIE to be used over SSH
and on xterms.
Requested by: ache
Discussed on: -security
Notes
Notes:
svn path=/head/; revision=81557
| -rw-r--r-- | etc/defaults/make.conf | 6 | ||||
| -rw-r--r-- | lib/libopie/Makefile | 2 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 6 | ||||
| -rw-r--r-- | usr.bin/opieinfo/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/opiekey/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/opiepasswd/Makefile | 3 |
6 files changed, 0 insertions, 23 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 5de4a749b579..ca685877265f 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -112,12 +112,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # #WANT_OPENSSL_MANPAGES= true # -# To build usr.bin/opie* and libopie with options to make it accept -# being operatred over insecure TTY's. Mainly of use during debugging, -# This is also of use if all traffic is routinely encrypted. -# -#WANT_INSECURE_OPIE= true -# # To build sys/modules when building the world (our old way of doing things) #MODULES_WITH_WORLD=true # do not build modules when building kernel # diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile index 313936840868..89e07a59e62a 100644 --- a/lib/libopie/Makefile +++ b/lib/libopie/Makefile @@ -24,10 +24,8 @@ INCS= ${OPIE_DIST}/opie.h CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \ -DKEY_FILE=${KEYFILE} -.if defined(WANT_INSECURE_OPIE) && ${WANT_INSECURE_OPIE} == true ACCESSFILE?= \"/etc/opieaccess\" CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE} -.endif LDADD+= -lmd DPADD+= ${LIBMD} diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 5de4a749b579..ca685877265f 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -112,12 +112,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ # #WANT_OPENSSL_MANPAGES= true # -# To build usr.bin/opie* and libopie with options to make it accept -# being operatred over insecure TTY's. Mainly of use during debugging, -# This is also of use if all traffic is routinely encrypted. -# -#WANT_INSECURE_OPIE= true -# # To build sys/modules when building the world (our old way of doing things) #MODULES_WITH_WORLD=true # do not build modules when building kernel # diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile index e0789b80162c..2ee633d6d43d 100644 --- a/usr.bin/opieinfo/Makefile +++ b/usr.bin/opieinfo/Makefile @@ -5,10 +5,7 @@ OPIE_DIST?= ${.CURDIR}/../../contrib/opie PROG= opieinfo CFLAGS+=-I${OPIE_DIST} - -.if defined(WANT_INSECURE_OPIE) && ${WANT_INSECURE_OPIE} == true CFLAGS+=-DINSECURE_OVERRIDE -.endif DPADD= ${LIBOPIE} ${LIBMD} LDADD= -lopie -lmd diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile index 588ec87824cd..ae4738b2737c 100644 --- a/usr.bin/opiekey/Makefile +++ b/usr.bin/opiekey/Makefile @@ -5,10 +5,7 @@ OPIE_DIST?= ${.CURDIR}/../../contrib/opie PROG= opiekey CFLAGS+= -I${OPIE_DIST} - -.if defined(WANT_INSECURE_OPIE) && ${WANT_INSECURE_OPIE} == true CFLAGS+=-DINSECURE_OVERRIDE -.endif DPADD= ${LIBOPIE} ${LIBMD} LDADD= -lopie -lmd diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile index e7e494266248..00021f641db6 100644 --- a/usr.bin/opiepasswd/Makefile +++ b/usr.bin/opiepasswd/Makefile @@ -5,10 +5,7 @@ OPIE_DIST?= ${.CURDIR}/../../contrib/opie PROG= opiepasswd CFLAGS+=-I${OPIE_DIST} - -.if defined(WANT_INSECURE_OPIE) && ${WANT_INSECURE_OPIE} == true CFLAGS+=-DINSECURE_OVERRIDE -.endif DPADD= ${LIBOPIE} ${LIBMD} LDADD= -lopie -lmd |