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

31 files changed, 115 insertions, 114 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 3073ae40c..84106b5e6 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,13 +1,14 @@
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
-	* dest_tkt.c, err_tkt.c, g_admhst.c, g_cred.c, g_krbhst.c,
+	* dest_tkt.c, err_txt.c, g_admhst.c, g_cred.c, g_krbhst.c,
 	g_krbrlm.c, g_phost.c, g_pw_in_tkt.c, g_pw_tkt.c, g_svc_in_tkt.c,
 	g_tf_fname.c, g_tf_realm.c, g_tkt_svc.c, in_tkt.c, kname_parse.c,
 	kuserok.c, lifetime.c, memcache.c, mk_auth.c, mk_err.c, mk_priv.c,
 	mk_req.c, mk_safe.c, put_svc_key.c, rd_err.c, rd_priv.c, rd_req.c,
 	rd_safe.c, rd_svc_key.c, realmofhost.c, recvauth.c, save_creds.c,
-	sendauth.c, tf_util.c, unix_time.c, win_store.c: Don't use
-	KRB5_DLLIMP.
+	send_to_kdc.c, sendauth.c, tf_util.c, unix_time.c, win_glue.c,
+	win_store.c: Don't use KRB5_DLLIMP.  Don't explicitly declare
+	pointers FAR any more.
 
 2001-09-28  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/lib/krb4/err_txt.c b/src/lib/krb4/err_txt.c
