From e5087b7269a88adee82af186d7731e6e8ed4e4f3 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sat, 17 Oct 2009 12:54:07 +0000 Subject: [PATCH] Add support for IRIX-style dynamic ptys --- config.h.in | 3 ++ configure | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 10 +++--- pty.c | 52 +++++++++++++++++++--------- 4 files changed, 142 insertions(+), 20 deletions(-) diff --git a/config.h.in b/config.h.in index 400e4a66b..5aa969c52 100644 --- a/config.h.in +++ b/config.h.in @@ -550,6 +550,9 @@ /* Define to 1 if you have the `waitpid' function. */ #undef HAVE_WAITPID +/* Define to 1 if you have the `_getpty' function. */ +#undef HAVE__GETPTY + /* Define to 1 if you have the `_innetgr' function. */ #undef HAVE__INNETGR diff --git a/configure b/configure index 69a201732..d5f2a1a6c 100755 --- a/configure +++ b/configure @@ -16783,6 +16783,99 @@ _ACEOF else +for ac_func in _getpty +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 + +else + + for ac_func in grantpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -17069,6 +17162,10 @@ fi done +fi +done + + fi diff --git a/configure.in b/configure.in index b66ad6dde..e36805c12 100644 --- a/configure.in +++ b/configure.in @@ -1858,10 +1858,12 @@ AC_CHECK_FUNCS(openpty, [AC_CHECK_HEADERS(util.h pty.h, [break])], [ SUDO_LIBS="${SUDO_LIBS} -lutil" AC_DEFINE(HAVE_OPENPTY) ], [ - AC_CHECK_FUNCS(grantpt, [ - AC_CHECK_FUNCS(posix_openpt) - ], [ - AC_CHECK_FUNCS(revoke) + AC_CHECK_FUNCS(_getpty, [], [ + AC_CHECK_FUNCS(grantpt, [ + AC_CHECK_FUNCS(posix_openpt) + ], [ + AC_CHECK_FUNCS(revoke) + ]) ]) ]) ]) diff --git a/pty.c b/pty.c index 9158078c9..4a0b0e357 100644 --- a/pty.c +++ b/pty.c @@ -60,7 +60,7 @@ __unused static const char rcsid[] = "$Sudo$"; #endif /* lint */ -#ifdef HAVE_OPENPTY +#if defined(HAVE_OPENPTY) int get_pty(master, slave, name, namesz) int *master; @@ -80,23 +80,45 @@ get_pty(master, slave, name, namesz) return(1); } -#else -# ifdef HAVE_GRANTPT -# ifndef HAVE_POSIX_OPENPT +#elif defined(HAVE__GETPTY) +int +get_pty(master, slave, name, namesz) + int *master; + int *slave; + char *name; + size_t namesz; +{ + char *line; + + /* IRIX-style dynamic ptys (may fork) */ + line = _getpty(master, O_RDWR, IRUSR|S_IWUSR|S_IWGRP, 0); + if (line == NULL) + return (0); + *slave = open(line, O_RDWR|O_NOCTTY, 0); + if (*slave == -1) { + close(*master); + return(0); + } + (void) chown(line, runas_pw->pw_uid, -1); + strlcpy(name, line, namesz); + return(1); +} +#elif defined(HAVE_GRANTPT) +# ifndef HAVE_POSIX_OPENPT static int posix_openpt(oflag) int oflag; { int fd; -# ifdef _AIX +# ifdef _AIX fd = open("/dev/ptc", oflag); -# else +# else fd = open("/dev/ptmx", oflag); -# endif +# endif return(fd); } -# endif /* HAVE_POSIX_OPENPT */ +# endif /* HAVE_POSIX_OPENPT */ int get_pty(master, slave, name, namesz) @@ -111,7 +133,7 @@ get_pty(master, slave, name, namesz) if (*master == -1) return(0); - (void) grantpt(*master); + (void) grantpt(*master); /* may fork */ if (unlockpt(*master) != 0) { close(*master); return(0); @@ -126,16 +148,16 @@ get_pty(master, slave, name, namesz) close(*master); return(0); } -#ifdef I_PUSH +# ifdef I_PUSH ioctl(*slave, I_PUSH, "ptem"); /* pseudo tty emulation module */ ioctl(*slave, I_PUSH, "ldterm"); /* line discipline module */ -#endif +# endif (void) chown(line, runas_pw->pw_uid, -1); strlcpy(name, line, namesz); return(1); } -# else /* !HAVE_GRANTPT */ +#else /* Old-style BSD ptys */ static char line[] = "/dev/ptyXX"; @@ -166,9 +188,9 @@ get_pty(master, slave, name, namesz) line[sizeof("/dev/p") - 2] = 't'; (void) chown(line, runas_pw->pw_uid, ttygid); (void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP); -# ifdef HAVE_REVOKE +# ifdef HAVE_REVOKE (void) revoke(line); -# endif +# endif *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave != -1) { strlcpy(name, line, namesz); @@ -179,6 +201,4 @@ get_pty(master, slave, name, namesz) } return(0); } - -# endif /* HAVE_GRANTPT */ #endif /* HAVE_OPENPTY */