Defining setpgrp(a,b) to setpgrp() if SETPGRP_TWOARG is not set can

cause infinite macro recursion on some C preprocessors.  Fix by
putting the #ifdef for SETPGRP_TWOARG where setpgrp is actually
called, instead of trying to redefine setpgrp().

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4653 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 667b5b43ccf8834559c54d625e1ebf12d52b2e07..281492994f10bc725e8b33d84e512483291b200d 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov  8 23:52:58 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * krshd.c (setpgrp): Defining setpgrp(a,b) to setpgrp() if
+               SETPGRP_TWOARG is not set can cause infinite macro
+               recursion on some C preprocessors.  Fix by putting the
+               #ifdef for SETPGRP_TWOARG where setpgrp is actually
+               called, instead of trying to redefine setpgrp().
+
 Mon Nov  7 21:22:00 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * configure.in: Add check for stdlib.h

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 888b847c97c40b0330cabb9a2bda12caa4a690c3..22be5c85daa81d688464cce1121a1dee3e370391 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -34,7 +34,7 @@ AC_FUNC_CHECK(setreuid,AC_DEFINE(HAVE_SETREUID))
 AC_FUNC_CHECK(setresuid,AC_DEFINE(HAVE_SETRESUID))
 AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID))
 AC_FUNC_CHECK(setsid,AC_DEFINE(HAVE_SETSID))
-AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h stdlib.h sys/label.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h)
+AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h stdlib.h sys/label.h sys/tty.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h)
 AC_COMPILE_CHECK([use streams interface],
 [#include <sys/tty.h>
 #include <sys/ttold.h>

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index a10782b95c47b68ce1678be65e09fbf7b517e8bc..159fe6ecf4554650e10a6e06d6e279db5a557c44 100644 (file)
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -173,10 +173,6 @@ char copyright[] =
 
 #include "loginpaths.h"
 
-#ifndef SETPGRP_TWOARG
-#define setpgrp(a,b) setpgrp()
-#endif
-
 #ifndef HAVE_KILLPG
 #define killpg(pid, sig) kill(-(pid), (sig))
 #endif
@@ -1112,7 +1108,11 @@ doit(f, fromp)
 #endif
            exit(0);
        }
+#ifdef SETPGRP_TWOARG
        setpgrp(0, getpid());
+#else
+       setpgrp();
+#endif
        (void) close(s); (void) close(pv[0]);
        dup2(pv[1], 2);
        (void) close(pv[1]);