From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 6 Apr 2011 13:33:07 +0000 (-0400)
Subject: Fix warnings when -without-skey, --without-opie, --without-kerb4,
X-Git-Tag: SUDO_1_8_1~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcc4ec843687460e35df7be4706e749610baf4a1;p=sudo

Fix warnings when -without-skey, --without-opie, --without-kerb4,
--without-kerb5 or --without-SecurID were specified.
---

diff --git a/configure b/configure
index 39c3d33d7..56009cfd9 100755
--- a/configure
+++ b/configure
@@ -3950,8 +3950,7 @@ fi
 # Check whether --with-skey was given.
 if test "${with_skey+set}" = set; then :
   withval=$with_skey; case $with_skey in
-    no)		with_skey=""
-		;;
+    no)		;;
     *)		$as_echo "#define HAVE_SKEY 1" >>confdefs.h
 
 		{ $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.
 if test "${with_opie+set}" = set; then :
   withval=$with_opie; case $with_opie in
-    no)		with_opie=""
-		;;
+    no)		;;
     *)		$as_echo "#define HAVE_OPIE 1" >>confdefs.h
 
 		{ $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.
 if test "${with_SecurID+set}" = set; then :
   withval=$with_SecurID; case $with_SecurID in
-    no)		with_SecurID="";;
+    no)		;;
     *)		$as_echo "#define HAVE_SECURID 1" >>confdefs.h
 
 		{ $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.
 if test "${with_fwtk+set}" = set; then :
   withval=$with_fwtk; case $with_fwtk in
-    no)		with_fwtk="";;
+    no)		;;
     *)		$as_echo "#define HAVE_FWTK 1" >>confdefs.h
 
 		{ $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.
 if test "${with_kerb4+set}" = set; then :
   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_n "checking whether to try kerberos IV authentication... " >&6; }
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -4055,7 +4053,7 @@ fi
 # Check whether --with-kerb5 was given.
 if test "${with_kerb5+set}" = set; then :
   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_n "checking whether to try Kerberos V authentication... " >&6; }
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -13447,7 +13445,7 @@ done
 		    SKIP_SETREUID=yes
 		    ;;
 		esac
-		if test "$with_skey" = "yes"; then
+		if test "${with_skey-'no'}" = "yes"; then
 		     SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
 		fi
 		CHECKSHADOW="false"
@@ -13483,7 +13481,7 @@ done
 		: ${with_logincap='maybe'}
 		;;
     *-*-dragonfly*)
-		if test "$with_skey" = "yes"; then
+		if test "${with_skey-'no'}" = "yes"; then
 		     SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
 		fi
 		CHECKSHADOW="false"
@@ -17860,7 +17858,7 @@ if test ${with_DCE-'no'} = "yes"; then
     AUTH_OBJS="$AUTH_OBJS dce.lo"
 fi
 
-if test ${with_skey-'no'} = "yes"; then
+if test "${with_skey-'no'}" = "yes"; then
     O_LDFLAGS="$LDFLAGS"
     if test "$with_skey" != "yes"; then
 	CPPFLAGS="${CPPFLAGS} -I${with_skey}/include"
@@ -18040,7 +18038,7 @@ fi
     AUTH_OBJS="$AUTH_OBJS rfc1938.lo"
 fi
 
-if test ${with_opie-'no'} = "yes"; then
+if test "${with_opie-'no'}" = "yes"; then
     O_LDFLAGS="$LDFLAGS"
     if test "$with_opie" != "yes"; then
 	CPPFLAGS="${CPPFLAGS} -I${with_opie}/include"
diff --git a/configure.in b/configure.in
index cbae865de..f6497e614 100644
--- a/configure.in
+++ b/configure.in
@@ -351,8 +351,7 @@ esac])
 
 AC_ARG_WITH(skey, [AS_HELP_STRING([--with-skey[=DIR]], [enable S/Key support ])],
 [case $with_skey in
-    no)		with_skey=""
-		;;
+    no)		;;
     *)		AC_DEFINE(HAVE_SKEY)
 		AC_MSG_CHECKING(whether to try S/Key authentication)
 		AC_MSG_RESULT(yes)
