Danilo also says we can get rid of _MSDOS (Win16) tests, and explicit FAR/NEAR specs

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

10 files changed, 120 insertions, 111 deletions

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 1393b7c47..040dce33b 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* accept_sec_context.c, gssapiP_krb5.h, import_sec_context.c,
+	krb5_gss_glue.c: Don't explicitly declare pointers FAR any more.
+
+	* pname_to_uid.c: Drop _MSDOS support.
+
 2001-10-04  Tom Yu  <tlyu@mit.edu>
 
 	* accept_sec_context.c (krb5_gss_accept_sec_context): Ignore
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 7af8f0332..a3d4a7337 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -492,7 +492,7 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
 	       }
 
 	       TREAD_STR(ptr, ptr2, bigend);
-	       option.data = (char FAR *) ptr2;
+	       option.data = (char *) ptr2;
 
 	       i -= option.length;
 
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 2ac5f4d5e..16ba01f91 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -617,7 +617,7 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
          ));
 
 gss_OID krb5_gss_convert_static_mech_oid
-PROTOTYPE( (gss_OID FAR oid
+PROTOTYPE( (gss_OID oid
 	 ));
 	
 #endif /* _GSSAPIP_KRB5_H_ */
diff --git a/src/lib/gssapi/krb5/import_sec_context.c b/src/lib/gssapi/krb5/import_sec_context.c
index fd062fa9b..3745a7c23 100644
--- a/src/lib/gssapi/krb5/import_sec_context.c
+++ b/src/lib/gssapi/krb5/import_sec_context.c
@@ -35,7 +35,7 @@
  * the OID if possible.
  */
 gss_OID krb5_gss_convert_static_mech_oid(oid)
-     gss_OID	FAR oid;
+     gss_OID	oid;
 {
 	const gss_OID_desc 	*p;
 	OM_uint32		minor_status;
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index 1d7152945..540652ad8 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -30,17 +30,17 @@ OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 		       input_token, input_chan_bindings, src_name, mech_type, 
 		       output_token, ret_flags, time_rec, delegated_cred_handle)
-     OM_uint32 FAR *minor_status;
-     gss_ctx_id_t FAR *context_handle;
+     OM_uint32 *minor_status;
+     gss_ctx_id_t *context_handle;
      gss_cred_id_t verifier_cred_handle;
      gss_buffer_t input_token;
      gss_channel_bindings_t input_chan_bindings;
-     gss_name_t FAR *src_name;
-     gss_OID FAR *mech_type;
+     gss_name_t *src_name;
+     gss_OID *mech_type;
      gss_buffer_t output_token;
-     OM_uint32 FAR *ret_flags;
-     OM_uint32 FAR *time_rec;
-     gss_cred_id_t FAR *delegated_cred_handle;
+     OM_uint32 *ret_flags;
+     OM_uint32 *time_rec;
+     gss_cred_id_t *delegated_cred_handle;
 {
    return(krb5_gss_accept_sec_context(minor_status,
 				      context_handle,
@@ -58,14 +58,14 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 		 cred_usage, output_cred_handle, actual_mechs, time_rec)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_name_t desired_name;
      OM_uint32 time_req;
      gss_OID_set desired_mechs;
      gss_cred_usage_t cred_usage;
-     gss_cred_id_t FAR *output_cred_handle;
-     gss_OID_set FAR *actual_mechs;
-     OM_uint32 FAR *time_rec;
+     gss_cred_id_t *output_cred_handle;
+     gss_OID_set *actual_mechs;
+     OM_uint32 *time_rec;
 {
    return(krb5_gss_acquire_cred(minor_status,
 				desired_name,
@@ -83,17 +83,17 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 	     cred_usage, initiator_time_req, acceptor_time_req,
 	     output_cred_handle, actual_mechs, initiator_time_rec,
 	     acceptor_time_rec)
-    OM_uint32		FAR *minor_status;
+    OM_uint32		 *minor_status;
     gss_cred_id_t	input_cred_handle;
     gss_name_t		desired_name;
     gss_OID		desired_mech;
     gss_cred_usage_t	cred_usage;
     OM_uint32		initiator_time_req;
     OM_uint32		acceptor_time_req;
-    gss_cred_id_t	FAR *output_cred_handle;
-    gss_OID_set		FAR *actual_mechs;
-    OM_uint32		FAR *initiator_time_rec;
-    OM_uint32		FAR *acceptor_time_rec;
+    gss_cred_id_t	 *output_cred_handle;
+    gss_OID_set		 *actual_mechs;
+    OM_uint32		 *initiator_time_rec;
+    OM_uint32		 *acceptor_time_rec;
 {
     return(krb5_gss_add_cred(minor_status, input_cred_handle, desired_name,
 			     desired_mech, cred_usage, initiator_time_req,
@@ -105,19 +105,19 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
-    OM_uint32	FAR *minor_status;
+    OM_uint32	 *minor_status;
     gss_OID	member_oid;
-    gss_OID_set	FAR *oid_set;
+    gss_OID_set	 *oid_set;
 {
     return(generic_gss_add_oid_set_member(minor_status, member_oid, oid_set));
 }
 
 OM_uint32 KRB5_CALLCONV
 gss_compare_name(minor_status, name1, name2, name_equal)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_name_t name1;
      gss_name_t name2;
-     int FAR *name_equal;
+     int *name_equal;
 {
    return(krb5_gss_compare_name(minor_status, name1,
 				name2, name_equal));
@@ -125,9 +125,9 @@ gss_compare_name(minor_status, name1, name2, name_equal)
 
 OM_uint32 KRB5_CALLCONV
 gss_context_time(minor_status, context_handle, time_rec)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
-     OM_uint32 FAR *time_rec;
+     OM_uint32 *time_rec;
 {
    return(krb5_gss_context_time(minor_status, context_handle,
 				time_rec));
@@ -136,16 +136,16 @@ gss_context_time(minor_status, context_handle, time_rec)
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_create_empty_oid_set(minor_status, oid_set)
-    OM_uint32	FAR *minor_status;
-    gss_OID_set	FAR *oid_set;
+    OM_uint32	 *minor_status;
+    gss_OID_set	 *oid_set;
 {
     return(generic_gss_create_empty_oid_set(minor_status, oid_set));
 }
 
 OM_uint32 KRB5_CALLCONV
 gss_delete_sec_context(minor_status, context_handle, output_token)
-     OM_uint32 FAR *minor_status;
-     gss_ctx_id_t FAR *context_handle;
+     OM_uint32 *minor_status;
+     gss_ctx_id_t *context_handle;
      gss_buffer_t output_token;
 {
    return(krb5_gss_delete_sec_context(minor_status,
@@ -154,10 +154,10 @@ gss_delete_sec_context(minor_status, context_handle, output_token)
 
 OM_uint32 KRB5_CALLCONV
 gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_name_t input_name;
      gss_buffer_t output_name_buffer;
-     gss_OID FAR *output_name_type;
+     gss_OID *output_name_type;
 {
    return(krb5_gss_display_name(minor_status, input_name,
 				output_name_buffer, output_name_type));
@@ -166,11 +166,11 @@ gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
 OM_uint32 KRB5_CALLCONV
 gss_display_status(minor_status, status_value, status_type,
 		   mech_type, message_context, status_string)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      OM_uint32 status_value;
      int status_type;
      gss_OID mech_type;
-     OM_uint32 FAR *message_context;
+     OM_uint32 *message_context;
      gss_buffer_t status_string;
 {
    return(krb5_gss_display_status(minor_status, status_value,
@@ -181,8 +181,8 @@ gss_display_status(minor_status, status_value, status_type,
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status, context_handle, interprocess_token)
-     OM_uint32		FAR *minor_status;
-     gss_ctx_id_t	FAR *context_handle;
+     OM_uint32		 *minor_status;
+     gss_ctx_id_t	 *context_handle;
      gss_buffer_t	interprocess_token;
 {
    return(krb5_gss_export_sec_context(minor_status,
@@ -194,7 +194,7 @@ gss_export_sec_context(minor_status, context_handle, interprocess_token)
 OM_uint32 KRB5_CALLCONV
 gss_get_mic(minor_status, context_handle, qop_req,
 	    message_buffer, message_token)
-     OM_uint32		FAR *minor_status;
+     OM_uint32		 *minor_status;
      gss_ctx_id_t	context_handle;
      gss_qop_t		qop_req;
      gss_buffer_t	message_buffer;
@@ -206,10 +206,10 @@ gss_get_mic(minor_status, context_handle, qop_req,
 
 OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_buffer_t input_name_buffer;
      gss_OID input_name_type;
-     gss_name_t FAR *output_name;
+     gss_name_t *output_name;
 {
    return(krb5_gss_import_name(minor_status, input_name_buffer,
 			       input_name_type, output_name));
@@ -218,9 +218,9 @@ gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status, interprocess_token, context_handle)
-     OM_uint32		FAR *minor_status;
+     OM_uint32		 *minor_status;
      gss_buffer_t	interprocess_token;
-     gss_ctx_id_t	FAR *context_handle;
+     gss_ctx_id_t	 *context_handle;
 {
    return(krb5_gss_import_sec_context(minor_status,
 				      interprocess_token,
@@ -229,8 +229,8 @@ gss_import_sec_context(minor_status, interprocess_token, context_handle)
 
 OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs(minor_status, mech_set)
-     OM_uint32 FAR *minor_status;
-     gss_OID_set FAR *mech_set;
+     OM_uint32 *minor_status;
+     gss_OID_set *mech_set;
 {
    return(krb5_gss_indicate_mechs(minor_status, mech_set));
 }
@@ -240,19 +240,19 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 		     target_name, mech_type, req_flags, time_req,
 		     input_chan_bindings, input_token, actual_mech_type,
 		     output_token, ret_flags, time_rec)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_cred_id_t claimant_cred_handle;
-     gss_ctx_id_t FAR *context_handle;
+     gss_ctx_id_t *context_handle;
      gss_name_t target_name;
      gss_OID mech_type;
      OM_uint32 req_flags;
      OM_uint32 time_req;
      gss_channel_bindings_t input_chan_bindings;
      gss_buffer_t input_token;
-     gss_OID FAR *actual_mech_type;
+     gss_OID *actual_mech_type;
      gss_buffer_t output_token;
-     OM_uint32 FAR *ret_flags;
-     OM_uint32 FAR *time_rec;
+     OM_uint32 *ret_flags;
+     OM_uint32 *time_rec;
 {
    return(krb5_gss_init_sec_context(minor_status,
 				    claimant_cred_handle, context_handle,
@@ -266,15 +266,15 @@ OM_uint32 KRB5_CALLCONV
 gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 		    lifetime_rec, mech_type, ret_flags,
 		    locally_initiated, open)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
-     gss_name_t FAR *initiator_name;
-     gss_name_t FAR *acceptor_name;
-     OM_uint32 FAR *lifetime_rec;
-     gss_OID FAR *mech_type;
-     OM_uint32 FAR *ret_flags;
-     int FAR *locally_initiated;
-     int FAR *open;
+     gss_name_t *initiator_name;
+     gss_name_t *acceptor_name;
+     OM_uint32 *lifetime_rec;
+     gss_OID *mech_type;
+     OM_uint32 *ret_flags;
+     int *locally_initiated;
+     int *open;
 {
    return(krb5_gss_inquire_context(minor_status, context_handle,
 				   initiator_name, acceptor_name, lifetime_rec,
@@ -285,12 +285,12 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 		 cred_usage, mechanisms)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_cred_id_t cred_handle;
-     gss_name_t FAR *name;
-     OM_uint32 FAR *lifetime_ret;
-     gss_cred_usage_t FAR *cred_usage;
-     gss_OID_set FAR *mechanisms;
+     gss_name_t *name;
+     OM_uint32 *lifetime_ret;
+     gss_cred_usage_t *cred_usage;
+     gss_OID_set *mechanisms;
 {
    return(krb5_gss_inquire_cred(minor_status, cred_handle,
 				name, lifetime_ret, cred_usage, mechanisms));
@@ -300,13 +300,13 @@ gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
-     OM_uint32		FAR *minor_status;
+     OM_uint32		 *minor_status;
      gss_cred_id_t	cred_handle;
      gss_OID		mech_type;
-     gss_name_t		FAR *name;
-     OM_uint32		FAR *initiator_lifetime;
-     OM_uint32		FAR *acceptor_lifetime;
-     gss_cred_usage_t	FAR *cred_usage;
+     gss_name_t		 *name;
+     OM_uint32		 *initiator_lifetime;
+     OM_uint32		 *acceptor_lifetime;
+     gss_cred_usage_t	 *cred_usage;
 {
    return(krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
 					mech_type, name, initiator_lifetime,
@@ -316,9 +316,9 @@ gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
-    OM_uint32	FAR *minor_status;
+    OM_uint32	 *minor_status;
     gss_OID	mechanism;
-    gss_OID_set	FAR *name_types;
+    gss_OID_set	 *name_types;
 {
     return(krb5_gss_inquire_names_for_mech(minor_status,
 					   mechanism,
@@ -328,7 +328,7 @@ gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
-    OM_uint32		FAR *minor_status;
+    OM_uint32		 *minor_status;
     gss_OID		oid;
     gss_buffer_t	oid_str;
 {
@@ -337,7 +337,7 @@ gss_oid_to_str(minor_status, oid, oid_str)
 
 OM_uint32 KRB5_CALLCONV
 gss_process_context_token(minor_status, context_handle, token_buffer)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t token_buffer;
 {
@@ -347,23 +347,23 @@ gss_process_context_token(minor_status, context_handle, token_buffer)
 
 OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status, cred_handle)
-     OM_uint32 FAR *minor_status;
-     gss_cred_id_t FAR *cred_handle;
+     OM_uint32 *minor_status;
+     gss_cred_id_t *cred_handle;
 {
    return(krb5_gss_release_cred(minor_status, cred_handle));
 }
 
 OM_uint32 KRB5_CALLCONV
 gss_release_name(minor_status, input_name)
-     OM_uint32 FAR *minor_status;
-     gss_name_t FAR *input_name;
+     OM_uint32 *minor_status;
+     gss_name_t *input_name;
 {
    return(krb5_gss_release_name(minor_status, input_name));
 }
 
 OM_uint32 KRB5_CALLCONV
 gss_release_buffer(minor_status, buffer)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_buffer_t buffer;
 {
    return(generic_gss_release_buffer(minor_status,
@@ -373,16 +373,16 @@ gss_release_buffer(minor_status, buffer)
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
-     OM_uint32	FAR *minor_status;
-     gss_OID	FAR *oid;
+     OM_uint32	 *minor_status;
+     gss_OID	 *oid;
 {
     return(krb5_gss_release_oid(minor_status, oid));
 }
 
 OM_uint32 KRB5_CALLCONV
 gss_release_oid_set(minor_status, set)
-     OM_uint32 FAR * minor_status;
-     gss_OID_set FAR *set;
+     OM_uint32 * minor_status;
+     gss_OID_set *set;
 {
    return(generic_gss_release_oid_set(minor_status, set));
 }
@@ -391,12 +391,12 @@ gss_release_oid_set(minor_status, set)
 OM_uint32 KRB5_CALLCONV
 gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
      int conf_req_flag;
      int qop_req;
      gss_buffer_t input_message_buffer;
-     int FAR *conf_state;
+     int *conf_state;
      gss_buffer_t output_message_buffer;
 {
    return(krb5_gss_seal(minor_status, context_handle,
@@ -408,7 +408,7 @@ OM_uint32 KRB5_CALLCONV
 gss_sign(minor_status, context_handle,
 	      qop_req, message_buffer, 
 	      message_token)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
      int qop_req;
      gss_buffer_t message_buffer;
@@ -422,11 +422,11 @@ gss_sign(minor_status, context_handle,
 OM_uint32 KRB5_CALLCONV
 gss_verify_mic(minor_status, context_handle,
 	       message_buffer, token_buffer, qop_state)
-     OM_uint32		FAR *minor_status;
+     OM_uint32		 *minor_status;
      gss_ctx_id_t	context_handle;
      gss_buffer_t	message_buffer;
      gss_buffer_t	token_buffer;
-     gss_qop_t		FAR *qop_state;
+     gss_qop_t		 *qop_state;
 {
     return(krb5_gss_verify_mic(minor_status, context_handle,
 			       message_buffer, token_buffer, qop_state));
@@ -436,12 +436,12 @@ gss_verify_mic(minor_status, context_handle,
 OM_uint32 KRB5_CALLCONV
 gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
-    OM_uint32		FAR *minor_status;
+    OM_uint32		 *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     gss_buffer_t	input_message_buffer;
-    int			FAR *conf_state;
+    int			 *conf_state;
     gss_buffer_t	output_message_buffer;
 {
     return(krb5_gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
@@ -452,9 +452,9 @@ gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
-    OM_uint32		FAR *minor_status;
+    OM_uint32		 *minor_status;
     gss_buffer_t	oid_str;
-    gss_OID		FAR *oid;
+    gss_OID		 *oid;
 {
     return(generic_gss_str_to_oid(minor_status, oid_str, oid));
 }
@@ -462,10 +462,10 @@ gss_str_to_oid(minor_status, oid_str, oid)
 /* V2 */
 OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
-    OM_uint32	FAR *minor_status;
+    OM_uint32	 *minor_status;
     gss_OID	member;
     gss_OID_set	set;
-    int		FAR *present;
+    int		 *present;
 {
     return(generic_gss_test_oid_set_member(minor_status, member, set,
 					   present));
@@ -475,12 +475,12 @@ gss_test_oid_set_member(minor_status, member, set, present)
 OM_uint32 KRB5_CALLCONV
 gss_unseal(minor_status, context_handle, input_message_buffer,
 	   output_message_buffer, conf_state, qop_state)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t input_message_buffer;
      gss_buffer_t output_message_buffer;
-     int FAR *conf_state;
-     int FAR *qop_state;
+     int *conf_state;
+     int *qop_state;
 {
    return(krb5_gss_unseal(minor_status, context_handle,
 			  input_message_buffer, output_message_buffer,
@@ -491,12 +491,12 @@ gss_unseal(minor_status, context_handle, input_message_buffer,
 OM_uint32 KRB5_CALLCONV
 gss_unwrap(minor_status, context_handle, input_message_buffer, 
 	   output_message_buffer, conf_state, qop_state)
-    OM_uint32		FAR *minor_status;
+    OM_uint32		 *minor_status;
     gss_ctx_id_t	context_handle;
     gss_buffer_t	input_message_buffer;
     gss_buffer_t	output_message_buffer;
-    int			FAR *conf_state;
-    gss_qop_t		FAR *qop_state;
+    int			 *conf_state;
+    gss_qop_t		 *qop_state;
 {
     return(krb5_gss_unwrap(minor_status, context_handle, input_message_buffer,
 			   output_message_buffer, conf_state, qop_state));
@@ -506,11 +506,11 @@ gss_unwrap(minor_status, context_handle, input_message_buffer,
 OM_uint32 KRB5_CALLCONV
 gss_verify(minor_status, context_handle, message_buffer,
 	   token_buffer, qop_state)
-     OM_uint32 FAR *minor_status;
+     OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t message_buffer;
      gss_buffer_t token_buffer;
-     int FAR *qop_state;
+     int *qop_state;
 {
    return(krb5_gss_verify(minor_status,
 			  context_handle,
@@ -523,12 +523,12 @@ gss_verify(minor_status, context_handle, message_buffer,
 OM_uint32 KRB5_CALLCONV
 gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
 		    qop_req, req_output_size, max_input_size)
-    OM_uint32		FAR *minor_status;
+    OM_uint32		 *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     OM_uint32		req_output_size;
-    OM_uint32		FAR *max_input_size;
+    OM_uint32		 *max_input_size;
 {
    return(krb5_gss_wrap_size_limit(minor_status, context_handle,
 				   conf_req_flag, qop_req,
diff --git a/src/lib/gssapi/krb5/pname_to_uid.c b/src/lib/gssapi/krb5/pname_to_uid.c
index 3bdad3f97..f851146bc 100644
--- a/src/lib/gssapi/krb5/pname_to_uid.c
+++ b/src/lib/gssapi/krb5/pname_to_uid.c
@@ -25,14 +25,14 @@
  */
 
 #include "gssapiP_krb5.h"
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include <string.h>
 #include <pwd.h>
 #include <sys/types.h>
-#endif	/* !_MSDOS && !macintosh */
+#endif	/* !_WIN32 && !macintosh */
 
 /* 
  * This function will probably get replaced with the gsscred stuff...
@@ -46,7 +46,7 @@ gss_OID name_type;
 gss_OID mech_type;
 uid_t * uid;
 {
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
 	return (0);		/* failure */
 #else
 
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9e546e279..8c6061ee4 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* g_initialize.c, mglueP.h: Drop _MSDOS support.
+
+	* g_init_sec_context.c: Don't declare pointers FAR any more.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* g_acquire_cred.c, g_oid_ops.c: Don't use GSS_DLLIMP.
diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
index 1e19c57e4..4ff47f899 100644
--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
@@ -52,7 +52,7 @@ gss_init_sec_context (minor_status,
                       ret_flags,
                       time_rec)
 
-OM_uint32 FAR *		minor_status;
+OM_uint32 *		minor_status;
 gss_cred_id_t		claimant_cred_handle;
 gss_ctx_id_t *		context_handle;
 gss_name_t		target_name;
@@ -61,10 +61,10 @@ OM_uint32		req_flags;
 OM_uint32		time_req;
 gss_channel_bindings_t	input_chan_bindings;
 gss_buffer_t		input_token;
-gss_OID FAR *		actual_mech_type;
+gss_OID *		actual_mech_type;
 gss_buffer_t		output_token;
-OM_uint32 FAR *		ret_flags;
-OM_uint32 FAR *		time_rec;
+OM_uint32 *		ret_flags;
+OM_uint32 *		time_rec;
 
 {
     OM_uint32		status, temp_status, temp_minor_status;
diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index 45310a7a9..563450fc9 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -157,7 +157,7 @@ void gss_initialize ()
 
 #endif /* USE_SOLARIS_SHARED_LIBRARIES */
 
-#if !defined(_MSDOS) && !defined(macintosh)
+#if !defined(macintosh)
     if (__gss_mechs_array == NULL) { /* this is very bad! */
       fprintf(stderr,"gss_initialize fatal error: no mechanisms loaded!\n");
       exit(-1);
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index 22b8c5bdb..0a526ba08 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -12,10 +12,6 @@
 
 #include "mechglue.h"
 
-#ifdef _MSDOS
-#include <malloc.h>
-#endif
-
 /*
  * Array of context IDs typed by mechanism OID
  */