Skip to content

Commit a320db9

Browse files
millertmillert
committed
Remove obsolete TIS Firewall Toolkit (FWTK) "authsrv" support.
1 parent f0d0d57 commit a320db9

File tree

10 files changed

+1
-358
lines changed

10 files changed

+1
-358
lines changed

‎INSTALL.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -580,11 +580,6 @@ Defaults are listed in brackets after the description.
580580
(such as HP-UX 11.0 and higher, Solaris, FreeBSD, and Linux), the
581581
DCE PAM module (usually libpam_dce) should be used instead.
582582

583-
--with-fwtk[=DIR]
584-
Enable TIS Firewall Toolkit (FWTK) "authsrv" support. If specified,
585-
DIR is the base directory containing the compiled FWTK package
586-
(or at least the library and header files).
587-
588583
--with-kerb5[=DIR]
589584
Enable Kerberos V support. If specified, DIR is the base
590585
directory containing the Kerberos V include and lib dirs.

‎MANIFEST‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ plugins/sudoers/auth/afs.c
605605
plugins/sudoers/auth/aix_auth.c
606606
plugins/sudoers/auth/bsdauth.c
607607
plugins/sudoers/auth/dce.c
608-
plugins/sudoers/auth/fwtk.c
609608
plugins/sudoers/auth/kerb5.c
610609
plugins/sudoers/auth/pam.c
611610
plugins/sudoers/auth/passwd.c

‎config.h.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@
358358
/* Define to 1 if you have the 'futimesat' function. */
359359
#undef HAVE_FUTIMESAT
360360

361-
/* Define to 1 if you use the FWTK authsrv daemon. */
362-
#undef HAVE_FWTK
363-
364361
/* Define to 1 if you are using gcrypt's sha2 functions. */
365362
#undef HAVE_GCRYPT
366363

‎configure‎

Lines changed: 0 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,6 @@ with_skey
950950
with_opie
951951
with_long_otp_prompt
952952
with_SecurID
953-
with_fwtk
954953
with_kerb5
955954
with_aixauth
956955
with_pam
@@ -1829,7 +1828,6 @@ Optional Packages:
18291828
--with-opie[=DIR] enable OPIE support
18301829
--with-long-otp-prompt use a two line OTP (skey/opie) prompt
18311830
--with-SecurID[=DIR] enable SecurID support
1832-
--with-fwtk[=DIR] enable FWTK AuthSRV support
18331831
--with-kerb5[=DIR] enable Kerberos V support
18341832
--with-aixauth enable AIX general authentication support
18351833
--with-pam enable PAM support
@@ -5399,20 +5397,6 @@ fi
53995397

54005398

54015399

5402-
# Check whether --with-fwtk was given.
5403-
if test ${with_fwtk+y}
5404-
then :
5405-
withval=$with_fwtk; case $with_fwtk in
5406-
no) ;;
5407-
*) printf "%s\n" "#define HAVE_FWTK 1" >>confdefs.h
5408-
5409-
AUTH_EXCL="$AUTH_EXCL FWTK"
5410-
;;
5411-
esac
5412-
fi
5413-
5414-
5415-
54165400
# Check whether --with-kerb5 was given.
54175401
if test ${with_kerb5+y}
54185402
then :
@@ -29721,126 +29705,6 @@ fi
2972129705

2972229706
fi
2972329707