index 46272c5ec..0a6fdeb49 100644
--- a/src/lib/krb4/err_txt.c
+++ b/src/lib/krb4/err_txt.c
@@ -22,7 +22,7 @@ const
 #ifdef MULTIDIMENSIONAL_ERR_TXT
  char krb_err_txt[256][60] = {  
 #else 
- char FAR *const krb_err_txt [256] = { 
+ char *const krb_err_txt [256] = { 
 #endif
   "OK",							/* 000 */
   "Principal expired (kerberos)",			/* 001 */
@@ -283,7 +283,7 @@ const
 };
 
 
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 krb_get_err_text (code)
     int code;
 {
diff --git a/src/lib/krb4/g_admhst.c b/src/lib/krb4/g_admhst.c
index 1222fb854..9d844a990 100644
--- a/src/lib/krb4/g_admhst.c
+++ b/src/lib/krb4/g_admhst.c
@@ -37,8 +37,8 @@
 
 int KRB5_CALLCONV
 krb_get_admhst(h, r, n)
-    char FAR *h;
-    char FAR *r;
+    char *h;
+    char *r;
     int n;
 {
     FILE *cnffile;
diff --git a/src/lib/krb4/g_cred.c b/src/lib/krb4/g_cred.c
index 4660fd42a..498a5f106 100644
--- a/src/lib/krb4/g_cred.c
+++ b/src/lib/krb4/g_cred.c
@@ -24,10 +24,10 @@
 
 int KRB5_CALLCONV
 krb_get_cred(service,instance,realm,c)
-    char FAR *service;		/* Service name */
-    char FAR *instance;		/* Instance */
-    char FAR *realm;		/* Auth domain */
-    CREDENTIALS FAR *c;		/* Credentials struct */
+    char *service;		/* Service name */
+    char *instance;		/* Instance */
+    char *realm;		/* Auth domain */
+    CREDENTIALS *c;		/* Credentials struct */
 {
     int tf_status;              /* return value of tf function calls */
 
diff --git a/src/lib/krb4/g_krbhst.c b/src/lib/krb4/g_krbhst.c
index fb7e7e428..b6068cd58 100644
--- a/src/lib/krb4/g_krbhst.c
+++ b/src/lib/krb4/g_krbhst.c
@@ -66,8 +66,8 @@ get_krbhst_default(h, r, n)
 
 int KRB5_CALLCONV
 krb_get_krbhst(h,r,n)
-    char FAR *h;
-    char FAR *r;
+    char *h;
+    char *r;
     int n;
 {
     FILE *cnffile;
diff --git a/src/lib/krb4/g_phost.c b/src/lib/krb4/g_phost.c
index 02643a832..c9ed5d349 100644
--- a/src/lib/krb4/g_phost.c
+++ b/src/lib/krb4/g_phost.c
@@ -48,11 +48,11 @@
  * to the original "alias" argument is returned.
  */
 
-char FAR * KRB5_CALLCONV
+char * KRB5_CALLCONV
 krb_get_phost(alias)
-    char FAR *alias;
+    char *alias;
 {
-    struct hostent FAR *h;
+    struct hostent *h;
     char *p;
     unsigned char *ucp;
     static char hostname_mem[MAXHOSTNAMELEN];
@@ -75,7 +75,7 @@ krb_get_phost(alias)
 		return (0);
 	}
 #endif
-	/* We don't want to return a FAR *, so we copy to a safe location. */
+	/* We don't want to return a *, so we copy to a safe location. */
 	strncpy (hostname_mem, h->h_name, sizeof (hostname_mem));
 	/* Bail out if h_name is too long. */
 	if (hostname_mem[MAXHOSTNAMELEN-1] != '\0')
diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c
index ad6ad867a..f878b77bd 100644
--- a/src/lib/krb4/g_pw_in_tkt.c
+++ b/src/lib/krb4/g_pw_in_tkt.c
@@ -95,9 +95,9 @@ passwd_to_key(user,instance,realm,passwd,key)
 
 int KRB5_CALLCONV
 krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
-    char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance;
+    char *user, *instance, *realm, *service, *sinstance;
     int life;
-    char FAR *password;
+    char *password;
 {
 #if defined(_WINDOWS) || defined(macintosh)
     /* In spite of the comments above, we don't allow that path here,
@@ -134,9 +134,9 @@ static int stub_key(user,instance,realm,passwd,key)
 
 int KRB5_CALLCONV
 krb_get_pw_in_tkt_preauth(user,instance,realm,service,sinstance,life,password)
-    char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance;
+    char *user, *instance, *realm, *service, *sinstance;
     int life;
-    char FAR *password;
+    char *password;
 {
    char *preauth_p;
    int   preauth_len;
diff --git a/src/lib/krb4/g_svc_in_tkt.c b/src/lib/krb4/g_svc_in_tkt.c
index 1b057611e..b41126dca 100644
--- a/src/lib/krb4/g_svc_in_tkt.c
+++ b/src/lib/krb4/g_svc_in_tkt.c
@@ -63,9 +63,9 @@ static int srvtab_to_key(user, instance, realm, srvtab, key)
 
 int KRB5_CALLCONV
 krb_get_svc_in_tkt(user, instance, realm, service, sinstance, life, srvtab)
-    char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance;
+    char *user, *instance, *realm, *service, *sinstance;
     int life;
-    char FAR *srvtab;
+    char *srvtab;
 {
     return(krb_get_in_tkt(user, instance, realm, service, sinstance, life,
                           (key_proc_type) srvtab_to_key, NULL, srvtab));
diff --git a/src/lib/krb4/g_tkt_svc.c b/src/lib/krb4/g_tkt_svc.c
index 329cb9493..a9e0db1c7 100644
--- a/src/lib/krb4/g_tkt_svc.c
+++ b/src/lib/krb4/g_tkt_svc.c
@@ -106,13 +106,13 @@ CredIsExpired( cr )
 int KRB5_CALLCONV
 krb_get_ticket_for_service (serviceName, buf, buflen, checksum, sessionKey,
 		schedule, version, includeVersion)
-	char FAR *serviceName;
-	char FAR *buf;
-	unsigned KRB4_32 FAR *buflen;
+	char *serviceName;
+	char *buf;
+	unsigned KRB4_32 *buflen;
 	int checksum;
 	des_cblock sessionKey;
 	Key_schedule schedule;
-	char FAR *version;
+	char *version;
 	int includeVersion;
 {
 	char service[SNAME_SZ];
diff --git a/src/lib/krb4/kname_parse.c b/src/lib/krb4/kname_parse.c
index b5157effa..13f844511 100644
--- a/src/lib/krb4/kname_parse.c
+++ b/src/lib/krb4/kname_parse.c
@@ -73,10 +73,10 @@
 
 int KRB5_CALLCONV
 kname_parse(np, ip, rp, fullname)
-    char FAR *np;
-    char FAR *ip;
-    char FAR *rp;
-    char FAR *fullname;
+    char *np;
+    char *ip;
+    char *rp;
+    char *fullname;
 {
     char buf[FULL_SZ];
     char *rnext, *wnext;	/* next char to read, write */
@@ -176,7 +176,7 @@ kname_parse(np, ip, rp, fullname)
 
 int KRB5_CALLCONV
 k_isname(s)
-    char FAR *s;
+    char *s;
 {
     register char c;
     int backslash = 0;
@@ -215,7 +215,7 @@ k_isname(s)
 
 int KRB5_CALLCONV
 k_isinst(s)
-    char FAR *s;
+    char *s;
 {
     register char c;
     int backslash = 0;
@@ -246,7 +246,7 @@ k_isinst(s)
 
 int KRB5_CALLCONV
 k_isrealm(s)
-    char FAR *s;
+    char *s;
 {
     register char c;
     int backslash = 0;
diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c
index 2ac2998c8..f94ee8101 100644
--- a/src/lib/krb4/kuserok.c
+++ b/src/lib/krb4/kuserok.c
@@ -97,8 +97,8 @@ parmtable kparm[] = {
 
 int KRB5_CALLCONV
 kuserok(kdata, luser)
-    AUTH_DAT	FAR *kdata;
-    char	FAR *luser;
+    AUTH_DAT	*kdata;
+    char	*luser;
 {
     struct stat sbuf;
     struct passwd *pwd;
diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c
index 5ca7c076f..ea5f1eeaa 100644
--- a/src/lib/krb4/memcache.c
+++ b/src/lib/krb4/memcache.c
@@ -61,7 +61,7 @@ static	Session		**fSessions = 0;
 
 #if defined (_WINDOWS) || defined (unix)
 /* Fake Mac handles up for general use.  */
-#define	Handle	char FAR * FAR *
+#define	Handle	char **
 #define	Size	int
 
 static OSErr memerror = noErr;
diff --git a/src/lib/krb4/mk_auth.c b/src/lib/krb4/mk_auth.c
index a6c1d9f82..96d3dd3f1 100644
--- a/src/lib/krb4/mk_auth.c
+++ b/src/lib/krb4/mk_auth.c
@@ -119,11 +119,11 @@ krb_mk_auth(options, ticket, service, inst, realm, checksum, version, buf)
      long options;		/* bit-pattern of options */
      KTEXT ticket;		/* where to put ticket (return); or
 				   supplied in case of KOPT_DONT_MK_REQ */
-     char FAR *service;		/* service name */
-     char FAR *inst;		/* instance (OUTPUT canonicalized) */
-     char FAR *realm;		/* realm */
+     char *service;		/* service name */
+     char *inst;		/* instance (OUTPUT canonicalized) */
+     char *realm;		/* realm */
      unsigned KRB4_32 checksum; /* checksum to include in request */
-     char FAR *version;		/* version string */
+     char *version;		/* version string */
      KTEXT buf;			/* Output buffer to fill  */
 {
     int rem;
@@ -213,11 +213,11 @@ int KRB5_CALLCONV
 krb_check_auth (buf, checksum, msg_data, session, schedule, laddr, faddr)
      KTEXT buf;			/* The response we read from app server */
      unsigned KRB4_32 checksum; /* checksum we included in request */
-     MSG_DAT FAR *msg_data;	/* mutual auth MSG_DAT (return) */
+     MSG_DAT *msg_data;	/* mutual auth MSG_DAT (return) */
      C_Block session;		/* credentials (input) */
      Key_schedule schedule;	/* key schedule (return) */
-     struct sockaddr_in FAR *laddr;	/* local address */
-     struct sockaddr_in FAR *faddr;	/* address of foreign host on fd */
+     struct sockaddr_in *laddr;	/* local address */
+     struct sockaddr_in *faddr;	/* address of foreign host on fd */
 {
     int cc;
     unsigned KRB4_32 cksum;
diff --git a/src/lib/krb4/mk_err.c b/src/lib/krb4/mk_err.c
index 21546607f..5eeca1bdb 100644
--- a/src/lib/krb4/mk_err.c
+++ b/src/lib/krb4/mk_err.c
@@ -50,9 +50,9 @@
 
 long KRB5_CALLCONV
 krb_mk_err(p, e, e_string)
-    u_char FAR *p;		/* Where to build error packet */
+    u_char *p;		/* Where to build error packet */
     KRB4_32 e;			/* Error code */
-    char FAR *e_string;		/* Text of error */
+    char *e_string;		/* Text of error */
 {
     u_char      *start;
     size_t	e_len;
diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c
index 17bd64d6c..bc9f9bcf1 100644
--- a/src/lib/krb4/mk_priv.c
+++ b/src/lib/krb4/mk_priv.c
@@ -95,15 +95,15 @@ extern int krb_debug;
 
 long KRB5_CALLCONV
 krb_mk_priv(in, out, length, schedule, key, sender, receiver)
-    u_char FAR *in;		/* application data */
-    u_char FAR *out;		/* put msg here, leave room for
+    u_char *in;		/* application data */
+    u_char *out;		/* put msg here, leave room for
 				 * header! breaks if in and out
 				 * (header stuff) overlap */
     unsigned KRB4_32 length;	/* of in data */
     Key_schedule schedule;	/* precomputed key schedule */
-    C_Block FAR *key;		/* encryption key for seed and ivec */
-    struct sockaddr_in FAR *sender;   /* sender address */
-    struct sockaddr_in FAR *receiver; /* receiver address */
+    C_Block *key;		/* encryption key for seed and ivec */
+    struct sockaddr_in *sender;   /* sender address */
+    struct sockaddr_in *receiver; /* receiver address */
 {
     register u_char     *p,*q;
     u_char *c_length_ptr;
diff --git a/src/lib/krb4/mk_req.c b/src/lib/krb4/mk_req.c
index fa301ffba..27b9d9adc 100644
--- a/src/lib/krb4/mk_req.c
+++ b/src/lib/krb4/mk_req.c
@@ -87,9 +87,9 @@ static int lifetime = 255;		/* Default based on the TGT */
 int KRB5_CALLCONV
 krb_mk_req(authent, service, instance, realm, checksum)
     register	KTEXT authent;	/* Place to build the authenticator */
-    char	FAR *service;	/* Name of the service */
-    char	FAR *instance;	/* Service instance */
-    char	FAR *realm;	/* Authentication domain of service */
+    char	*service;	/* Name of the service */
+    char	*instance;	/* Service instance */
+    char	*realm;	/* Authentication domain of service */
     KRB4_32	checksum;	/* Checksum of data (optional) */
 {
     KTEXT_ST req_st; /* Temp storage for req id */
diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c
index 1cc5fc21f..f4bb0a660 100644
--- a/src/lib/krb4/mk_safe.c
+++ b/src/lib/krb4/mk_safe.c
@@ -84,7 +84,7 @@ krb_mk_safe(in, out, length, key, sender, receiver)
 				 * overlap
 				 */
     unsigned KRB4_32 length;	/* of in data */
-    C_Block FAR *key;		/* encryption key for seed and ivec */
+    C_Block *key;		/* encryption key for seed and ivec */
     struct sockaddr_in *sender;	/* sender address */
     struct sockaddr_in *receiver; /* receiver address */
 {
diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c
index 787901422..d31b0a36c 100644
--- a/src/lib/krb4/put_svc_key.c
+++ b/src/lib/krb4/put_svc_key.c
@@ -40,12 +40,12 @@
  */
 int KRB5_CALLCONV
 put_svc_key(sfile,name,inst,realm,newvno,key)
-	char FAR *sfile;
-	char FAR *name;
-	char FAR *inst;
-	char FAR *realm;
+	char *sfile;
+	char *name;
+	char *inst;
+	char *realm;
 	int newvno;
-	char FAR *key;
+	char *key;
 {
 	int fd;
 	char fname[SNAME_SZ], finst[INST_SZ], frlm[REALM_SZ];
diff --git a/src/lib/krb4/rd_err.c b/src/lib/krb4/rd_err.c
index 90964df95..47f5167b5 100644
--- a/src/lib/krb4/rd_err.c
+++ b/src/lib/krb4/rd_err.c
@@ -48,10 +48,10 @@
 
 int KRB5_CALLCONV
 krb_rd_err(in, in_length, code, m_data)
-    u_char FAR *in;                 /* pointer to the msg received */
+    u_char *in;                 /* pointer to the msg received */
     u_long in_length;           /* of in msg */
-    long FAR *code;                 /* received error code */
-    MSG_DAT FAR *m_data;
+    long *code;                 /* received error code */
+    MSG_DAT *m_data;
 {
     register u_char *p;
     int le;
diff --git a/src/lib/krb4/rd_priv.c b/src/lib/krb4/rd_priv.c
index 5a99be88d..e7b42a0fa 100644
--- a/src/lib/krb4/rd_priv.c
+++ b/src/lib/krb4/rd_priv.c
@@ -84,7 +84,7 @@ krb_rd_priv(in, in_length, schedule, key, sender, receiver, m_data)
     u_char *in;			/* pointer to the msg received */
     unsigned KRB4_32 in_length; /* length of "in" msg */
     Key_schedule schedule;	/* precomputed key schedule */
-    C_Block FAR *key;		/* encryption key for seed and ivec */
+    C_Block *key;		/* encryption key for seed and ivec */
     struct sockaddr_in *sender;
     struct sockaddr_in *receiver;
     MSG_DAT *m_data;		/*various input/output data from msg */
diff --git a/src/lib/krb4/rd_req.c b/src/lib/krb4/rd_req.c
index 2c8a24726..b97bdbe0a 100644
--- a/src/lib/krb4/rd_req.c
+++ b/src/lib/krb4/rd_req.c
@@ -165,11 +165,11 @@ krb_clear_key_krb5(ctx)
 int KRB5_CALLCONV
 krb_rd_req(authent, service, instance, from_addr, ad, fn)
     register KTEXT authent;	/* The received message */
-    char FAR *service;		/* Service name */
-    char FAR *instance;		/* Service instance */
+    char *service;		/* Service name */
+    char *instance;		/* Service instance */
     unsigned KRB4_32 from_addr; /* Net address of originating host */
-    AUTH_DAT FAR *ad;		/* Structure to be filled in */
-    char FAR *fn;		/* Filename to get keys from */
+    AUTH_DAT *ad;		/* Structure to be filled in */
+    char *fn;		/* Filename to get keys from */
 {
     KTEXT_ST ticket;		/* Temp storage for ticket */
     KTEXT tkt = &ticket;
diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c
index b0e955a11..40766ba52 100644
--- a/src/lib/krb4/rd_safe.c
+++ b/src/lib/krb4/rd_safe.c
@@ -64,12 +64,12 @@ extern int krb_debug;
 
 long KRB5_CALLCONV
 krb_rd_safe(in,in_length,key,sender,receiver,m_data)
-    u_char FAR *in;			/* pointer to the msg received */
+    u_char *in;			/* pointer to the msg received */
     unsigned KRB4_32 in_length;		/* length of "in" msg */
-    C_Block FAR *key;			/* encryption key for seed and ivec */
-    struct sockaddr_in FAR *sender;	/* sender's address */
-    struct sockaddr_in FAR *receiver;	/* receiver's address -- me */
-    MSG_DAT FAR *m_data;		/* where to put message information */
+    C_Block *key;			/* encryption key for seed and ivec */
+    struct sockaddr_in *sender;	/* sender's address */
+    struct sockaddr_in *receiver;	/* receiver's address -- me */
+    MSG_DAT *m_data;		/* where to put message information */
 {
     int i;
     unsigned KRB4_32 calc_cksum[4];
diff --git a/src/lib/krb4/rd_svc_key.c b/src/lib/krb4/rd_svc_key.c
index b6188399b..c68c8e266 100644
--- a/src/lib/krb4/rd_svc_key.c
+++ b/src/lib/krb4/rd_svc_key.c
@@ -121,12 +121,12 @@ int vxworks_srvtab_read(fd, s, n)
  */
 extern krb5_error_code
 krb54_get_service_keyblock(service,instance,realm,kvno,file,keyblock)
-    char FAR *service;		/* Service Name */
-    char FAR *instance;		/* Instance name or "*" */
-    char FAR *realm;		/* Realm */
+    char *service;		/* Service Name */
+    char *instance;		/* Instance name or "*" */
+    char *realm;		/* Realm */
     int kvno;			/* Key version number */
-    char FAR *file;		/* Filename */
-    krb5_keyblock FAR * keyblock;
+    char *file;		/* Filename */
+    krb5_keyblock * keyblock;
 {
     krb5_error_code retval;
     krb5_principal princ = NULL;
@@ -212,12 +212,12 @@ errout:
 
 int KRB5_CALLCONV
 read_service_key(service,instance,realm,kvno,file,key)
-    char FAR *service;		/* Service Name */
-    char FAR *instance;		/* Instance name or "*" */
-    char FAR *realm;		/* Realm */
+    char *service;		/* Service Name */
+    char *instance;		/* Instance name or "*" */
+    char *realm;		/* Realm */
     int kvno;			/* Key version number */
-    char FAR *file;		/* Filename */
-    char FAR *key;		/* Pointer to key to be filled in */
+    char *file;		/* Filename */
+    char *key;		/* Pointer to key to be filled in */
 {
     int kret;
     
@@ -263,12 +263,12 @@ errout:
  */
 int KRB5_CALLCONV
 get_service_key(service,instance,realm,kvno,file,key)
-    char FAR *service;              /* Service Name */
-    char FAR *instance;             /* Instance name or "*" */
-    char FAR *realm;                /* Realm */
-    int  FAR *kvno;                 /* Key version number */
-    char FAR *file;                 /* Filename */
-    char FAR *key;                  /* Pointer to key to be filled in */
+    char *service;              /* Service Name */
+    char *instance;             /* Instance name or "*" */
+    char *realm;                /* Realm */
+    int *kvno;                 /* Key version number */
+    char *file;                 /* Filename */
+    char *key;                  /* Pointer to key to be filled in */
 {
     char serv[SNAME_SZ];
     char inst[INST_SZ];
diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c
index e419b56ea..d80770c09 100644
--- a/src/lib/krb4/realmofhost.c
+++ b/src/lib/krb4/realmofhost.c
@@ -43,9 +43,9 @@ extern char *malloc();
 
 static char ret_realm[REALM_SZ+1];
 
-char FAR * KRB5_CALLCONV
+char * KRB5_CALLCONV
 krb_realmofhost(host)
-    char FAR *host;
+    char *host;
 {
 	char *domain;
 	FILE *trans_file;
diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c
index 41620f53d..5d6bb41bb 100644
--- a/src/lib/krb4/recvauth.c
+++ b/src/lib/krb4/recvauth.c
@@ -126,14 +126,14 @@ krb_recvauth(options, fd, ticket, service, instance, faddr, laddr, kdata,
     long options;			 /* bit-pattern of options */
     int fd;				 /* file descr. to read from */
     KTEXT ticket;			 /* storage for client's ticket */
-    char FAR *service;			 /* service expected */
-    char FAR *instance;			 /* inst expected (may be filled in) */
-    struct sockaddr_in FAR *faddr;	 /* address of foreign host on fd */
-    struct sockaddr_in FAR *laddr;	 /* local address */
-    AUTH_DAT FAR *kdata;		 /* kerberos data (returned) */
-    char FAR *filename;			 /* name of file with service keys */
+    char *service;			 /* service expected */
+    char *instance;			 /* inst expected (may be filled in) */
+    struct sockaddr_in *faddr;	 /* address of foreign host on fd */
+    struct sockaddr_in *laddr;	 /* local address */
+    AUTH_DAT *kdata;		 /* kerberos data (returned) */
+    char *filename;			 /* name of file with service keys */
     Key_schedule schedule;		 /* key schedule (return) */
-    char FAR *version;			 /* version string (filled in) */
+    char *version;			 /* version string (filled in) */
 {
 
     int i, cc, old_vers = 0;
diff --git a/src/lib/krb4/save_creds.c b/src/lib/krb4/save_creds.c
index fbd706bcf..67ec402f1 100644
--- a/src/lib/krb4/save_creds.c
+++ b/src/lib/krb4/save_creds.c
@@ -32,9 +32,9 @@
 int KRB5_CALLCONV
 krb_save_credentials(service, instance, realm, session, lifetime, kvno,
                  ticket, issue_date)
-    char FAR *service;		/* Service name */
-    char FAR *instance;		/* Instance */
-    char FAR *realm;		/* Auth domain */
+    char *service;		/* Service name */
+    char *instance;		/* Instance */
+    char *realm;		/* Auth domain */
     C_Block session;		/* Session key */
     int lifetime;		/* Lifetime */
     int kvno;			/* Key version number */
diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c
index 8e6a19fad..47a954249 100644
--- a/src/lib/krb4/send_to_kdc.c
+++ b/src/lib/krb4/send_to_kdc.c
@@ -83,7 +83,7 @@ send_to_kdc(pkt,rpkt,realm)
     int n_hosts;
     int retval;
     struct sockaddr_in to;
-    struct hostent FAR *farkedhost;
+    struct hostent *farkedhost;
     struct hostent *host, *hostlist;
     char *cp;
     char krbhst[MAXHOSTNAMELEN];
@@ -114,7 +114,7 @@ send_to_kdc(pkt,rpkt,realm)
 
     /* The first time, decide what port to use for the KDC.  */
     if (cached_krb_udp_port == 0) {
-        register struct servent FAR *sp;
+        register struct servent *sp;
 	sp = getservbyname("kerberos","udp");
         if (sp)
 	    cached_krb_udp_port = sp->s_port;
@@ -126,7 +126,7 @@ send_to_kdc(pkt,rpkt,realm)
        as a fallback. */
     if (cached_krbsec_udp_port == 0 && 
 	cached_krb_udp_port != htons(KERBEROS_PORT)) {
-        register struct servent FAR *sp;
+        register struct servent *sp;
 	sp = getservbyname("kerberos-sec","udp");
         if (sp)
 	    cached_krbsec_udp_port = sp->s_port;
diff --git a/src/lib/krb4/sendauth.c b/src/lib/krb4/sendauth.c
index c44151cfd..691a4d11e 100644
--- a/src/lib/krb4/sendauth.c
+++ b/src/lib/krb4/sendauth.c
@@ -186,16 +186,16 @@ krb_sendauth(options, fd, ticket, service, inst, realm, checksum,
      int fd;			/* file descriptor to write onto */
      KTEXT ticket;		/* where to put ticket (return); or
 				   supplied in case of KOPT_DONT_MK_REQ */
-     char FAR *service;         /* service name */
-     char FAR *inst;            /* service instance */
-     char FAR *realm;           /* service realm */
+     char *service;         /* service name */
+     char *inst;            /* service instance */
+     char *realm;           /* service realm */
      unsigned KRB4_32 checksum; /* checksum to include in request */
      MSG_DAT *msg_data;		/* mutual auth MSG_DAT (return) */
      CREDENTIALS *cred;		/* credentials (return) */
      Key_schedule schedule;	/* key schedule (return) */
-     struct sockaddr_in FAR *laddr;	/* local address */
-     struct sockaddr_in FAR *faddr;	/* address of foreign host on fd */
-     char FAR *version;		/* version string */
+     struct sockaddr_in *laddr;	/* local address */
+     struct sockaddr_in *faddr;	/* address of foreign host on fd */
+     char *version;		/* version string */
 {
     int rem, cc;
     char srv_inst[INST_SZ];
diff --git a/src/lib/krb4/unix_glue.c b/src/lib/krb4/unix_glue.c
index a1120bb15..93a30ed01 100644
--- a/src/lib/krb4/unix_glue.c
+++ b/src/lib/krb4/unix_glue.c
@@ -26,7 +26,7 @@ krb_end_session (x)
 	return KSUCCESS;
 }
 
-char FAR *
+char *
 krb_get_default_user ()
 {
 	return 0;		/* FIXME */
diff --git a/src/lib/krb4/win_glue.c b/src/lib/krb4/win_glue.c
index c22584656..9d85a1c3f 100644
--- a/src/lib/krb4/win_glue.c
+++ b/src/lib/krb4/win_glue.c
@@ -20,12 +20,12 @@
  * but might be ordinary pointers on real machines.  Printf modifiers
  * scattered through the code don't cut it,
  * since they might break on real machines.  Microloss
- * didn't provide a function to print a char FAR *, so we wrote one.
+ * didn't provide a function to print a char *, so we wrote one.
  * It gets #define'd to fputs on real machines. 
  */
 int
 far_fputs(string, stream)
-	char FAR *string;
+	char *string;
 	FILE *stream;
 {
 	return fprintf(stream, "%Fs", string);
diff --git a/src/lib/krb4/win_store.c b/src/lib/krb4/win_store.c
index 39841fcb6..46c135268 100644
--- a/src/lib/krb4/win_store.c
+++ b/src/lib/krb4/win_store.c
@@ -119,7 +119,7 @@ krb__get_realmsfile()
  * the [DEFAULTS] section of the "kerberos.ini" file located in the
  * Windows directory.
  */
-char FAR * KRB5_CALLCONV
+char * KRB5_CALLCONV
 krb_get_default_user()
 {
 	static char username[ANAME_SZ];