9 files changed, 16 insertions, 11 deletions
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index e1d8327..ad3cbb7 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,7 +1,8 @@
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* ktadd.c, ktbase.c, ktdefault.c, ktfr_entry.c, ktremove.c,
-	read_servi.c: Don't use KRB5_DLLIMP.
+	read_servi.c: Don't use KRB5_DLLIMP.  Don't explicitly declare
+	pointers FAR any more.
 
 2000-10-17  Ezra Peisach  <epeisach@mit.edu>
 
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index c1e910a..e23c9b1 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* ser_ktf.c: Drop _MSDOS support.
+
 2000-10-17  Ezra Peisach  <epeisach@mit.edu>
 
 	* ktf_util.c: Unsigned/signed int cleanups.
diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c
index af41896..ca54f93 100644
--- a/src/lib/krb5/keytab/file/ser_ktf.c
+++ b/src/lib/krb5/keytab/file/ser_ktf.c
@@ -166,7 +166,7 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain)
 			int	fflags = 0;
 
 			file_is_open = 1;
-#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined( macintosh) && !defined(_WIN32)
 			fflags = fcntl(fileno(ktdata->openf), F_GETFL, 0);
 			if (fflags > 0)
 			    file_is_open |= ((fflags & O_ACCMODE) << 1);
@@ -285,7 +285,7 @@ krb5_ktf_keytab_internalize(kcontext, argp, buffer, lenremain)
 				int 	fmode;
 				long	fpos;
 
-#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined( macintosh) && !defined(_WIN32)
 				fmode = (file_is_open >> 1) & O_ACCMODE;
 #else
 				fmode = 0;
diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c
index ba9e9fc..6f1fc0c 100644
--- a/src/lib/krb5/keytab/ktadd.c
+++ b/src/lib/krb5/keytab/ktadd.c
@@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_kt_add_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry FAR *entry;
+    krb5_keytab_entry *entry;
 {
     if (id->ops->add)
 	return (*id->ops->add)(context, id, entry);
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index bdac562..b808ec4 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -55,7 +55,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_srvtab;
 krb5_error_code KRB5_CALLCONV
 krb5_kt_register(context, ops)
     krb5_context context;
-    krb5_kt_ops FAR *ops;
+    krb5_kt_ops *ops;
 {
     struct krb5_kt_typelist *t;
     for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next)
@@ -84,8 +84,8 @@ krb5_kt_register(context, ops)
 krb5_error_code KRB5_CALLCONV
 krb5_kt_resolve (context, name, ktid)
     krb5_context context;
-    krb5_const char FAR *name;
-    krb5_keytab FAR *ktid;
+    krb5_const char *name;
+    krb5_keytab *ktid;
 {
     struct krb5_kt_typelist *tlist;
     char *pfx;
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index 90f03dc..51ab874 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -33,7 +33,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_kt_default(context, id)
     krb5_context context;
-    krb5_keytab FAR *id;
+    krb5_keytab *id;
 {
     char defname[BUFSIZ];
     krb5_error_code retval;
diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c
index 3582193..b985e80 100644
--- a/src/lib/krb5/keytab/ktfr_entry.c
+++ b/src/lib/krb5/keytab/ktfr_entry.c
@@ -32,7 +32,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_kt_free_entry (context, entry)
     krb5_context context;
-    krb5_keytab_entry FAR *entry;
+    krb5_keytab_entry *entry;
 {
     if (!entry)
 	return 0;
diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c
index abb3705..d9599e3 100644
--- a/src/lib/krb5/keytab/ktremove.c
+++ b/src/lib/krb5/keytab/ktremove.c
@@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_kt_remove_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry FAR *entry;
+    krb5_keytab_entry *entry;
 {
     if (id->ops->remove)
 	return (*id->ops->remove)(context, id, entry);
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index 10a3964..141184c 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -50,7 +50,7 @@ krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key)
     krb5_principal principal;
     krb5_kvno vno;
     krb5_enctype enctype;
-    krb5_keyblock FAR * FAR * key;
+    krb5_keyblock ** key;
 {
     krb5_error_code kerror = KSUCCESS;
     char keytabname[MAX_KEYTAB_NAME_LEN + 1]; /* + 1 for NULL termination */