29724-
if test ${with_fwtk-'no'} != "no"
29725-
then :
29726-
29727-
if test "$with_fwtk" != "yes"
29728-
then :
29729-
29730-
29731-
29732-
if test ${SUDOERS_LDFLAGS+y}
29733-
then :
29734-
29735-
case " $SUDOERS_LDFLAGS " in #(
29736-
*" -L${with_fwtk} "*) :
29737-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS already contains -L\${with_fwtk}"; } >&5
29738-
(: SUDOERS_LDFLAGS already contains -L${with_fwtk}) 2>&5
29739-
ac_status=$?
29740-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29741-
test $ac_status = 0; } ;; #(
29742-
*) :
29743-
29744-
as_fn_append SUDOERS_LDFLAGS " -L${with_fwtk}"
29745-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
29746-
(: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
29747-
ac_status=$?
29748-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29749-
test $ac_status = 0; }
29750-
;;
29751-
esac
29752-
29753-
else case e in #(
29754-
e)
29755-
SUDOERS_LDFLAGS=-L${with_fwtk}
29756-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS=\"\$SUDOERS_LDFLAGS\""; } >&5
29757-
(: SUDOERS_LDFLAGS="$SUDOERS_LDFLAGS") 2>&5
29758-
ac_status=$?
29759-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29760-
test $ac_status = 0; }
29761-
;;
29762-
esac
29763-
fi
29764-
29765-
if test X"$enable_rpath" = X"yes"; then
29766-
29767-
if test ${SUDOERS_LDFLAGS_R+y}
29768-
then :
29769-
29770-
case " $SUDOERS_LDFLAGS_R " in #(
29771-
*" -R${with_fwtk} "*) :
29772-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS_R already contains -R\${with_fwtk}"; } >&5
29773-
(: SUDOERS_LDFLAGS_R already contains -R${with_fwtk}) 2>&5
29774-
ac_status=$?
29775-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29776-
test $ac_status = 0; } ;; #(
29777-
*) :
29778-
29779-
as_fn_append SUDOERS_LDFLAGS_R " -R${with_fwtk}"
29780-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS_R=\"\$SUDOERS_LDFLAGS_R\""; } >&5
29781-
(: SUDOERS_LDFLAGS_R="$SUDOERS_LDFLAGS_R") 2>&5
29782-
ac_status=$?
29783-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29784-
test $ac_status = 0; }
29785-
;;
29786-
esac
29787-
29788-
else case e in #(
29789-
e)
29790-
SUDOERS_LDFLAGS_R=-R${with_fwtk}
29791-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : SUDOERS_LDFLAGS_R=\"\$SUDOERS_LDFLAGS_R\""; } >&5
29792-
(: SUDOERS_LDFLAGS_R="$SUDOERS_LDFLAGS_R") 2>&5
29793-
ac_status=$?
29794-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29795-
test $ac_status = 0; }
29796-
;;
29797-
esac
29798-
fi
29799-
29800-
fi
29801-
29802-
29803-
if test ${CPPFLAGS+y}
29804-
then :
29805-
29806-
case " $CPPFLAGS " in #(
29807-
*" -I${with_fwtk} "*) :
29808-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CPPFLAGS already contains -I\${with_fwtk}"; } >&5
29809-
(: CPPFLAGS already contains -I${with_fwtk}) 2>&5
29810-
ac_status=$?
29811-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29812-
test $ac_status = 0; } ;; #(
29813-
*) :
29814-
29815-
as_fn_append CPPFLAGS " -I${with_fwtk}"
29816-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS\""; } >&5
29817-
(: CPPFLAGS="$CPPFLAGS") 2>&5
29818-
ac_status=$?
29819-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29820-
test $ac_status = 0; }
29821-
;;
29822-
esac
29823-
29824-
else case e in #(
29825-
e)
29826-
CPPFLAGS=-I${with_fwtk}
29827-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : CPPFLAGS=\"\$CPPFLAGS\""; } >&5
29828-
(: CPPFLAGS="$CPPFLAGS") 2>&5
29829-
ac_status=$?
29830-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29831-
test $ac_status = 0; }
29832-
;;
29833-
esac
29834-
fi
29835-
29836-
with_fwtk=yes
29837-
29838-
fi
29839-
SUDOERS_LIBS="${SUDOERS_LIBS} -lauth -lfwall"
29840-
AUTH_OBJS="$AUTH_OBJS fwtk.lo"
29841-
29842-
fi
29843-
2984429708
if test ${with_SecurID-'no'} != "no"
2984529709
then :
2984629710

@@ -40240,6 +40104,5 @@ fi
4024040104

4024140105

4024240106

40243-
4024440107

4024540108

‎configure.ac‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -498,14 +498,6 @@ AC_ARG_WITH(SecurID, [AS_HELP_STRING([--with-SecurID[[=DIR]]], [enable SecurID s
498498
;;
499499
esac])
500500

501-
AC_ARG_WITH(fwtk, [AS_HELP_STRING([--with-fwtk[[=DIR]]], [enable FWTK AuthSRV support])],
502-
[case $with_fwtk in
503-
no) ;;
504-
*) AC_DEFINE(HAVE_FWTK)
505-
AUTH_EXCL="$AUTH_EXCL FWTK"
506-
;;
507-
esac])
508-
509501
AC_ARG_WITH(kerb5, [AS_HELP_STRING([--with-kerb5[[=DIR]]], [enable Kerberos V support])],
510502
[case $with_kerb5 in
511503
no) ;;
@@ -3685,19 +3677,6 @@ AS_IF([test ${CHECKSIA-'false'} = "true"], [
36853677
])
36863678
])
36873679

