mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 18:08:23 +00:00
Code Issues Releases Wiki Activity

Fix warnings when -without-skey, --without-opie, --without-kerb4,

Browse Source 
--without-kerb5 or --without-SecurID were specified.
This commit is contained in:
Todd C. Miller 2011-04-06 09:33:07 -04:00
parent 3a54719a69
commit dcc4ec8436
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -3950,8 +3950,7 @@ fi
# Check whether --with-skey was given. # Check whether --with-skey was given.
if test "${with_skey+set}" = set; then : if test "${with_skey+set}" = set; then :
withval=$with_skey; case $with_skey in withval=$with_skey; case $with_skey in
no) with_skey="" no) ;;
;;
*) $as_echo "#define HAVE_SKEY 1" >>confdefs.h *) $as_echo "#define HAVE_SKEY 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try S/Key authentication" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try S/Key authentication" >&5
@ -3968,8 +3967,7 @@ fi
# Check whether --with-opie was given. # Check whether --with-opie was given.
if test "${with_opie+set}" = set; then : if test "${with_opie+set}" = set; then :
withval=$with_opie; case $with_opie in withval=$with_opie; case $with_opie in
no) with_opie="" no) ;;
;;
*) $as_echo "#define HAVE_OPIE 1" >>confdefs.h *) $as_echo "#define HAVE_OPIE 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try NRL OPIE authentication" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try NRL OPIE authentication" >&5
@ -4006,7 +4004,7 @@ fi
# Check whether --with-SecurID was given. # Check whether --with-SecurID was given.
if test "${with_SecurID+set}" = set; then : if test "${with_SecurID+set}" = set; then :
withval=$with_SecurID; case $with_SecurID in withval=$with_SecurID; case $with_SecurID in
no) with_SecurID="";; no) ;;
*) $as_echo "#define HAVE_SECURID 1" >>confdefs.h *) $as_echo "#define HAVE_SECURID 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use SecurID for authentication" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use SecurID for authentication" >&5
@ -4023,7 +4021,7 @@ fi
# Check whether --with-fwtk was given. # Check whether --with-fwtk was given.
if test "${with_fwtk+set}" = set; then : if test "${with_fwtk+set}" = set; then :
withval=$with_fwtk; case $with_fwtk in withval=$with_fwtk; case $with_fwtk in
no) with_fwtk="";; no) ;;
*) $as_echo "#define HAVE_FWTK 1" >>confdefs.h *) $as_echo "#define HAVE_FWTK 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use FWTK AuthSRV for authentication" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use FWTK AuthSRV for authentication" >&5
@ -4040,7 +4038,7 @@ fi
# Check whether --with-kerb4 was given. # Check whether --with-kerb4 was given.
if test "${with_kerb4+set}" = set; then : if test "${with_kerb4+set}" = set; then :
withval=$with_kerb4; case $with_kerb4 in withval=$with_kerb4; case $with_kerb4 in
no) with_kerb4="";; no) ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try kerberos IV authentication" >&5 *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try kerberos IV authentication" >&5
$as_echo_n "checking whether to try kerberos IV authentication... " >&6; } $as_echo_n "checking whether to try kerberos IV authentication... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@ -4055,7 +4053,7 @@ fi
# Check whether --with-kerb5 was given. # Check whether --with-kerb5 was given.
if test "${with_kerb5+set}" = set; then : if test "${with_kerb5+set}" = set; then :
withval=$with_kerb5; case $with_kerb5 in withval=$with_kerb5; case $with_kerb5 in
no) with_kerb5="";; no) ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try Kerberos V authentication" >&5 *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try Kerberos V authentication" >&5
$as_echo_n "checking whether to try Kerberos V authentication... " >&6; } $as_echo_n "checking whether to try Kerberos V authentication... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@ -13447,7 +13445,7 @@ done
SKIP_SETREUID=yes SKIP_SETREUID=yes
;; ;;
esac esac
if test "$with_skey" = "yes"; then if test "${with_skey-'no'}" = "yes"; then
SUDOERS_LIBS="${SUDOERS_LIBS} -lmd" SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
fi fi
CHECKSHADOW="false" CHECKSHADOW="false"
@ -13483,7 +13481,7 @@ done
: ${with_logincap='maybe'} : ${with_logincap='maybe'}
;; ;;
*-*-dragonfly*) *-*-dragonfly*)
if test "$with_skey" = "yes"; then if test "${with_skey-'no'}" = "yes"; then
SUDOERS_LIBS="${SUDOERS_LIBS} -lmd" SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
fi fi
CHECKSHADOW="false" CHECKSHADOW="false"
@ -17860,7 +17858,7 @@ if test ${with_DCE-'no'} = "yes"; then
AUTH_OBJS="$AUTH_OBJS dce.lo" AUTH_OBJS="$AUTH_OBJS dce.lo"
fi fi
if test ${with_skey-'no'} = "yes"; then if test "${with_skey-'no'}" = "yes"; then
O_LDFLAGS="$LDFLAGS" O_LDFLAGS="$LDFLAGS"
if test "$with_skey" != "yes"; then if test "$with_skey" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I${with_skey}/include" CPPFLAGS="${CPPFLAGS} -I${with_skey}/include"
@ -18040,7 +18038,7 @@ fi
AUTH_OBJS="$AUTH_OBJS rfc1938.lo" AUTH_OBJS="$AUTH_OBJS rfc1938.lo"
fi fi
if test ${with_opie-'no'} = "yes"; then if test "${with_opie-'no'}" = "yes"; then
O_LDFLAGS="$LDFLAGS" O_LDFLAGS="$LDFLAGS"
if test "$with_opie" != "yes"; then if test "$with_opie" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I${with_opie}/include" CPPFLAGS="${CPPFLAGS} -I${with_opie}/include"

