From: Todd C. Miller Date: Fri, 16 Oct 2009 13:52:47 +0000 (+0000) Subject: Disable transcript support if no tcsetpgrp until we support older BSD-style X-Git-Tag: SUDO_1_7_3~226 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52b2762f701b82970d4a40752af76958a03bd576;p=sudo Disable transcript support if no tcsetpgrp until we support older BSD-style job control. --- diff --git a/config.h.in b/config.h.in index 7737232b9..400e4a66b 100644 --- a/config.h.in +++ b/config.h.in @@ -500,6 +500,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the `tcsetpgrp' function. */ +#undef HAVE_TCSETPGRP + /* Define to 1 if you have the header file and the `tcgetattr' function. */ #undef HAVE_TERMIOS_H diff --git a/configure b/configure index 0a69ee01b..69a201732 100755 --- a/configure +++ b/configure @@ -25613,9 +25613,111 @@ echo "${ECHO_T}$enable_transcript" >&6; } if test "${enable_transcript-yes}" != "no"; then - SUDO_OBJS="${SUDO_OBJS} pty.o script.o" - PROGS="$PROGS sudoreplay" - REPLAY="" + # currently require POSIX job control for transcript support + +for ac_func in tcsetpgrp +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + + SUDO_OBJS="${SUDO_OBJS} pty.o script.o" + PROGS="$PROGS sudoreplay" + REPLAY="" + +else + + { echo "$as_me:$LINENO: WARNING: Disabling transcript support due to lack of tcsetpgrp function" >&5 +echo "$as_me: WARNING: Disabling transcript support due to lack of tcsetpgrp function" >&2;} + enable_transcript=no + +fi +done + fi case "$with_passwd" in diff --git a/configure.in b/configure.in index b20d59974..b66ad6dde 100644 --- a/configure.in +++ b/configure.in @@ -2597,9 +2597,15 @@ dnl dnl If transcript is enabled, build sudoreplay and add pty.o script.o for sudo dnl if test "${enable_transcript-yes}" != "no"; then - SUDO_OBJS="${SUDO_OBJS} pty.o script.o" - PROGS="$PROGS sudoreplay" - REPLAY="" + # currently require POSIX job control for transcript support + AC_CHECK_FUNCS(tcsetpgrp, [ + SUDO_OBJS="${SUDO_OBJS} pty.o script.o" + PROGS="$PROGS sudoreplay" + REPLAY="" + ], [ + AC_MSG_WARN([Disabling transcript support due to lack of tcsetpgrp function]) + enable_transcript=no + ]) fi dnl