* configure.in: Added tests for HAVE_SETOWN, HAVE_SYS_FILIO_H.

	* krlogin.c, krsh.c, krshd.c, krlogin.c, krlogind.c: use them.

Still doesn't build on Solaris, but it's a start.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index f2de44018979befde31795e20b49c5306360d43b..d2bc139d45887bf0acbaf49e82e30b9a704adfe9 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 26 00:25:57 1994  Mark Eichin  (eichin@cygnus.com)
+
+       * configure.in: Added tests for HAVE_SETOWN, HAVE_SYS_FILIO_H.
+       * krlogin.c, krsh.c, krshd.c, krlogin.c, krlogind.c: use them.
+
 Sat Jul 23 08:48:50 1994  Tom Yu  (tlyu@dragons-lair)
 
        * kcmd.c:

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 385d1b446c7e1ba97f616e99a31deb7e5e52d1c6..bbba8b8bdf5b53cc0503ebfa169bc01fb02e1fb9 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -8,6 +8,12 @@ AC_PROG_INSTALL
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
 AC_FUNC_CHECK(utimes,AC_DEFINE(HAS_UTIMES))
+AC_HAVE_HEADERS(sys/filio.h)
+AC_COMPILE_CHECK([F_SETOWN],
+[#include <sys/types.h>
+#include <fcntl.h>],
+[1+F_SETOWN;], 
+AC_DEFINE(HAVE_SETOWN))
 KRB_INCLUDE
 WITH_KRB5ROOT
 WITH_KRB4

diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index bd72f4fdb10f3d23f458e11179f8da939d1f6edb..4402b19276ed18c07f9f76222681574c58c7e8cd 100644 (file)
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -181,11 +181,9 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
            krb5_free_creds(ret_cred);
            return (-1);
        }
-#if defined (hpux) || defined (CRAY)  /*hpux does not handle async
-                                       io thus setown is disabled */
-#else
+#ifdef HAVE_SETOWN
        fcntl(s, F_SETOWN, pid);
-#endif /* hpux */
+#endif
        sin.sin_family = hp->h_addrtype;
        memcpy((caddr_t)&sin.sin_addr,hp->h_addr, hp->h_length);
        sin.sin_port = rport;

diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 581e0b8e340b7a26c276f11a46bdbe4f93b34fcb..a9f02be62e67b2bd133a55b536cb31269f9c7c6a 100644 (file)
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -503,7 +503,7 @@ main(argc, argv)
        it to the reader, and the oob() processing code in the reader will
        work properly even if it is called when no oob() data is present.
        */
-#ifndef SYSV
+#ifdef HAVE_SETOWN
     (void) fcntl(rem, F_SETOWN, getpid());
 #endif
     if (options & SO_DEBUG &&
@@ -1059,7 +1059,7 @@ reader(oldmask)
     (void) signal(SIGTTOU, SIG_IGN);
     (void) signal(SIGURG, oob);
     ppid = getppid();
-#ifndef SYSV
+#ifdef HAVE_SETOWN
     (void) fcntl(rem, F_SETOWN, pid);
 #endif
     (void) setjmp(rcvtop);

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index c801455d2c15b13c30fee1f5937e467c035cedfa..ce5ff5aac5483ca50d73f43f8d968852235ff46c 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -155,6 +155,11 @@ static char sccsid[] = "@(#)rlogind.c      5.17 (Berkeley) 8/31/88";
 #include <sys/param.h>
 #include <utmp.h>
      
+#ifdef HAVE_SYS_FILIO_H
+/* get FIONBIO from sys/filio.h, so what if it is a compatibility feature */
+#include <sys/filio.h>
+#endif
+
 #ifdef NO_WINSIZE
 struct winsize {
     unsigned short ws_row, ws_col;

diff --git a/src/appl/bsd/krsh.c b/src/appl/bsd/krsh.c
index 8551bd32e2e368a2f4588a095b0332926acde83e..9dace665e67916820f819326ffb3de191aaba837 100644 (file)
--- a/src/appl/bsd/krsh.c
+++ b/src/appl/bsd/krsh.c
@@ -49,6 +49,11 @@ static char sccsid[] = "@(#)rsh.c    5.7 (Berkeley) 9/20/88";
 #include <pwd.h>
 #include <netdb.h>
      
+#ifdef HAVE_SYS_FILIO_H
+/* get FIONBIO from sys/filio.h, so what if it is a compatibility feature */
+#include <sys/filio.h>
+#endif
+
 #ifdef KERBEROS
 #include <krb5/krb5.h>
 #include <krb5/asn1.h>

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index a000a7a0c2f26ff8a5868066bf9ed32d2bd6ec3f..5aabbb54ee518e328ec0508eb56b88d313a84363 100644 (file)
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -150,6 +150,11 @@ static char sccsid[] = "@(#)rshd.c 5.12 (Berkeley) 9/12/88";
      
 #include <syslog.h>
      
+#ifdef HAVE_SYS_FILIO_H
+/* get FIONBIO from sys/filio.h, so what if it is a compatibility feature */
+#include <sys/filio.h>
+#endif
+
 #ifdef KERBEROS
 #include <krb5/krb5.h>
 #include <krb5/asn1.h>