22
configure.in
View File

@ -351,8 +351,7 @@ esac])
AC_ARG_WITH(skey, [AS_HELP_STRING([--with-skey[=DIR]], [enable S/Key support ])], AC_ARG_WITH(skey, [AS_HELP_STRING([--with-skey[=DIR]], [enable S/Key support ])],
[case $with_skey in [case $with_skey in
no) with_skey="" no) ;;
;;
*) AC_DEFINE(HAVE_SKEY) *) AC_DEFINE(HAVE_SKEY)
AC_MSG_CHECKING(whether to try S/Key authentication) AC_MSG_CHECKING(whether to try S/Key authentication)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -362,8 +361,7 @@ esac])
AC_ARG_WITH(opie, [AS_HELP_STRING([--with-opie[=DIR]], [enable OPIE support ])], AC_ARG_WITH(opie, [AS_HELP_STRING([--with-opie[=DIR]], [enable OPIE support ])],
[case $with_opie in [case $with_opie in
no) with_opie="" no) ;;
;;
*) AC_DEFINE(HAVE_OPIE) *) AC_DEFINE(HAVE_OPIE)
AC_MSG_CHECKING(whether to try NRL OPIE authentication) AC_MSG_CHECKING(whether to try NRL OPIE authentication)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -386,7 +384,7 @@ esac])
AC_ARG_WITH(SecurID, [AS_HELP_STRING([--with-SecurID[[=DIR]]], [enable SecurID support])], AC_ARG_WITH(SecurID, [AS_HELP_STRING([--with-SecurID[[=DIR]]], [enable SecurID support])],
[case $with_SecurID in [case $with_SecurID in
no) with_SecurID="";; no) ;;
*) AC_DEFINE(HAVE_SECURID) *) AC_DEFINE(HAVE_SECURID)
AC_MSG_CHECKING(whether to use SecurID for authentication) AC_MSG_CHECKING(whether to use SecurID for authentication)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -396,7 +394,7 @@ esac])
AC_ARG_WITH(fwtk, [AS_HELP_STRING([--with-fwtk[[=DIR]]], [enable FWTK AuthSRV support])], AC_ARG_WITH(fwtk, [AS_HELP_STRING([--with-fwtk[[=DIR]]], [enable FWTK AuthSRV support])],
[case $with_fwtk in [case $with_fwtk in
no) with_fwtk="";; no) ;;
*) AC_DEFINE(HAVE_FWTK) *) AC_DEFINE(HAVE_FWTK)
AC_MSG_CHECKING(whether to use FWTK AuthSRV for authentication) AC_MSG_CHECKING(whether to use FWTK AuthSRV for authentication)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -406,7 +404,7 @@ esac])
AC_ARG_WITH(kerb4, [AS_HELP_STRING([--with-kerb4[[=DIR]]], [enable Kerberos IV support])], AC_ARG_WITH(kerb4, [AS_HELP_STRING([--with-kerb4[[=DIR]]], [enable Kerberos IV support])],
[case $with_kerb4 in [case $with_kerb4 in
no) with_kerb4="";; no) ;;
*) AC_MSG_CHECKING(whether to try kerberos IV authentication) *) AC_MSG_CHECKING(whether to try kerberos IV authentication)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AUTH_REG="$AUTH_REG kerb4" AUTH_REG="$AUTH_REG kerb4"
@ -415,7 +413,7 @@ esac])
AC_ARG_WITH(kerb5, [AS_HELP_STRING([--with-kerb5[[=DIR]]], [enable Kerberos V support])], AC_ARG_WITH(kerb5, [AS_HELP_STRING([--with-kerb5[[=DIR]]], [enable Kerberos V support])],
[case $with_kerb5 in [case $with_kerb5 in
no) with_kerb5="";; no) ;;
*) AC_MSG_CHECKING(whether to try Kerberos V authentication) *) AC_MSG_CHECKING(whether to try Kerberos V authentication)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AUTH_REG="$AUTH_REG kerb5" AUTH_REG="$AUTH_REG kerb5"
@ -1738,7 +1736,7 @@ case "$host" in
SKIP_SETREUID=yes SKIP_SETREUID=yes
;; ;;
esac esac
if test "$with_skey" = "yes"; then if test "${with_skey-'no'}" = "yes"; then
SUDOERS_LIBS="${SUDOERS_LIBS} -lmd" SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
fi fi
CHECKSHADOW="false" CHECKSHADOW="false"
@ -1774,7 +1772,7 @@ case "$host" in
: ${with_logincap='maybe'} : ${with_logincap='maybe'}
;; ;;
*-*-dragonfly*) *-*-dragonfly*)
if test "$with_skey" = "yes"; then if test "${with_skey-'no'}" = "yes"; then
SUDOERS_LIBS="${SUDOERS_LIBS} -lmd" SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
fi fi
CHECKSHADOW="false" CHECKSHADOW="false"
@ -2581,7 +2579,7 @@ fi
dnl dnl
dnl extra S/Key lib and includes dnl extra S/Key lib and includes
dnl dnl
if test ${with_skey-'no'} = "yes"; then if test "${with_skey-'no'}" = "yes"; then
O_LDFLAGS="$LDFLAGS" O_LDFLAGS="$LDFLAGS"
if test "$with_skey" != "yes"; then if test "$with_skey" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I${with_skey}/include" CPPFLAGS="${CPPFLAGS} -I${with_skey}/include"
@ -2615,7 +2613,7 @@ fi
dnl dnl
dnl extra OPIE lib and includes dnl extra OPIE lib and includes
dnl dnl
if test ${with_opie-'no'} = "yes"; then if test "${with_opie-'no'}" = "yes"; then
O_LDFLAGS="$LDFLAGS" O_LDFLAGS="$LDFLAGS"
if test "$with_opie" != "yes"; then if test "$with_opie" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I${with_opie}/include" CPPFLAGS="${CPPFLAGS} -I${with_opie}/include"