More autoconf portability fixes --- for Solaris Suncc. SETPGRP_TWOARG,

HAVE_KILLPG, HAVE_SYS_TTY_H and HAVE_SYS_PTYVAR_H.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index cb1e35996223555662ddbb04066a27e6f42d527d..8cee81e678e71ba97766b59bab886cd18c305839 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 30 17:04:24 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+        * krshd.c: Use ifdef for SETPGRP_TWOARG and HAVE_KILLPG
+
+       * krlogind.c: Use ifdef include of HAVE_SYS_TTY_H and
+               HAVE_SYS_PTYVAR_H (suncc doesn't #define solaris).
+
 Thu Sep 29 22:50:05 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * Makefile.in: "make clean" should remove the executables

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index acebff8a50bd1ce94f6b361f838eaf866fb33f98..6b54bb17e306747ebe82c65e1a81bc25988d6f4d 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -160,9 +160,11 @@ char copyright[] =
 #include <sys/param.h>
 #include <utmp.h>
      
-#ifdef __svr4__
+#ifdef HAVE_SYS_TTY_H
 #include <sys/tty.h>
-#ifndef solaris20
+#endif
+
+#ifndef HAVE_SYS_PTYVAR_H
 /* These values are over-the-wire protocol, *not* local values */
 #define TIOCPKT_NOSTOP          0x10
 #define TIOCPKT_DOSTOP          0x20
@@ -171,7 +173,6 @@ char copyright[] =
 /* but solaris actually uses packet mode, so the real macros are needed too */
 #include <sys/ptyvar.h>
 #endif
-#endif
 
 #ifdef HAVE_SYS_FILIO_H
 /* get FIONBIO from sys/filio.h, so what if it is a compatibility feature */

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 575400ce8bf06be9ac8f831e484f27f299ba817a..7cb75bce015f19d1d855b3b113f07def00457b87 100644 (file)
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -173,21 +173,12 @@ char copyright[] =
 
 #include "loginpaths.h"
 
-/** XXX - make these portable **/
-#ifdef hpux
-/* has no killpg... */
-#define killpg(pid, sig) kill(-(pid), (sig))
-#endif
-
-#ifdef __svr4__
+#ifndef SETPGRP_TWOARG
 #define setpgrp(a,b) setpgrp()
-#define getpgrp(a) getpgid(a)
-/* has no killpg... */
-#define killpg(pid, sig) kill(-(pid), (sig))
 #endif
 
-#ifdef linux
-#define setpgrp(a,b) setpgid(a,b) 
+#ifndef HAVE_KILLPG
+#define killpg(pid, sig) kill(-(pid), (sig))
 #endif
 
 #ifdef __SCO__