* netread.c, netwrite.c: Include unistd.h if present on machine

	for read/write prototypes.

	* in_tkt.c: Argument to umask should be of type uid_t.

	* configure.in: Test for uid_t (AC_TYPE_UID_T).

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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index f87198fb44393757b9bebc6591f0323b62992620..c87bedb88993f3b7623b59b41196fe9e4dc732d5 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-05  Ezra Peisach  <epeisach@mit.edu>
+
+       * netread.c, netwrite.c: Include unistd.h if present on machine
+       for read/write prototypes.
+
+       * in_tkt.c: Argument to umask should be of type uid_t.
+
+       * configure.in: Test for uid_t (AC_TYPE_UID_T).
+       
+
 2000-08-31  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in(OBJS, SRCS): Add lifetime.{o,c}.

diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index 59937e1ace18cb2266c6e224d59ca0faec30f051..470c3e3b90106c4c76d662024f51c767ba144d16 100644 (file)
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -37,6 +37,7 @@ if test $ac_cv_sizeof_int = 2; then
 else
        AC_DEFINE(BITS32)
 fi
+AC_TYPE_UID_T
 AC_DEFINE(KRB4_USE_KEYTAB)
 AC_HAVE_FUNCS(strdup seteuid setreuid setresuid)
 AC_PROG_AWK

diff --git a/src/lib/krb4/in_tkt.c b/src/lib/krb4/in_tkt.c
index 04d887d53ed9469da72a2524675def49f71ef92a..53f40f50e32f382e2dbb408c66a532953e2daecf 100644 (file)
--- a/src/lib/krb4/in_tkt.c
+++ b/src/lib/krb4/in_tkt.c
@@ -61,7 +61,7 @@ in_tkt(pname,pinst)
     int fd;
     register int i;
     char charbuf[BUFSIZ];
-    int mask;
+    uid_t mask;
 #ifdef TKT_SHMEM
     char shmidname[MAXPATHLEN];
 #endif /* TKT_SHMEM */

diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c
index 91a868c86b69d169ddaffdff5a94a1ed2c3bdcc6..22e9b668da7ca376ef949f8601018b8c4f7697d6 100644 (file)
--- a/src/lib/krb4/netread.c
+++ b/src/lib/krb4/netread.c
@@ -11,6 +11,9 @@
 #include <errno.h>
 #define        DEFINE_SOCKADDR
 #include "krb.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifndef _WINDOWS
 extern int errno;
 #endif

diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c
index 403ee4fb5240ffd9c1922a2e0fa345e1aea69400..b7d25804dc9eba0b87e844232b28de46038c5149 100644 (file)
--- a/src/lib/krb4/netwrite.c
+++ b/src/lib/krb4/netwrite.c
@@ -11,6 +11,10 @@
 #include <errno.h>
 #define        DEFINE_SOCKADDR
 #include "krb.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifndef _WINDOWS
 extern int errno;
 #endif