summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2000-10-05 17:14:11 +0000
committerEzra Peisach <epeisach@mit.edu>2000-10-05 17:14:11 +0000
commit748d56a449f40dda429d733eff397cc5d5a2985d (patch)
tree9c4f60f8f96b0ab39e1c33ae5203ec5658495bf4
parent80ee98fad9f710117b6a63bd04cc7659bdf94f14 (diff)
downloadkrb5-748d56a449f40dda429d733eff397cc5d5a2985d.tar.gz
krb5-748d56a449f40dda429d733eff397cc5d5a2985d.tar.xz
krb5-748d56a449f40dda429d733eff397cc5d5a2985d.zip
* 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
-rw-r--r--src/lib/krb4/ChangeLog10
-rw-r--r--src/lib/krb4/configure.in1
-rw-r--r--src/lib/krb4/in_tkt.c2
-rw-r--r--src/lib/krb4/netread.c3
-rw-r--r--src/lib/krb4/netwrite.c4
5 files changed, 19 insertions, 1 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index f87198fb4..c87bedb88 100644
--- 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 59937e1ac..470c3e3b9 100644
--- 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 04d887d53..53f40f50e 100644
--- 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 91a868c86..22e9b668d 100644
--- 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 403ee4fb5..b7d25804d 100644
--- 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