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 some square brackets in case statements that needed to be doubled

Browse Source 
up.  While here, use $OSMAJOR when it makes sense.
This commit is contained in:
Todd C. Miller 2011-09-16 13:05:21 -04:00
parent fd2d709bd2
commit 647e087cd3
2 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure vendored
View File

@ -13754,8 +13754,12 @@ rm -f core conftest.err conftest.$ac_objext \
LDFLAGS="$O_LDFLAGS" LDFLAGS="$O_LDFLAGS"
# On AIX 6 and higher default to PAM, else default to LAM # On AIX 6 and higher default to PAM, else default to LAM
case "$OSREV" in if test $OSMAJOR -ge 6; then
1-5.*) if test X"$with_aixauth" = X""; then if test X"$with_pam" = X""; then
AUTH_EXCL_DEF="PAM"
fi
else
if test X"$with_aixauth" = X""; then
for ac_func in authenticate for ac_func in authenticate
do : do :
ac_fn_c_check_func "$LINENO" "authenticate" "ac_cv_func_authenticate" ac_fn_c_check_func "$LINENO" "authenticate" "ac_cv_func_authenticate"
@ -13768,12 +13772,7 @@ fi
done done
fi fi
;;
*) if test X"$with_pam" = X""; then
AUTH_EXCL_DEF="PAM"
fi fi
;;
esac
# AIX analog of nsswitch.conf, enabled by default # AIX analog of nsswitch.conf, enabled by default
@ -13804,10 +13803,10 @@ fi
done done
# LDR_PRELOAD is supported in AIX 5.3 and later # LDR_PRELOAD is only supported in AIX 5.3 and later
case "$OSREV" in if test $OSMAJOR -lt 5; then
1-4.*) with_noexec=no ;; with_noexec=no
esac fi
# AIX-specific functions # AIX-specific functions
for ac_func in getuserattr setauthdb for ac_func in getuserattr setauthdb
@ -13859,7 +13858,7 @@ $as_echo "$sudo_cv_var_hpccbundled" >&6; }
# Build PA-RISC1.1 objects for better portability # Build PA-RISC1.1 objects for better portability
case "$host_cpu" in case "$host_cpu" in
hppa2-9*) hppa[2-9]*)
_CFLAGS="$CFLAGS" _CFLAGS="$CFLAGS"
if test -n "$GCC"; then if test -n "$GCC"; then
portable_flag="-march=1.1" portable_flag="-march=1.1"
@ -13903,7 +13902,7 @@ $as_echo "$sudo_cv_var_daportable" >&6; }
esac esac
case "$host" in case "$host" in
*-*-hpux1-8.*) *-*-hpux[1-8].*)
$as_echo "#define BROKEN_SYSLOG 1" >>confdefs.h $as_echo "#define BROKEN_SYSLOG 1" >>confdefs.h
;; ;;
@ -14226,20 +14225,16 @@ done
CHECKSHADOW="false" CHECKSHADOW="false"
# OpenBSD >= 3.0 supports BSD auth # OpenBSD >= 3.0 supports BSD auth
if test -z "$with_bsdauth"; then if test -z "$with_bsdauth"; then
case "$OSREV" in if test "$OSMAJOR" -ge 3; then
0-2.*)
;;
*)
AUTH_EXCL_DEF="BSD_AUTH" AUTH_EXCL_DEF="BSD_AUTH"
;; fi
esac
fi fi
: ${with_logincap='maybe'} : ${with_logincap='maybe'}
;; ;;
*-*-*netbsd*) *-*-*netbsd*)
# NetBSD has a real setreuid(2) starting with 1.3.2 # NetBSD has a real setreuid(2) starting with 1.3.2
case "$OSREV" in case "$OSREV" in
0.9*|1.012*|1.3|1.3.1) 0.9*|1.[012]*|1.3|1.3.1)
SKIP_SETREUID=yes SKIP_SETREUID=yes
;; ;;
esac esac

37
configure.in
View File

