Portability changes

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

6 files changed, 25 insertions, 3 deletions

diff --git a/src/lib/krb425/kuserok.c b/src/lib/krb425/kuserok.c
index 799a8be..0090796 100644
--- a/src/lib/krb425/kuserok.c
+++ b/src/lib/krb425/kuserok.c
@@ -30,6 +30,9 @@
 
 #include <pwd.h>
 #include <sys/param.h>
+#if defined(aix)   /* AIX needs BSD defined to some value for socket.h */
+#define _BSD 44
+#endif
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/file.h>
@@ -41,6 +44,17 @@
 #define NOTOK 1
 #define MAX_USERNAME 10
 
+#ifdef unicos61
+#ifdef MAXPATHLEN
+#undef MAXPATHLEN
+#endif
+#define MAXPATHLEN PATHSIZE
+#endif  /* unicos61 */
+
+#ifndef F_OK
+#define F_OK 0
+#endif
+    
 /*
  * Given a Kerberos principal "kdata", and a local username "luser",
  * determine whether user is authorized to login according to the
@@ -62,7 +76,7 @@
  * one entry per line.
  *
  * The ATHENA_COMPAT code supports old-style Athena ~luser/.klogin
- * file entries.  See the file "kparse.c".
+ * file entries.  See the file "kn_parse.c".
  */
 
 
@@ -83,7 +97,7 @@ kuserok(kdata, luser)
     int gobble;
 
     /* no account => no access */
-    if ((pwd = getpwnam(luser)) == NULL) {
+    if ((pwd = (struct passwd *) getpwnam(luser)) == NULL) {
 	return(NOTOK);
     }
     (void) strcpy(pbuf, pwd->pw_dir);
diff --git a/src/lib/krb425/mk_priv.c b/src/lib/krb425/mk_priv.c
index 96b8c36..a37b5b0 100644
--- a/src/lib/krb425/mk_priv.c
+++ b/src/lib/krb425/mk_priv.c
@@ -31,7 +31,9 @@ static char rcsid_mk_priv_c[] =
 #endif	/* !lint & !SABER */
 
 #include "krb425.h"
+#ifndef hpux
 #include <arpa/inet.h>
+#endif
 
 long
 krb_mk_priv(in, out, in_length, sched, key, sender, receiver)
diff --git a/src/lib/krb425/mk_safe.c b/src/lib/krb425/mk_safe.c
index 45748f0..53e5deb 100644
--- a/src/lib/krb425/mk_safe.c
+++ b/src/lib/krb425/mk_safe.c
@@ -31,7 +31,9 @@ static char rcsid_mk_safe_c[] =
 #endif	/* !lint & !SABER */
 
 #include "krb425.h"
+#ifndef hpux
 #include <arpa/inet.h>
+#endif
 
 long
 krb_mk_safe(in, out, in_length, key, sender, receiver)
diff --git a/src/lib/krb425/rd_priv.c b/src/lib/krb425/rd_priv.c
index f402b6f..4c58abd 100644
--- a/src/lib/krb425/rd_priv.c
+++ b/src/lib/krb425/rd_priv.c
@@ -31,7 +31,9 @@ static char rcsid_rd_priv_c[] =
 #endif	/* !lint & !SABER */
 
 #include "krb425.h"
+#ifndef hpux
 #include <arpa/inet.h>
+#endif
 
 long
 krb_rd_priv(in, in_length, sched, key, sender, receiver, msg)
diff --git a/src/lib/krb425/rd_safe.c b/src/lib/krb425/rd_safe.c
index 9ee0221..4cfb003 100644
--- a/src/lib/krb425/rd_safe.c
+++ b/src/lib/krb425/rd_safe.c
@@ -31,7 +31,9 @@ static char rcsid_rd_safe_c[] =
 #endif	/* !lint & !SABER */
 
 #include "krb425.h"
+#ifndef hpux
 #include <arpa/inet.h>
+#endif
 
 long
 krb_rd_safe(in, in_length, key, sender, receiver, msg)
diff --git a/src/lib/krb425/sendauth.c b/src/lib/krb425/sendauth.c
index eaaf1f8..1cac41e 100644
--- a/src/lib/krb425/sendauth.c
+++ b/src/lib/krb425/sendauth.c
@@ -35,7 +35,7 @@ static char rcsid_sendauth_c[] =
 #include <syslog.h>
 #include <errno.h>
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 
 #define	KRB_SENDAUTH_VERS "AUTHV0.1" /* MUST be KRB_SENDAUTH_VLEN chars */
 /*