3688-
dnl
3689-
dnl extra FWTK libs + includes
3690-
dnl
3691-
AS_IF([test ${with_fwtk-'no'} != "no"], [
3692-
AS_IF([test "$with_fwtk" != "yes"], [
3693-
SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [${with_fwtk}])
3694-
AX_APPEND_FLAG([-I${with_fwtk}], [CPPFLAGS])
3695-
with_fwtk=yes
3696-
])
3697-
SUDOERS_LIBS="${SUDOERS_LIBS} -lauth -lfwall"
3698-
AUTH_OBJS="$AUTH_OBJS fwtk.lo"
3699-
])
3700-
37013680
dnl
37023681
dnl extra SecurID lib + includes
37033682
dnl
@@ -4722,7 +4701,6 @@ AH_TEMPLATE(HAVE_DISPCRYPT, [Define to 1 if you have the 'dispcrypt' function.])
47224701
AH_TEMPLATE(HAVE_DLOPEN, [Define to 1 if you have the 'dlopen' function.])
47234702
AH_TEMPLATE(HAVE_FCNTL_CLOSEM, [Define to 1 if your system has the F_CLOSEM fcntl.])
47244703
AH_TEMPLATE(HAVE_FNMATCH, [Define to 1 if you have the 'fnmatch' function.])
4725-
AH_TEMPLATE(HAVE_FWTK, [Define to 1 if you use the FWTK authsrv daemon.])
47264704
AH_TEMPLATE(HAVE_GETPRPWNAM, [Define to 1 if you have the 'getprpwnam' function. (SecureWare-style shadow passwords).])
47274705
AH_TEMPLATE(HAVE_GETPWNAM_SHADOW, [Define to 1 if you have the 'getpwnam_shadow' function.])
47284706
AH_TEMPLATE(HAVE_GETSPNAM, [Define to 1 if you have the 'getspnam' function (SVR4-style shadow passwords).])

‎plugins/sudoers/Makefile.in‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,28 +1845,6 @@ fuzz_sudoers_ldif.i: $(srcdir)/regress/fuzz/fuzz_sudoers_ldif.c \
18451845
$(CPP) $(CPPFLAGS) $(srcdir)/regress/fuzz/fuzz_sudoers_ldif.c > $@
18461846
fuzz_sudoers_ldif.plog: fuzz_sudoers_ldif.i
18471847
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/regress/fuzz/fuzz_sudoers_ldif.c --i-file fuzz_sudoers_ldif.i --output-file $@
1848-
fwtk.lo: $(authdir)/fwtk.c $(authdir)/sudo_auth.h $(devdir)/def_data.h \
1849-
$(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
1850-
$(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \
1851-
$(incdir)/sudo_eventlog.h $(incdir)/sudo_fatal.h \
1852-
$(incdir)/sudo_gettext.h $(incdir)/sudo_plugin.h \
1853-
$(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \
1854-
$(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \
1855-
$(srcdir)/sudoers.h $(srcdir)/sudoers_debug.h \
1856-
$(top_builddir)/config.h $(top_builddir)/pathnames.h
1857-
$(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(HARDENING_CFLAGS) $(authdir)/fwtk.c
1858-
fwtk.i: $(authdir)/fwtk.c $(authdir)/sudo_auth.h $(devdir)/def_data.h \
1859-
$(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
1860-
$(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \
1861-
$(incdir)/sudo_eventlog.h $(incdir)/sudo_fatal.h \
1862-
$(incdir)/sudo_gettext.h $(incdir)/sudo_plugin.h \
1863-
$(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(srcdir)/defaults.h \
1864-
$(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_nss.h \
1865-
$(srcdir)/sudoers.h $(srcdir)/sudoers_debug.h \
1866-
$(top_builddir)/config.h $(top_builddir)/pathnames.h
1867-
$(CPP) $(CPPFLAGS) $(authdir)/fwtk.c > $@
1868-
fwtk.plog: fwtk.i
1869-
rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(authdir)/fwtk.c --i-file fwtk.i --output-file $@
18701848
gc.lo: $(srcdir)/gc.c $(devdir)/def_data.h $(incdir)/compat/stdbool.h \
18711849
$(incdir)/sudo_compat.h $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \
18721850
$(incdir)/sudo_eventlog.h $(incdir)/sudo_fatal.h \

0 commit comments

Comments
 (0)