@ -1508,16 +1508,15 @@ case "$host" in
LDFLAGS="$O_LDFLAGS" LDFLAGS="$O_LDFLAGS"
# On AIX 6 and higher default to PAM, else default to LAM # On AIX 6 and higher default to PAM, else default to LAM
case "$OSREV" in if test $OSMAJOR -ge 6; then
[1-5].*) if test X"$with_aixauth" = X""; then if test X"$with_pam" = X""; then
AC_CHECK_FUNCS(authenticate, [AUTH_EXCL_DEF="AIX_AUTH"])
fi
;;
*) if test X"$with_pam" = X""; then
AUTH_EXCL_DEF="PAM" AUTH_EXCL_DEF="PAM"
fi fi
;; else
esac if test X"$with_aixauth" = X""; then
AC_CHECK_FUNCS(authenticate, [AUTH_EXCL_DEF="AIX_AUTH"])
fi
fi
# AIX analog of nsswitch.conf, enabled by default # AIX analog of nsswitch.conf, enabled by default
AC_ARG_WITH(netsvc, [AS_HELP_STRING([--with-netsvc[[=PATH]]], [path to netsvc.conf])], AC_ARG_WITH(netsvc, [AS_HELP_STRING([--with-netsvc[[=PATH]]], [path to netsvc.conf])],
@ -1534,10 +1533,10 @@ case "$host" in
# For implementing getgrouplist() # For implementing getgrouplist()
AC_CHECK_FUNCS(getgrset) AC_CHECK_FUNCS(getgrset)
# LDR_PRELOAD is supported in AIX 5.3 and later # LDR_PRELOAD is only supported in AIX 5.3 and later
case "$OSREV" in if test $OSMAJOR -lt 5; then
[1-4].*) with_noexec=no ;; with_noexec=no
esac fi
# AIX-specific functions # AIX-specific functions
AC_CHECK_FUNCS(getuserattr setauthdb) AC_CHECK_FUNCS(getuserattr setauthdb)
@ -1572,7 +1571,7 @@ case "$host" in
# Build PA-RISC1.1 objects for better portability # Build PA-RISC1.1 objects for better portability
case "$host_cpu" in case "$host_cpu" in
hppa[2-9]*) hppa[[2-9]]*)
_CFLAGS="$CFLAGS" _CFLAGS="$CFLAGS"
if test -n "$GCC"; then if test -n "$GCC"; then
portable_flag="-march=1.1" portable_flag="-march=1.1"
@ -1596,7 +1595,7 @@ case "$host" in
esac esac
case "$host" in case "$host" in
*-*-hpux[1-8].*) *-*-hpux[[1-8]].*)
AC_DEFINE(BROKEN_SYSLOG) AC_DEFINE(BROKEN_SYSLOG)
;; ;;
*-*-hpux9.*) *-*-hpux9.*)
@ -1800,20 +1799,16 @@ case "$host" in
CHECKSHADOW="false" CHECKSHADOW="false"
# OpenBSD >= 3.0 supports BSD auth # OpenBSD >= 3.0 supports BSD auth
if test -z "$with_bsdauth"; then if test -z "$with_bsdauth"; then
case "$OSREV" in if test "$OSMAJOR" -ge 3; then
[0-2].*)
;;
*)
AUTH_EXCL_DEF="BSD_AUTH" AUTH_EXCL_DEF="BSD_AUTH"
;; fi
esac
fi fi
: ${with_logincap='maybe'} : ${with_logincap='maybe'}
;; ;;
*-*-*netbsd*) *-*-*netbsd*)
# NetBSD has a real setreuid(2) starting with 1.3.2 # NetBSD has a real setreuid(2) starting with 1.3.2
case "$OSREV" in case "$OSREV" in
0.9*|1.[012]*|1.3|1.3.1) 0.9*|1.[[012]]*|1.3|1.3.1)
SKIP_SETREUID=yes SKIP_SETREUID=yes
;; ;;
esac esac