@@ -362,8 +361,7 @@ esac])
 
 AC_ARG_WITH(opie, [AS_HELP_STRING([--with-opie[=DIR]], [enable OPIE support ])],
 [case $with_opie in
-    no)		with_opie=""
-		;;
+    no)		;;
     *)		AC_DEFINE(HAVE_OPIE)
 		AC_MSG_CHECKING(whether to try NRL OPIE authentication)
 		AC_MSG_RESULT(yes)
@@ -386,7 +384,7 @@ esac])
 
 AC_ARG_WITH(SecurID, [AS_HELP_STRING([--with-SecurID[[=DIR]]], [enable SecurID support])],
 [case $with_SecurID in
-    no)		with_SecurID="";;
+    no)		;;
     *)		AC_DEFINE(HAVE_SECURID)
 		AC_MSG_CHECKING(whether to use SecurID for authentication)
 		AC_MSG_RESULT(yes)
@@ -396,7 +394,7 @@ esac])
 
 AC_ARG_WITH(fwtk, [AS_HELP_STRING([--with-fwtk[[=DIR]]], [enable FWTK AuthSRV support])],
 [case $with_fwtk in
-    no)		with_fwtk="";;
+    no)		;;
     *)		AC_DEFINE(HAVE_FWTK)
 		AC_MSG_CHECKING(whether to use FWTK AuthSRV for authentication)
 		AC_MSG_RESULT(yes)
@@ -406,7 +404,7 @@ esac])
 
 AC_ARG_WITH(kerb4, [AS_HELP_STRING([--with-kerb4[[=DIR]]], [enable Kerberos IV support])],
 [case $with_kerb4 in
-    no)		with_kerb4="";;
+    no)		;;
     *)		AC_MSG_CHECKING(whether to try kerberos IV authentication)
 		AC_MSG_RESULT(yes)
 		AUTH_REG="$AUTH_REG kerb4"
@@ -415,7 +413,7 @@ esac])
 
 AC_ARG_WITH(kerb5, [AS_HELP_STRING([--with-kerb5[[=DIR]]], [enable Kerberos V support])],
 [case $with_kerb5 in
-    no)		with_kerb5="";;
+    no)		;;
     *)		AC_MSG_CHECKING(whether to try Kerberos V authentication)
 		AC_MSG_RESULT(yes)
 		AUTH_REG="$AUTH_REG kerb5"
@@ -1738,7 +1736,7 @@ case "$host" in
 		    SKIP_SETREUID=yes
 		    ;;
 		esac
-		if test "$with_skey" = "yes"; then
+		if test "${with_skey-'no'}" = "yes"; then
 		     SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
 		fi
 		CHECKSHADOW="false"
@@ -1774,7 +1772,7 @@ case "$host" in
 		: ${with_logincap='maybe'}
 		;;
     *-*-dragonfly*)
-		if test "$with_skey" = "yes"; then
+		if test "${with_skey-'no'}" = "yes"; then
 		     SUDOERS_LIBS="${SUDOERS_LIBS} -lmd"
 		fi
 		CHECKSHADOW="false"
@@ -2581,7 +2579,7 @@ fi
 dnl
 dnl extra S/Key lib and includes
 dnl
-if test ${with_skey-'no'} = "yes"; then
+if test "${with_skey-'no'}" = "yes"; then
     O_LDFLAGS="$LDFLAGS"
     if test "$with_skey" != "yes"; then
 	CPPFLAGS="${CPPFLAGS} -I${with_skey}/include"
@@ -2615,7 +2613,7 @@ fi
 dnl
 dnl extra OPIE lib and includes
 dnl
-if test ${with_opie-'no'} = "yes"; then
+if test "${with_opie-'no'}" = "yes"; then
     O_LDFLAGS="$LDFLAGS"
     if test "$with_opie" != "yes"; then
 	CPPFLAGS="${CPPFLAGS} -I${with_opie}/include"