summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ChangeLog4
-rw-r--r--src/include/k5-int.h168
-rw-r--r--src/include/kerberosIV/ChangeLog3
-rw-r--r--src/include/kerberosIV/des.h14
-rw-r--r--src/include/kerberosIV/krb.h162
-rw-r--r--src/include/krb5.hin644
-rw-r--r--src/include/krb5/ChangeLog6
-rw-r--r--src/include/krb5/adm_defs.h14
-rw-r--r--src/include/krb5/adm_proto.h2
-rw-r--r--src/include/krb5/kdb.h4
-rw-r--r--src/include/krb5/kdb_dbc.h4
-rw-r--r--src/include/krb5/kdb_dbm.h4
-rw-r--r--src/include/krb5/kdb_kt.h4
-rw-r--r--src/include/krb5/kwinsock.h192
-rw-r--r--src/include/krb5/stock/ChangeLog4
-rw-r--r--src/include/krb5/stock/osconf.h4
-rw-r--r--src/include/krb54proto.h6
-rw-r--r--src/include/port-sockets.h6
-rw-r--r--src/include/win-mac.h55
19 files changed, 629 insertions, 671 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 5602bf9ac..1fc8004ea 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,7 +1,9 @@
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* k5-int.h, krb5.hin, win-mac.h: Don't use or define KRB5_DLLIMP,
- GSS_DLLIMP.
+ GSS_DLLIMP. Drop MSDOS, NEAR, FAR support.
+ * krb54proto.h: Don't explicitly declare pointers FAR any more.
+ * port-sockets.h: Delete _MSDOS support.
2001-09-28 Ken Raeburn <raeburn@mit.edu>
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 201935c7a..f890242d8 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -89,14 +89,14 @@
* Machine-type definitions: PC Clone 386 running Microloss Windows
*/
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
#include "win-mac.h"
#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
#pragma import on
#endif
#endif
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
/* Kerberos Windows initialization file */
#define KERBEROS_INI "kerberos.ini"
#define INI_FILES "Files"
@@ -160,8 +160,6 @@ typedef unsigned char u_char;
#define KRB5_CALLCONV
#define KRB5_CALLCONV_C
#define KRB5_EXPORTVAR
-#define FAR
-#define NEAR
#endif
#ifndef O_BINARY
#define O_BINARY 0
@@ -633,28 +631,28 @@ typedef struct _krb5_cryptosystem_entry {
krb5_error_code (*encrypt_func) ( krb5_const_pointer /* in */,
krb5_pointer /* out */,
krb5_const size_t,
- krb5_encrypt_block FAR *,
+ krb5_encrypt_block *,
krb5_pointer);
krb5_error_code (*decrypt_func) ( krb5_const_pointer /* in */,
krb5_pointer /* out */,
krb5_const size_t,
- krb5_encrypt_block FAR *,
+ krb5_encrypt_block *,
krb5_pointer);
- krb5_error_code (*process_key) ( krb5_encrypt_block FAR *,
- krb5_const krb5_keyblock FAR *);
- krb5_error_code (*finish_key) ( krb5_encrypt_block FAR *);
- krb5_error_code (*string_to_key) (krb5_const krb5_encrypt_block FAR *,
- krb5_keyblock FAR *,
- krb5_const krb5_data FAR *,
- krb5_const krb5_data FAR *);
- krb5_error_code (*init_random_key) ( krb5_const krb5_encrypt_block FAR *,
- krb5_const krb5_keyblock FAR *,
- krb5_pointer FAR *);
- krb5_error_code (*finish_random_key) ( krb5_const krb5_encrypt_block FAR *,
- krb5_pointer FAR *);
- krb5_error_code (*random_key) ( krb5_const krb5_encrypt_block FAR *,
+ krb5_error_code (*process_key) ( krb5_encrypt_block *,
+ krb5_const krb5_keyblock *);
+ krb5_error_code (*finish_key) ( krb5_encrypt_block *);
+ krb5_error_code (*string_to_key) (krb5_const krb5_encrypt_block *,
+ krb5_keyblock *,
+ krb5_const krb5_data *,
+ krb5_const krb5_data *);
+ krb5_error_code (*init_random_key) ( krb5_const krb5_encrypt_block *,
+ krb5_const krb5_keyblock *,
+ krb5_pointer *);
+ krb5_error_code (*finish_random_key) ( krb5_const krb5_encrypt_block *,
+ krb5_pointer *);
+ krb5_error_code (*random_key) ( krb5_const krb5_encrypt_block *,
krb5_pointer,
- krb5_keyblock FAR * FAR *);
+ krb5_keyblock **);
int block_length;
int pad_minimum; /* needed for cksum size computation */
int keysize;
@@ -665,7 +663,7 @@ typedef struct _krb5_cryptosystem_entry {
typedef struct _krb5_cs_table_entry {
krb5_magic magic;
- krb5_cryptosystem_entry FAR * system;
+ krb5_cryptosystem_entry * system;
krb5_pointer random_sequence; /* from init_random_key() */
} krb5_cs_table_entry;
@@ -677,11 +675,11 @@ typedef krb5_error_code
krb5_const size_t /* in_length */,
krb5_const krb5_pointer /* key/seed */,
krb5_const size_t /* key/seed size */,
- krb5_checksum FAR * /* out_cksum */);
+ krb5_checksum * /* out_cksum */);
typedef krb5_error_code
(*SUM_VERF_FUNC) (
- krb5_const krb5_checksum FAR * /* out_cksum */,
+ krb5_const krb5_checksum * /* out_cksum */,
krb5_const krb5_pointer /* in */,
krb5_const size_t /* in_length */,
krb5_const krb5_pointer /* key/seed */,
@@ -921,40 +919,40 @@ krb5_error_code krb5_do_preauth
krb5_gic_get_as_key_fct, void *);
void KRB5_CALLCONV krb5_free_sam_challenge
- (krb5_context, krb5_sam_challenge FAR * );
+ (krb5_context, krb5_sam_challenge * );
void KRB5_CALLCONV krb5_free_sam_response
- (krb5_context, krb5_sam_response FAR * );
+ (krb5_context, krb5_sam_response * );
void KRB5_CALLCONV krb5_free_predicted_sam_response
- (krb5_context, krb5_predicted_sam_response FAR * );
+ (krb5_context, krb5_predicted_sam_response * );
void KRB5_CALLCONV krb5_free_enc_sam_response_enc
- (krb5_context, krb5_enc_sam_response_enc FAR * );
+ (krb5_context, krb5_enc_sam_response_enc * );
void KRB5_CALLCONV krb5_free_sam_challenge_contents
- (krb5_context, krb5_sam_challenge FAR * );
+ (krb5_context, krb5_sam_challenge * );
void KRB5_CALLCONV krb5_free_sam_response_contents
- (krb5_context, krb5_sam_response FAR * );
+ (krb5_context, krb5_sam_response * );
void KRB5_CALLCONV krb5_free_predicted_sam_response_contents
- (krb5_context, krb5_predicted_sam_response FAR * );
+ (krb5_context, krb5_predicted_sam_response * );
void KRB5_CALLCONV krb5_free_enc_sam_response_enc_contents
- (krb5_context, krb5_enc_sam_response_enc FAR * );
+ (krb5_context, krb5_enc_sam_response_enc * );
void KRB5_CALLCONV krb5_free_pa_enc_ts
- (krb5_context, krb5_pa_enc_ts FAR *);
+ (krb5_context, krb5_pa_enc_ts *);
/* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
#include "profile.h"
struct _krb5_context {
krb5_magic magic;
- krb5_enctype FAR *in_tkt_ktypes;
+ krb5_enctype *in_tkt_ktypes;
int in_tkt_ktype_count;
- krb5_enctype FAR *tgs_ktypes;
+ krb5_enctype *tgs_ktypes;
int tgs_ktype_count;
- void FAR *os_context;
- char FAR *default_realm;
+ void *os_context;
+ char *default_realm;
profile_t profile;
- void FAR *db_context;
+ void *db_context;
int ser_ctx_count;
- void FAR *ser_ctx;
+ void *ser_ctx;
krb5_deltat clockskew; /* allowable clock skew */
krb5_cksumtype kdc_req_sumtype;
krb5_cksumtype default_ap_req_sumtype;
@@ -984,9 +982,9 @@ typedef struct _krb5_safe {
krb5_int32 usec; /* microsecond portion of time,
optional */
krb5_int32 seq_number; /* sequence #, optional */
- krb5_address FAR *s_address; /* sender address */
- krb5_address FAR *r_address; /* recipient address, optional */
- krb5_checksum FAR *checksum; /* data integrity checksum */
+ krb5_address *s_address; /* sender address */
+ krb5_address *r_address; /* recipient address, optional */
+ krb5_checksum *checksum; /* data integrity checksum */
} krb5_safe;
typedef struct _krb5_priv {
@@ -1000,16 +998,16 @@ typedef struct _krb5_priv_enc_part {
krb5_timestamp timestamp; /* client time, optional */
krb5_int32 usec; /* microsecond portion of time, opt. */
krb5_int32 seq_number; /* sequence #, optional */
- krb5_address FAR *s_address; /* sender address */
- krb5_address FAR *r_address; /* recipient address, optional */
+ krb5_address *s_address; /* sender address */
+ krb5_address *r_address; /* recipient address, optional */
} krb5_priv_enc_part;
void KRB5_CALLCONV krb5_free_safe
- (krb5_context, krb5_safe FAR * );
+ (krb5_context, krb5_safe * );
void KRB5_CALLCONV krb5_free_priv
- (krb5_context, krb5_priv FAR * );
+ (krb5_context, krb5_priv * );
void KRB5_CALLCONV krb5_free_priv_enc_part
- (krb5_context, krb5_priv_enc_part FAR * );
+ (krb5_context, krb5_priv_enc_part * );
/*
* Begin "asn1.h"
@@ -1416,23 +1414,23 @@ krb5_error_code KRB5_CALLCONV krb5_size_opaque
(krb5_context,
krb5_magic,
krb5_pointer,
- size_t FAR *);
+ size_t *);
/* Serialize the structure into a buffer */
krb5_error_code KRB5_CALLCONV krb5_externalize_opaque
(krb5_context,
krb5_magic,
krb5_pointer,
- krb5_octet FAR * FAR *,
- size_t FAR *);
+ krb5_octet **,
+ size_t *);
/* Deserialize the structure from a buffer */
krb5_error_code KRB5_CALLCONV krb5_internalize_opaque
(krb5_context,
krb5_magic,
- krb5_pointer FAR *,
- krb5_octet FAR * FAR *,
- size_t FAR *);
+ krb5_pointer *,
+ krb5_octet **,
+ size_t *);
/* Serialize data into a buffer */
krb5_error_code krb5_externalize_data
@@ -1467,26 +1465,26 @@ krb5_error_code KRB5_CALLCONV krb5_ser_rcache_init
/* [De]serialize 4-byte integer */
krb5_error_code KRB5_CALLCONV krb5_ser_pack_int32
(krb5_int32,
- krb5_octet FAR * FAR *,
- size_t FAR *);
+ krb5_octet **,
+ size_t *);
krb5_error_code KRB5_CALLCONV krb5_ser_unpack_int32
(krb5_int32 *,
- krb5_octet FAR * FAR *,
- size_t FAR *);
+ krb5_octet **,
+ size_t *);
/* [De]serialize byte string */
krb5_error_code KRB5_CALLCONV krb5_ser_pack_bytes
- (krb5_octet FAR *,
+ (krb5_octet *,
size_t,
- krb5_octet FAR * FAR *,
- size_t FAR *);
+ krb5_octet **,
+ size_t *);
krb5_error_code KRB5_CALLCONV krb5_ser_unpack_bytes
- (krb5_octet FAR *,
+ (krb5_octet *,
size_t,
- krb5_octet FAR * FAR *,
- size_t FAR *);
+ krb5_octet **,
+ size_t *);
krb5_error_code KRB5_CALLCONV krb5int_cc_default
- (krb5_context, krb5_ccache FAR *);
+ (krb5_context, krb5_ccache *);
krb5_error_code KRB5_CALLCONV krb5_cc_retrieve_cred_default
(krb5_context, krb5_ccache, krb5_flags,
@@ -1508,7 +1506,7 @@ void krb5int_set_prompt_types
if ((structure)->magic != (magic_number)) return (magic_number);
/* to keep lint happy */
-#define krb5_xfree(val) free((char FAR *)(val))
+#define krb5_xfree(val) free((char *)(val))
/* To keep happy libraries which are (for now) accessing internal stuff */
@@ -1540,36 +1538,36 @@ krb5_error_code KRB5_CALLCONV krb5int_accessor
struct _krb5_ccache {
krb5_magic magic;
- struct _krb5_cc_ops FAR *ops;
+ struct _krb5_cc_ops *ops;
krb5_pointer data;
};
struct _krb5_cc_ops {
krb5_magic magic;
- char FAR *prefix;
- const char FAR * (KRB5_CALLCONV *get_name) (krb5_context, krb5_ccache);
- krb5_error_code (KRB5_CALLCONV *resolve) (krb5_context, krb5_ccache FAR *,
- const char FAR *);
- krb5_error_code (KRB5_CALLCONV *gen_new) (krb5_context, krb5_ccache FAR *);
+ char *prefix;
+ const char * (KRB5_CALLCONV *get_name) (krb5_context, krb5_ccache);
+ krb5_error_code (KRB5_CALLCONV *resolve) (krb5_context, krb5_ccache *,
+ const char *);
+ krb5_error_code (KRB5_CALLCONV *gen_new) (krb5_context, krb5_ccache *);
krb5_error_code (KRB5_CALLCONV *init) (krb5_context, krb5_ccache,
krb5_principal);
krb5_error_code (KRB5_CALLCONV *destroy) (krb5_context, krb5_ccache);
krb5_error_code (KRB5_CALLCONV *close) (krb5_context, krb5_ccache);
krb5_error_code (KRB5_CALLCONV *store) (krb5_context, krb5_ccache,
- krb5_creds FAR *);
+ krb5_creds *);
krb5_error_code (KRB5_CALLCONV *retrieve) (krb5_context, krb5_ccache,
- krb5_flags, krb5_creds FAR *,
- krb5_creds FAR *);
+ krb5_flags, krb5_creds *,
+ krb5_creds *);
krb5_error_code (KRB5_CALLCONV *get_princ) (krb5_context, krb5_ccache,
- krb5_principal FAR *);
+ krb5_principal *);
krb5_error_code (KRB5_CALLCONV *get_first) (krb5_context, krb5_ccache,
- krb5_cc_cursor FAR *);
+ krb5_cc_cursor *);
krb5_error_code (KRB5_CALLCONV *get_next) (krb5_context, krb5_ccache,
- krb5_cc_cursor FAR *, krb5_creds FAR *);
+ krb5_cc_cursor *, krb5_creds *);
krb5_error_code (KRB5_CALLCONV *end_get) (krb5_context, krb5_ccache,
- krb5_cc_cursor FAR *);
+ krb5_cc_cursor *);
krb5_error_code (KRB5_CALLCONV *remove_cred) (krb5_context, krb5_ccache,
- krb5_flags, krb5_creds FAR *);
+ krb5_flags, krb5_creds *);
krb5_error_code (KRB5_CALLCONV *set_flags) (krb5_context, krb5_ccache,
krb5_flags);
};
@@ -1580,13 +1578,13 @@ extern krb5_cc_ops *krb5_cc_dfl_ops;
struct krb5_rc_st {
krb5_magic magic;
- struct _krb5_rc_ops FAR *ops;
+ struct _krb5_rc_ops *ops;
krb5_pointer data;
};
struct _krb5_rc_ops {
krb5_magic magic;
- char FAR *type;
+ char *type;
krb5_error_code (KRB5_CALLCONV *init)
(krb5_context, krb5_rcache,krb5_deltat); /* create */
krb5_error_code (KRB5_CALLCONV *recover)
@@ -1596,22 +1594,22 @@ struct _krb5_rc_ops {
krb5_error_code (KRB5_CALLCONV *close)
(krb5_context, krb5_rcache);
krb5_error_code (KRB5_CALLCONV *store)
- (krb5_context, krb5_rcache,krb5_donot_replay FAR *);
+ (krb5_context, krb5_rcache,krb5_donot_replay *);
krb5_error_code (KRB5_CALLCONV *expunge)
(krb5_context, krb5_rcache);
krb5_error_code (KRB5_CALLCONV *get_span)
- (krb5_context, krb5_rcache,krb5_deltat FAR *);
- char FAR *(KRB5_CALLCONV *get_name)
+ (krb5_context, krb5_rcache,krb5_deltat *);
+ char *(KRB5_CALLCONV *get_name)
(krb5_context, krb5_rcache);
krb5_error_code (KRB5_CALLCONV *resolve)
- (krb5_context, krb5_rcache, char FAR *);
+ (krb5_context, krb5_rcache, char *);
};
typedef struct _krb5_rc_ops krb5_rc_ops;
krb5_error_code krb5_rc_register_type
(krb5_context,
- krb5_rc_ops FAR *);
+ krb5_rc_ops *);
extern krb5_rc_ops krb5_rc_dfl_ops;
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index d9013e347..32ced421a 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,6 +1,7 @@
2001-10-03 Ken Raeburn <raeburn@mit.edu>
- * des.h, krb.h: Don't use or define KRB5_DLLIMP, GSS_DLLIMP.
+ * des.h, krb.h: Don't use or define KRB5_DLLIMP, GSS_DLLIMP. Drop
+ NEAR, FAR support.
2001-06-27 Ezra Peisach <epeisach@mit.edu>
diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h
index bc52015a7..c021db369 100644
--- a/src/include/kerberosIV/des.h
+++ b/src/include/kerberosIV/des.h
@@ -51,10 +51,6 @@
#define KRB5_CALLCONV_C
#define KRB5_EXPORTVAR
#endif
-#ifndef FAR
-#define FAR
-#define NEAR
-#endif
#ifndef KRB4_32
#ifdef SIZEOF_INT
@@ -132,15 +128,15 @@ typedef struct des_ks_struct bit_64;
int KRB5_CALLCONV des_key_sched (C_Block, Key_schedule);
int KRB5_CALLCONV
-des_pcbc_encrypt (C_Block FAR *in, C_Block FAR *out, long length,
- const des_key_schedule schedule, C_Block FAR *ivec,
+des_pcbc_encrypt (C_Block *in, C_Block *out, long length,
+ const des_key_schedule schedule, C_Block *ivec,
int enc);
unsigned long KRB5_CALLCONV
-des_quad_cksum (const unsigned char FAR *in, unsigned KRB4_32 FAR *out,
- long length, int out_count, C_Block FAR *seed);
+des_quad_cksum (const unsigned char *in, unsigned KRB4_32 *out,
+ long length, int out_count, C_Block *seed);
-int KRB5_CALLCONV des_string_to_key (const char FAR *, C_Block);
+int KRB5_CALLCONV des_string_to_key (const char *, C_Block);
/* new */
#ifdef KRB5_GENERAL__
diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 2da523d10..cec73ef23 100644
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -171,7 +171,7 @@ typedef struct credentials CREDENTIALS;
/* Structure definition for rd_private_msg and rd_safe_msg */
struct msg_dat {
- unsigned char FAR *app_data; /* pointer to appl data */
+ unsigned char *app_data; /* pointer to appl data */
unsigned KRB4_32 app_length; /* length of appl data */
unsigned KRB4_32 hash; /* hash to lookup replay */
int swap; /* swap bytes? */
@@ -374,16 +374,16 @@ extern int errno;
to the proper types during calls. */
typedef int (KRB5_CALLCONV *key_proc_type)
- (char FAR *, char FAR *, char FAR *,
- char FAR *, C_Block);
+ (char *, char *, char *,
+ char *, C_Block);
#define KEY_PROC_TYPE_DEFINED
typedef int (KRB5_CALLCONV *decrypt_tkt_type)
- (char FAR *, char FAR *, char FAR *,
- char FAR *, key_proc_type, KTEXT FAR *);
+ (char *, char *, char *,
+ char *, key_proc_type, KTEXT *);
#define DECRYPT_TKT_TYPE_DEFINED
-extern struct _krb5_context FAR * krb5__krb4_context;
+extern struct _krb5_context * krb5__krb4_context;
/*
* Function Prototypes for Kerberos V4.
@@ -395,18 +395,18 @@ struct sockaddr_in;
int KRB5_CALLCONV dest_tkt
(void);
/* err_txt.c */
-const char FAR * KRB5_CALLCONV krb_get_err_text
+const char * KRB5_CALLCONV krb_get_err_text
(int errnum);
/* g_ad_tkt.c */
int get_ad_tkt
(char *service, char *sinst, char *realm, int lifetime);
/* g_admhst.c */
int KRB5_CALLCONV krb_get_admhst
- (char FAR *host, char FAR *realm, int idx);
+ (char *host, char *realm, int idx);
/* g_cred.c */
int KRB5_CALLCONV krb_get_cred
- (char FAR *service, char FAR *instance, char FAR *realm,
- CREDENTIALS FAR *c);
+ (char *service, char *instance, char *realm,
+ CREDENTIALS *c);
/* g_in_tkt.c */
int krb_get_in_tkt
(char *k_user, char *instance, char *realm,
@@ -419,30 +419,30 @@ int krb_get_in_tkt_preauth
char *preauth_p, int preauth_len);
/* g_krbhst.c */
int KRB5_CALLCONV krb_get_krbhst
- (char FAR *host, char FAR *realm, int idx);
+ (char *host, char *realm, int idx);
/* g_krbrlm.c */
int KRB5_CALLCONV krb_get_lrealm
- (char FAR *realm, int idx);
+ (char *realm, int idx);
/* g_phost.c */
-char FAR * KRB5_CALLCONV krb_get_phost
- (char FAR * alias);
+char * KRB5_CALLCONV krb_get_phost
+ (char * alias);
/* get_pw_tkt */
int KRB5_CALLCONV get_pw_tkt
(char *, char *, char *, char *);
/* g_pw_in_tkt.c */
int KRB5_CALLCONV krb_get_pw_in_tkt
- (char FAR *k_user, char FAR *instance, char FAR *realm,
- char FAR *service, char FAR *sinstance,
- int life, char FAR *password);
+ (char *k_user, char *instance, char *realm,
+ char *service, char *sinstance,
+ int life, char *password);
int KRB5_CALLCONV krb_get_pw_in_tkt_preauth
- (char FAR *k_user, char FAR *instance, char FAR *realm,
- char FAR *service, char FAR *sinstance,
- int life, char FAR *password);
+ (char *k_user, char *instance, char *realm,
+ char *service, char *sinstance,
+ int life, char *password);
/* g_svc_in_tkt.c */
int KRB5_CALLCONV krb_get_svc_in_tkt
- (char FAR *k_user, char FAR *instance, char FAR *realm,
- char FAR *service, char FAR *sinstance,
- int life, char FAR *srvtab);
+ (char *k_user, char *instance, char *realm,
+ char *service, char *sinstance,
+ int life, char *srvtab);
/* g_tf_fname.c */
int KRB5_CALLCONV krb_get_tf_fullname
(char *ticket_file, char *name, char *inst, char *realm);
@@ -451,10 +451,10 @@ int KRB5_CALLCONV krb_get_tf_realm
(char *ticket_file, char *realm);
/* g_tkt_svc.c */
int KRB5_CALLCONV krb_get_ticket_for_service
- (char FAR *serviceName,
- char FAR *buf, unsigned KRB4_32 FAR *buflen,
+ (char *serviceName,
+ char *buf, unsigned KRB4_32 *buflen,
int checksum, des_cblock, Key_schedule,
- char FAR *version, int includeVersion);
+ char *version, int includeVersion);
/* in_tkt.c */
int KRB5_CALLCONV in_tkt
(char *name, char *inst);
@@ -462,19 +462,19 @@ int KRB5_CALLCONV krb_in_tkt
(char *pname, char *pinst, char *realm);
/* kname_parse.c */
int KRB5_CALLCONV kname_parse
- (char FAR *name, char FAR *inst, char FAR *realm,
- char FAR *fullname);
+ (char *name, char *inst, char *realm,
+ char *fullname);
int KRB5_CALLCONV k_isname
- (char FAR *);
+ (char *);
int KRB5_CALLCONV k_isinst
- (char FAR *);
+ (char *);
int KRB5_CALLCONV k_isrealm
- (char FAR *);
+ (char *);
/* kuserok.c */
int KRB5_CALLCONV kuserok
- (AUTH_DAT FAR *kdata, char FAR *luser);
+ (AUTH_DAT *kdata, char *luser);
/* lifetime.c */
KRB4_32 KRB5_CALLCONV krb_life_to_time
@@ -484,17 +484,17 @@ int KRB5_CALLCONV krb_time_to_life
/* mk_auth.c */
int KRB5_CALLCONV krb_check_auth
- (KTEXT, unsigned KRB4_32 cksum, MSG_DAT FAR *,
+ (KTEXT, unsigned KRB4_32 cksum, MSG_DAT *,
C_Block, Key_schedule,
- struct sockaddr_in FAR * local_addr,
- struct sockaddr_in FAR * foreign_addr);
+ struct sockaddr_in * local_addr,
+ struct sockaddr_in * foreign_addr);
int KRB5_CALLCONV krb_mk_auth
(long k4_options, KTEXT ticket,
- char FAR *service, char FAR *inst, char FAR *realm,
- unsigned KRB4_32 checksum, char FAR *version, KTEXT buf);
+ char *service, char *inst, char *realm,
+ unsigned KRB4_32 checksum, char *version, KTEXT buf);
/* mk_err.c */
long KRB5_CALLCONV krb_mk_err
- (u_char FAR *out, KRB4_32 k4_code, char FAR *text);
+ (u_char *out, KRB4_32 k4_code, char *text);
/* mk_preauth.c */
int krb_mk_preauth
(char **preauth_p, int *preauth_len, key_proc_type,
@@ -504,22 +504,22 @@ void krb_free_preauth
(char * preauth_p, int len);
/* mk_priv.c */
long KRB5_CALLCONV krb_mk_priv
- (u_char FAR *in, u_char FAR *out,
+ (u_char *in, u_char *out,
unsigned KRB4_32 length,
- Key_schedule, C_Block FAR *,
- struct sockaddr_in FAR * sender,
- struct sockaddr_in FAR * receiver);
+ Key_schedule, C_Block *,
+ struct sockaddr_in * sender,
+ struct sockaddr_in * receiver);
/* mk_req.c */
int KRB5_CALLCONV krb_mk_req
(KTEXT authent,
- char FAR *service, char FAR *instance, char FAR *realm,
+ char *service, char *instance, char *realm,
KRB4_32 checksum);
/* mk_safe.c */
long KRB5_CALLCONV krb_mk_safe
- (u_char FAR *in, u_char FAR *out, unsigned KRB4_32 length,
- C_Block FAR *,
- struct sockaddr_in FAR *sender,
- struct sockaddr_in FAR *receiver);
+ (u_char *in, u_char *out, unsigned KRB4_32 length,
+ C_Block *,
+ struct sockaddr_in *sender,
+ struct sockaddr_in *receiver);
/* netread.c */
int krb_net_read
(int fd, char *buf, int len);
@@ -531,62 +531,62 @@ int pkt_clen
(KTEXT);
/* put_svc_key.c */
int KRB5_CALLCONV put_svc_key
- (char FAR *sfile,
- char FAR *name, char FAR *inst, char FAR *realm,
- int newvno, char FAR *key);
+ (char *sfile,
+ char *name, char *inst, char *realm,
+ int newvno, char *key);
/* rd_err.c */
int KRB5_CALLCONV krb_rd_err
- (u_char FAR *in, u_long in_length,
- long FAR *k4_code, MSG_DAT FAR *m_data);
+ (u_char *in, u_long in_length,
+ long *k4_code, MSG_DAT *m_data);
/* rd_priv.c */
long KRB5_CALLCONV krb_rd_priv
- (u_char FAR *in,unsigned KRB4_32 in_length,
- Key_schedule, C_Block FAR *,
- struct sockaddr_in FAR *sender,
- struct sockaddr_in FAR *receiver,
- MSG_DAT FAR *m_data);
+ (u_char *in,unsigned KRB4_32 in_length,
+ Key_schedule, C_Block *,
+ struct sockaddr_in *sender,
+ struct sockaddr_in *receiver,
+ MSG_DAT *m_data);
/* rd_req.c */
int KRB5_CALLCONV krb_rd_req
- (KTEXT, char FAR *service, char FAR *inst,
- unsigned KRB4_32 from_addr, AUTH_DAT FAR *,
- char FAR *srvtab);
+ (KTEXT, char *service, char *inst,
+ unsigned KRB4_32 from_addr, AUTH_DAT *,
+ char *srvtab);
/* rd_safe.c */
long KRB5_CALLCONV krb_rd_safe
- (u_char FAR *in, unsigned KRB4_32 in_length,
- C_Block FAR *,
- struct sockaddr_in FAR *sender,
- struct sockaddr_in FAR *receiver,
- MSG_DAT FAR *m_data);
+ (u_char *in, unsigned KRB4_32 in_length,
+ C_Block *,
+ struct sockaddr_in *sender,
+ struct sockaddr_in *receiver,
+ MSG_DAT *m_data);
/* rd_svc_key.c */
int KRB5_CALLCONV read_service_key
- (char FAR *service, char FAR *instance, char FAR *realm,
- int kvno, char FAR *file, char FAR *key);
+ (char *service, char *instance, char *realm,
+ int kvno, char *file, char *key);
int KRB5_CALLCONV get_service_key
- (char FAR *service, char FAR *instance, char FAR *realm,
- int FAR *kvno, char FAR *file, char FAR *key);
+ (char *service, char *instance, char *realm,
+ int *kvno, char *file, char *key);
/* realmofhost.c */
-char FAR * KRB5_CALLCONV krb_realmofhost
- (char FAR *host);
+char * KRB5_CALLCONV krb_realmofhost
+ (char *host);
/* recvauth.c */
int KRB5_CALLCONV krb_recvauth
(long k4_options, int fd, KTEXT ticket,
- char FAR *service, char FAR *instance,
- struct sockaddr_in FAR *foreign_addr,
- struct sockaddr_in FAR *local_addr,
- AUTH_DAT FAR *kdata, char FAR *srvtab,
- Key_schedule schedule, char FAR *version);
+ char *service, char *instance,
+ struct sockaddr_in *foreign_addr,
+ struct sockaddr_in *local_addr,
+ AUTH_DAT *kdata, char *srvtab,
+ Key_schedule schedule, char *version);
/* sendauth.c */
int KRB5_CALLCONV krb_sendauth
(long k4_options, int fd, KTEXT ticket,
- char FAR *service, char FAR *inst, char FAR *realm,
+ char *service, char *inst, char *realm,
unsigned KRB4_32 checksum, MSG_DAT *msg_data,
CREDENTIALS *cred, Key_schedule schedule,
- struct sockaddr_in FAR *laddr, struct sockaddr_in *FAR faddr,
- char FAR *version);
+ struct sockaddr_in *laddr, struct sockaddr_in *faddr,
+ char *version);
/* save_creds.c */
int KRB5_CALLCONV krb_save_credentials
- (char FAR *service, char FAR *instance, char FAR *realm,
+ (char *service, char *instance, char *realm,
C_Block session, int lifetime, int kvno,
KTEXT ticket, long issue_date);
/* send_to_kdc.c */
@@ -659,7 +659,7 @@ extern int krb_set_key_krb5(krb5_context ctx, krb5_keyblock *key);
#ifdef _WINDOWS
HINSTANCE get_lib_instance(void);
unsigned int krb_get_notification_message(void);
-char FAR * KRB5_CALLCONV krb_get_default_user(void);
+char * KRB5_CALLCONV krb_get_default_user(void);
int KRB5_CALLCONV krb_set_default_user(char *);
unsigned KRB4_32 win_time_gmt_unixsec(unsigned KRB4_32 *);
long win_time_get_epoch(void);
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 1c1a1c6e0..3003513b6 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -56,7 +56,7 @@
#ifndef KRB5_GENERAL__
#define KRB5_GENERAL__
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
#include <win-mac.h>
/* Macintoh CFM-68K magic incantation */
#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
@@ -64,7 +64,7 @@
#endif
#endif
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
#include <win-mac.h>
#endif
@@ -73,8 +73,6 @@
#define KRB5_CALLCONV
#define KRB5_CALLCONV_C
#define KRB5_EXPORTVAR
-#define FAR
-#define NEAR
#endif /* !KRB5_CALLCONV */
#endif /* !KRB5_CONFIG__ */
@@ -192,7 +190,7 @@ typedef krb5_error_code krb5_magic;
typedef struct _krb5_data {
krb5_magic magic;
unsigned int length;
- char FAR *data;
+ char *data;
} krb5_data;
/*
@@ -206,20 +204,20 @@ typedef struct _krb5_data {
#define krb5_const const
-typedef void FAR * krb5_pointer;
-typedef void krb5_const FAR * krb5_const_pointer;
+typedef void * krb5_pointer;
+typedef void krb5_const * krb5_const_pointer;
#define KRB5_PROTOTYPE(x) x
typedef struct krb5_principal_data {
krb5_magic magic;
krb5_data realm;
- krb5_data FAR *data; /* An array of strings */
+ krb5_data *data; /* An array of strings */
krb5_int32 length;
krb5_int32 type;
} krb5_principal_data;
-typedef krb5_principal_data FAR * krb5_principal;
+typedef krb5_principal_data * krb5_principal;
/*
* Per V5 spec on definition of principal types
@@ -239,7 +237,7 @@ typedef krb5_principal_data FAR * krb5_principal;
#define KRB5_NT_UID 5
/* constant version thereof: */
-typedef krb5_const krb5_principal_data FAR *krb5_const_principal;
+typedef krb5_const krb5_principal_data *krb5_const_principal;
#define krb5_princ_realm(context, princ) (&(princ)->realm)
#define krb5_princ_set_realm(context, princ,value) ((princ)->realm = *(value))
@@ -263,7 +261,7 @@ typedef struct _krb5_address {
krb5_magic magic;
krb5_addrtype addrtype;
unsigned int length;
- krb5_octet FAR *contents;
+ krb5_octet *contents;
} krb5_address;
/* per Kerberos v5 protocol spec */
@@ -286,10 +284,10 @@ typedef struct _krb5_address {
struct _krb5_context;
-typedef struct _krb5_context FAR * krb5_context;
+typedef struct _krb5_context * krb5_context;
struct _krb5_auth_context;
-typedef struct _krb5_auth_context FAR * krb5_auth_context;
+typedef struct _krb5_auth_context * krb5_auth_context;
struct _krb5_cryptosystem_entry;
@@ -301,7 +299,7 @@ typedef struct _krb5_keyblock {
krb5_magic magic;
krb5_enctype enctype;
unsigned int length;
- krb5_octet FAR *contents;
+ krb5_octet *contents;
} krb5_keyblock;
#ifdef KRB5_OLD_CRYPTO
@@ -310,7 +308,7 @@ typedef struct _krb5_encrypt_block {
krb5_enctype crypto_entry; /* to call krb5_encrypt_size, you need
this. it was a pointer, but it
doesn't have to be. gross. */
- krb5_keyblock FAR *key;
+ krb5_keyblock *key;
} krb5_encrypt_block;
#endif
@@ -318,7 +316,7 @@ typedef struct _krb5_checksum {
krb5_magic magic;
krb5_cksumtype checksum_type; /* checksum type */
unsigned int length;
- krb5_octet FAR *contents;
+ krb5_octet *contents;
} krb5_checksum;
typedef struct _krb5_enc_data {
@@ -488,48 +486,48 @@ krb5_error_code KRB5_CALLCONV krb5_encrypt
krb5_const krb5_pointer inptr,
krb5_pointer outptr,
krb5_const size_t size,
- krb5_encrypt_block FAR * eblock,
+ krb5_encrypt_block * eblock,
krb5_pointer ivec);
krb5_error_code KRB5_CALLCONV krb5_decrypt
(krb5_context context,
krb5_const krb5_pointer inptr,
krb5_pointer outptr,
krb5_const size_t size,
- krb5_encrypt_block FAR * eblock,
+ krb5_encrypt_block * eblock,
krb5_pointer ivec);
krb5_error_code KRB5_CALLCONV krb5_process_key
(krb5_context context,
- krb5_encrypt_block FAR * eblock,
- krb5_const krb5_keyblock FAR * key);
+ krb5_encrypt_block * eblock,
+ krb5_const krb5_keyblock * key);
krb5_error_code KRB5_CALLCONV krb5_finish_key
(krb5_context context,
- krb5_encrypt_block FAR * eblock);
+ krb5_encrypt_block * eblock);
krb5_error_code KRB5_CALLCONV krb5_string_to_key
(krb5_context context,
- krb5_const krb5_encrypt_block FAR * eblock,
- krb5_keyblock FAR * keyblock,
- krb5_const krb5_data FAR * data,
- krb5_const krb5_data FAR * salt);
+ krb5_const krb5_encrypt_block * eblock,
+ krb5_keyblock * keyblock,
+ krb5_const krb5_data * data,
+ krb5_const krb5_data * salt);
krb5_error_code KRB5_CALLCONV krb5_init_random_key
(krb5_context context,
- krb5_const krb5_encrypt_block FAR * eblock,
- krb5_const krb5_keyblock FAR * keyblock,
- krb5_pointer FAR * ptr);
+ krb5_const krb5_encrypt_block * eblock,
+ krb5_const krb5_keyblock * keyblock,
+ krb5_pointer * ptr);
krb5_error_code KRB5_CALLCONV krb5_finish_random_key
(krb5_context context,
- krb5_const krb5_encrypt_block FAR * eblock,
- krb5_pointer FAR * ptr);
+ krb5_const krb5_encrypt_block * eblock,
+ krb5_pointer * ptr);
krb5_error_code KRB5_CALLCONV krb5_random_key
(krb5_context context,
- krb5_const krb5_encrypt_block FAR * eblock,
+ krb5_const krb5_encrypt_block * eblock,
krb5_pointer ptr,
- krb5_keyblock FAR * FAR * keyblock);
+ krb5_keyblock ** keyblock);
krb5_enctype KRB5_CALLCONV krb5_eblock_enctype
(krb5_context context,
- krb5_const krb5_encrypt_block FAR * eblock);
+ krb5_const krb5_encrypt_block * eblock);
krb5_error_code KRB5_CALLCONV krb5_use_enctype
(krb5_context context,
- krb5_encrypt_block FAR * eblock,
+ krb5_encrypt_block * eblock,
krb5_const krb5_enctype enctype);
size_t KRB5_CALLCONV krb5_encrypt_size
(size_t length,
@@ -542,11 +540,11 @@ krb5_error_code KRB5_CALLCONV krb5_calculate_checksum
krb5_const krb5_cksumtype ctype,
krb5_const krb5_pointer in, krb5_const size_t in_length,
krb5_const krb5_pointer seed, krb5_const size_t seed_length,
- krb5_checksum FAR * outcksum);
+ krb5_checksum * outcksum);
krb5_error_code KRB5_CALLCONV krb5_verify_checksum
(krb5_context context,
krb5_cksumtype ctype,
- krb5_const krb5_checksum FAR * cksum,
+ krb5_const krb5_checksum * cksum,
krb5_const krb5_pointer in, krb5_const size_t in_length,
krb5_const krb5_pointer seed, krb5_const size_t seed_length);
@@ -815,7 +813,7 @@ typedef struct _krb5_authdata {
krb5_magic magic;
krb5_authdatatype ad_type;
unsigned int length;
- krb5_octet FAR *contents;
+ krb5_octet *contents;
} krb5_authdata;
/* structure for transited encoding */
@@ -829,12 +827,12 @@ typedef struct _krb5_enc_tkt_part {
krb5_magic magic;
/* to-be-encrypted portion */
krb5_flags flags; /* flags */
- krb5_keyblock FAR *session; /* session key: includes enctype */
+ krb5_keyblock *session; /* session key: includes enctype */
krb5_principal client; /* client name/realm */
krb5_transited transited; /* list of transited realms */
krb5_ticket_times times; /* auth, start, end, renew_till */
- krb5_address FAR * FAR *caddrs; /* array of ptrs to addresses */
- krb5_authdata FAR * FAR *authorization_data; /* auth data */
+ krb5_address **caddrs; /* array of ptrs to addresses */
+ krb5_authdata **authorization_data; /* auth data */
} krb5_enc_tkt_part;
typedef struct _krb5_ticket {
@@ -843,7 +841,7 @@ typedef struct _krb5_ticket {
krb5_principal server; /* server name/realm */
krb5_enc_data enc_part; /* encryption type, kvno, encrypted
encoding */
- krb5_enc_tkt_part FAR *enc_part2; /* ptr to decrypted version, if
+ krb5_enc_tkt_part *enc_part2; /* ptr to decrypted version, if
available */
} krb5_ticket;
@@ -851,18 +849,18 @@ typedef struct _krb5_ticket {
typedef struct _krb5_authenticator {
krb5_magic magic;
krb5_principal client; /* client name/realm */
- krb5_checksum FAR *checksum; /* checksum, includes type, optional */
+ krb5_checksum *checksum; /* checksum, includes type, optional */
krb5_int32 cusec; /* client usec portion */
krb5_timestamp ctime; /* client sec portion */
- krb5_keyblock FAR *subkey; /* true session key, optional */
+ krb5_keyblock *subkey; /* true session key, optional */
krb5_int32 seq_number; /* sequence #, optional */
- krb5_authdata FAR * FAR *authorization_data; /* New add by Ari, auth data */
+ krb5_authdata **authorization_data; /* New add by Ari, auth data */
} krb5_authenticator;
typedef struct _krb5_tkt_authent {
krb5_magic magic;
- krb5_ticket FAR *ticket;
- krb5_authenticator FAR *authenticator;
+ krb5_ticket *ticket;
+ krb5_authenticator *authenticator;
krb5_flags ap_options;
} krb5_tkt_authent;
@@ -876,12 +874,12 @@ typedef struct _krb5_creds {
krb5_boolean is_skey; /* true if ticket is encrypted in
another ticket's skey */
krb5_flags ticket_flags; /* flags in ticket */
- krb5_address FAR * FAR *addresses; /* addrs in ticket */
+ krb5_address **addresses; /* addrs in ticket */
krb5_data ticket; /* ticket string itself */
krb5_data second_ticket; /* second ticket, if related to
ticket (via DUPLICATE-SKEY or
ENC-TKT-IN-SKEY) */
- krb5_authdata FAR * FAR *authdata; /* authorization data */
+ krb5_authdata **authdata; /* authorization data */
} krb5_creds;
/* Last request fields */
@@ -896,13 +894,13 @@ typedef struct _krb5_pa_data {
krb5_magic magic;
krb5_preauthtype pa_type;
unsigned int length;
- krb5_octet FAR *contents;
+ krb5_octet *contents;
} krb5_pa_data;
typedef struct _krb5_kdc_req {
krb5_magic magic;
krb5_msgtype msg_type; /* AS_REQ or TGS_REQ? */
- krb5_pa_data FAR * FAR *padata; /* e.g. encoded AP_REQ */
+ krb5_pa_data **padata; /* e.g. encoded AP_REQ */
/* real body */
krb5_flags kdc_options; /* requested options */
krb5_principal client; /* includes realm; optional */
@@ -913,26 +911,26 @@ typedef struct _krb5_kdc_req {
krb5_timestamp rtime; /* (optional) requested renew_till */
krb5_int32 nonce; /* nonce to match request/response */
int nktypes; /* # of ktypes, must be positive */
- krb5_enctype FAR *ktype; /* requested enctype(s) */
- krb5_address FAR * FAR *addresses; /* requested addresses, optional */
+ krb5_enctype *ktype; /* requested enctype(s) */
+ krb5_address **addresses; /* requested addresses, optional */
krb5_enc_data authorization_data; /* encrypted auth data; OPTIONAL */
- krb5_authdata FAR * FAR *unenc_authdata; /* unencrypted auth data,
+ krb5_authdata **unenc_authdata; /* unencrypted auth data,
if available */
- krb5_ticket FAR * FAR *second_ticket;/* second ticket array; OPTIONAL */
+ krb5_ticket **second_ticket;/* second ticket array; OPTIONAL */
} krb5_kdc_req;
typedef struct _krb5_enc_kdc_rep_part {
krb5_magic magic;
/* encrypted part: */
krb5_msgtype msg_type; /* krb5 message type */
- krb5_keyblock FAR *session; /* session key */
- krb5_last_req_entry FAR * FAR *last_req; /* array of ptrs to entries */
+ krb5_keyblock *session; /* session key */
+ krb5_last_req_entry **last_req; /* array of ptrs to entries */
krb5_int32 nonce; /* nonce from request */
krb5_timestamp key_exp; /* expiration date */
krb5_flags flags; /* ticket flags */
krb5_ticket_times times; /* lifetime info */
krb5_principal server; /* server's principal identifier */
- krb5_address FAR * FAR *caddrs; /* array of ptrs to addresses,
+ krb5_address **caddrs; /* array of ptrs to addresses,
optional */
} krb5_enc_kdc_rep_part;
@@ -940,12 +938,12 @@ typedef struct _krb5_kdc_rep {
krb5_magic magic;
/* cleartext part: */
krb5_msgtype msg_type; /* AS_REP or KDC_REP? */
- krb5_pa_data FAR * FAR *padata; /* preauthentication data from KDC */
+ krb5_pa_data **padata; /* preauthentication data from KDC */
krb5_principal client; /* client's principal identifier */
- krb5_ticket FAR *ticket; /* ticket */
+ krb5_ticket *ticket; /* ticket */
krb5_enc_data enc_part; /* encryption type, kvno, encrypted
encoding */
- krb5_enc_kdc_rep_part FAR *enc_part2;/* unencrypted version, if available */
+ krb5_enc_kdc_rep_part *enc_part2;/* unencrypted version, if available */
} krb5_kdc_rep;
/* error message structure */
@@ -967,7 +965,7 @@ typedef struct _krb5_error {
typedef struct _krb5_ap_req {
krb5_magic magic;
krb5_flags ap_options; /* requested options */
- krb5_ticket FAR *ticket; /* ticket */
+ krb5_ticket *ticket; /* ticket */
krb5_enc_data authenticator; /* authenticator (already encrypted) */
} krb5_ap_req;
@@ -980,7 +978,7 @@ typedef struct _krb5_ap_rep_enc_part {
krb5_magic magic;
krb5_timestamp ctime; /* client time, seconds portion */
krb5_int32 cusec; /* client time, microseconds portion */
- krb5_keyblock FAR *subkey; /* true session key, optional */
+ krb5_keyblock *subkey; /* true session key, optional */
krb5_int32 seq_number; /* sequence #, optional */
} krb5_ap_rep_enc_part;
@@ -994,14 +992,14 @@ typedef struct _krb5_response {
typedef struct _krb5_cred_info {
krb5_magic magic;
- krb5_keyblock FAR *session; /* session key used to encrypt */
+ krb5_keyblock *session; /* session key used to encrypt */
/* ticket */
krb5_principal client; /* client name/realm, optional */
krb5_principal server; /* server name/realm, optional */
krb5_flags flags; /* ticket flags, optional */
krb5_ticket_times times; /* auth, start, end, renew_till, */
/* optional */
- krb5_address FAR * FAR *caddrs; /* array of ptrs to addresses */
+ krb5_address **caddrs; /* array of ptrs to addresses */
} krb5_cred_info;
typedef struct _krb5_cred_enc_part {
@@ -1009,29 +1007,29 @@ typedef struct _krb5_cred_enc_part {
krb5_int32 nonce; /* nonce, optional */
krb5_timestamp timestamp; /* client time */
krb5_int32 usec; /* microsecond portion of time */
- krb5_address FAR *s_address; /* sender address, optional */
- krb5_address FAR *r_address; /* recipient address, optional */
- krb5_cred_info FAR * FAR *ticket_info;
+ krb5_address *s_address; /* sender address, optional */
+ krb5_address *r_address; /* recipient address, optional */
+ krb5_cred_info **ticket_info;
} krb5_cred_enc_part;
typedef struct _krb5_cred {
krb5_magic magic;
- krb5_ticket FAR * FAR *tickets; /* tickets */
+ krb5_ticket **tickets; /* tickets */
krb5_enc_data enc_part; /* encrypted part */
- krb5_cred_enc_part FAR *enc_part2; /* unencrypted version, if available*/
+ krb5_cred_enc_part *enc_part2; /* unencrypted version, if available*/
} krb5_cred;
/* Sandia password generation structures */
typedef struct _passwd_phrase_element {
krb5_magic magic;
- krb5_data FAR *passwd;
- krb5_data FAR *phrase;
+ krb5_data *passwd;
+ krb5_data *phrase;
} passwd_phrase_element;
typedef struct _krb5_pwd_data {
krb5_magic magic;
int sequence_count;
- passwd_phrase_element FAR * FAR *element;
+ passwd_phrase_element **element;
} krb5_pwd_data;
/* these need to be here so the typedefs are available for the prototypes */
@@ -1070,7 +1068,7 @@ typedef struct krb5_replay_data {
typedef krb5_pointer krb5_cc_cursor; /* cursor for sequential lookup */
struct _krb5_ccache;
-typedef struct _krb5_ccache FAR *krb5_ccache;
+typedef struct _krb5_ccache *krb5_ccache;
struct _krb5_cc_ops;
typedef struct _krb5_cc_ops krb5_cc_ops;
@@ -1089,11 +1087,11 @@ typedef struct _krb5_cc_ops krb5_cc_ops;
/* for set_flags and other functions */
#define KRB5_TC_OPENCLOSE 0x00000001
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
krb5_cc_get_name (krb5_context context, krb5_ccache cache);
krb5_error_code KRB5_CALLCONV
-krb5_cc_gen_new (krb5_context context, krb5_ccache FAR *cache);
+krb5_cc_gen_new (krb5_context context, krb5_ccache *cache);
krb5_error_code KRB5_CALLCONV
krb5_cc_initialize(krb5_context context, krb5_ccache cache,
@@ -1107,37 +1105,37 @@ krb5_cc_close (krb5_context context, krb5_ccache cache);
krb5_error_code KRB5_CALLCONV
krb5_cc_store_cred (krb5_context context, krb5_ccache cache,
- krb5_creds FAR *creds);
+ krb5_creds *creds);
krb5_error_code KRB5_CALLCONV
krb5_cc_retrieve_cred (krb5_context context, krb5_ccache cache,
- krb5_flags flags, krb5_creds FAR *mcreds,
- krb5_creds FAR *creds);
+ krb5_flags flags, krb5_creds *mcreds,
+ krb5_creds *creds);
krb5_error_code KRB5_CALLCONV
krb5_cc_get_principal (krb5_context context, krb5_ccache cache,
- krb5_principal FAR *principal);
+ krb5_principal *principal);
krb5_error_code KRB5_CALLCONV
krb5_cc_start_seq_get (krb5_context context, krb5_ccache cache,
- krb5_cc_cursor FAR *cursor);
+ krb5_cc_cursor *cursor);
krb5_error_code KRB5_CALLCONV
krb5_cc_next_cred (krb5_context context, krb5_ccache cache,
- krb5_cc_cursor FAR *cursor, krb5_creds FAR *creds);
+ krb5_cc_cursor *cursor, krb5_creds *creds);
krb5_error_code KRB5_CALLCONV
krb5_cc_end_seq_get (krb5_context context, krb5_ccache cache,
- krb5_cc_cursor FAR *cursor);
+ krb5_cc_cursor *cursor);
krb5_error_code KRB5_CALLCONV
krb5_cc_remove_cred (krb5_context context, krb5_ccache cache, krb5_flags flags,
- krb5_creds FAR *creds);
+ krb5_creds *creds);
krb5_error_code KRB5_CALLCONV
krb5_cc_set_flags (krb5_context context, krb5_ccache cache, krb5_flags flags);
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
krb5_cc_get_type (krb5_context context, krb5_ccache cache);
/*
@@ -1149,36 +1147,36 @@ krb5_cc_get_type (krb5_context context, krb5_ccache cache);
*/
struct krb5_rc_st;
-typedef struct krb5_rc_st FAR *krb5_rcache;
+typedef struct krb5_rc_st *krb5_rcache;
typedef struct _krb5_donot_replay {
krb5_magic magic;
- char FAR *server; /* null-terminated */
- char FAR *client; /* null-terminated */
+ char *server; /* null-terminated */
+ char *client; /* null-terminated */
krb5_int32 cusec;
krb5_timestamp ctime;
} krb5_donot_replay;
krb5_error_code krb5_rc_default
(krb5_context,
- krb5_rcache FAR *);
+ krb5_rcache *);
krb5_error_code krb5_rc_resolve_type
(krb5_context,
- krb5_rcache FAR *,char FAR *);
+ krb5_rcache *,char *);
krb5_error_code krb5_rc_resolve_full
(krb5_context,
- krb5_rcache FAR *,char FAR *);
-char FAR * krb5_rc_get_type
+ krb5_rcache *,char *);
+char * krb5_rc_get_type
(krb5_context,
krb5_rcache);
-char FAR * krb5_rc_default_type
+char * krb5_rc_default_type
(krb5_context);
-char FAR * krb5_rc_default_name
+char * krb5_rc_default_name
(krb5_context);
krb5_error_code krb5_auth_to_rep
(krb5_context,
- krb5_tkt_authent FAR *,
- krb5_donot_replay FAR *);
+ krb5_tkt_authent *,
+ krb5_donot_replay *);
krb5_error_code KRB5_CALLCONV krb5_rc_initialize
@@ -1190,15 +1188,15 @@ krb5_error_code KRB5_CALLCONV krb5_rc_destroy
krb5_error_code KRB5_CALLCONV krb5_rc_close
(krb5_context, krb5_rcache);
krb5_error_code KRB5_CALLCONV krb5_rc_store
- (krb5_context, krb5_rcache,krb5_donot_replay FAR *);
+ (krb5_context, krb5_rcache,krb5_donot_replay *);
krb5_error_code KRB5_CALLCONV krb5_rc_expunge
(krb5_context, krb5_rcache);
krb5_error_code KRB5_CALLCONV krb5_rc_get_lifespan
- (krb5_context, krb5_rcache,krb5_deltat FAR *);
-char FAR *KRB5_CALLCONV krb5_rc_get_name
+ (krb5_context, krb5_rcache,krb5_deltat *);
+char *KRB5_CALLCONV krb5_rc_get_name
(krb5_context, krb5_rcache);
krb5_error_code KRB5_CALLCONV krb5_rc_resolve
- (krb5_context, krb5_rcache, char FAR *);
+ (krb5_context, krb5_rcache, char *);
/*
* end "rcache.h"
@@ -1225,23 +1223,23 @@ typedef struct krb5_keytab_entry_st {
typedef struct _krb5_kt {
krb5_magic magic;
- struct _krb5_kt_ops FAR *ops;
+ struct _krb5_kt_ops *ops;
krb5_pointer data;
-} FAR *krb5_keytab;
+} *krb5_keytab;
typedef struct _krb5_kt_ops {
krb5_magic magic;
- char FAR *prefix;
+ char *prefix;
/* routines always present */
krb5_error_code (KRB5_CALLCONV *resolve)
(krb5_context,
- krb5_const char FAR *,
- krb5_keytab FAR *);
+ krb5_const char *,
+ krb5_keytab *);
krb5_error_code (KRB5_CALLCONV *get_name)
(krb5_context,
krb5_keytab,
- char FAR *,
+ char *,
unsigned int);
krb5_error_code (KRB5_CALLCONV *close)
(krb5_context,
@@ -1252,29 +1250,29 @@ typedef struct _krb5_kt_ops {
krb5_const_principal,
krb5_kvno,
krb5_enctype,
- krb5_keytab_entry FAR *);
+ krb5_keytab_entry *);
krb5_error_code (KRB5_CALLCONV *start_seq_get)
(krb5_context,
krb5_keytab,
- krb5_kt_cursor FAR *);
+ krb5_kt_cursor *);
krb5_error_code (KRB5_CALLCONV *get_next)
(krb5_context,
krb5_keytab,
- krb5_keytab_entry FAR *,
- krb5_kt_cursor FAR *);
+ krb5_keytab_entry *,
+ krb5_kt_cursor *);
krb5_error_code (KRB5_CALLCONV *end_get)
(krb5_context,
krb5_keytab,
- krb5_kt_cursor FAR *);
+ krb5_kt_cursor *);
/* routines to be included on extended version (write routines) */
krb5_error_code (KRB5_CALLCONV *add)
(krb5_context,
krb5_keytab,
- krb5_keytab_entry FAR *);
+ krb5_keytab_entry *);
krb5_error_code (KRB5_CALLCONV *remove)
(krb5_context,
krb5_keytab,
- krb5_keytab_entry FAR *);
+ krb5_keytab_entry *);
/* Handle for serializer */
void * serializer;
@@ -1302,9 +1300,9 @@ extern krb5_kt_ops krb5_kt_dfl_ops;
*/
krb5_error_code KRB5_CALLCONV krb5_init_context
- (krb5_context FAR *);
+ (krb5_context *);
krb5_error_code KRB5_CALLCONV krb5_init_secure_context
- (krb5_context FAR *);
+ (krb5_context *);
void KRB5_CALLCONV krb5_free_context
(krb5_context);
@@ -1339,8 +1337,8 @@ krb5_error_code krb5_kdc_rep_decrypt_proc
krb5_kdc_rep * );
krb5_error_code KRB5_CALLCONV krb5_decrypt_tkt_part
(krb5_context,
- krb5_const krb5_keyblock FAR *,
- krb5_ticket FAR * );
+ krb5_const krb5_keyblock *,
+ krb5_ticket * );
krb5_error_code krb5_get_cred_from_kdc
(krb5_context,
krb5_ccache, /* not const, as reading may save
@@ -1364,7 +1362,7 @@ krb5_error_code krb5_get_cred_from_kdc_renew
krb5_creds *** );
void KRB5_CALLCONV krb5_free_tgt_creds
(krb5_context,
- krb5_creds FAR * FAR* ); /* XXX too hard to do with const */
+ krb5_creds **); /* XXX too hard to do with const */
#define KRB5_GC_USER_USER 1 /* want user-user ticket */
#define KRB5_GC_CACHED 2 /* want cached ticket only */
@@ -1373,20 +1371,20 @@ krb5_error_code KRB5_CALLCONV krb5_get_credentials
(krb5_context,
krb5_const krb5_flags,
krb5_ccache,
- krb5_creds FAR *,
- krb5_creds FAR * FAR *);
+ krb5_creds *,
+ krb5_creds **);
krb5_error_code KRB5_CALLCONV krb5_get_credentials_validate
(krb5_context,
krb5_const krb5_flags,
krb5_ccache,
- krb5_creds FAR *,
- krb5_creds FAR * FAR *);
+ krb5_creds *,
+ krb5_creds **);
krb5_error_code KRB5_CALLCONV krb5_get_credentials_renew
(krb5_context,
krb5_const krb5_flags,
krb5_ccache,
- krb5_creds FAR *,
- krb5_creds FAR * FAR *);
+ krb5_creds *,
+ krb5_creds **);
krb5_error_code krb5_get_cred_via_tkt
(krb5_context,
krb5_creds *,
@@ -1396,65 +1394,65 @@ krb5_error_code krb5_get_cred_via_tkt
krb5_creds **);
krb5_error_code KRB5_CALLCONV krb5_mk_req
(krb5_context,
- krb5_auth_context FAR *,
+ krb5_auth_context *,
krb5_const krb5_flags,
- char FAR *,
- char FAR *,
- krb5_data FAR *,
+ char *,
+ char *,
+ krb5_data *,
krb5_ccache,
- krb5_data FAR * );
+ krb5_data * );
krb5_error_code KRB5_CALLCONV krb5_mk_req_extended
(krb5_context,
- krb5_auth_context FAR *,
+ krb5_auth_context *,
krb5_const krb5_flags,
- krb5_data FAR *,
- krb5_creds FAR *,
- krb5_data FAR * );
+ krb5_data *,
+ krb5_creds *,
+ krb5_data * );
krb5_error_code KRB5_CALLCONV krb5_mk_rep
(krb5_context,
krb5_auth_context,
- krb5_data FAR *);
+ krb5_data *);
krb5_error_code KRB5_CALLCONV krb5_rd_rep
(krb5_context,
krb5_auth_context,
- krb5_const krb5_data FAR *,
- krb5_ap_rep_enc_part FAR * FAR *);
+ krb5_const krb5_data *,
+ krb5_ap_rep_enc_part **);
krb5_error_code KRB5_CALLCONV krb5_mk_error
(krb5_context,
- krb5_const krb5_error FAR *,
- krb5_data FAR * );
+ krb5_const krb5_error *,
+ krb5_data * );
krb5_error_code KRB5_CALLCONV krb5_rd_error
(krb5_context,
- krb5_const krb5_data FAR *,
- krb5_error FAR * FAR * );
+ krb5_const krb5_data *,
+ krb5_error ** );
krb5_error_code KRB5_CALLCONV krb5_rd_safe
(krb5_context,
krb5_auth_context,
- krb5_const krb5_data FAR *,
- krb5_data FAR *,
- krb5_replay_data FAR *);
+ krb5_const krb5_data *,
+ krb5_data *,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_rd_priv
(krb5_context,
krb5_auth_context,
- krb5_const krb5_data FAR *,
- krb5_data FAR *,
- krb5_replay_data FAR *);
+ krb5_const krb5_data *,
+ krb5_data *,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_parse_name
(krb5_context,
- krb5_const char FAR *,
- krb5_principal FAR * );
+ krb5_const char *,
+ krb5_principal * );
krb5_error_code KRB5_CALLCONV krb5_unparse_name
(krb5_context,
krb5_const_principal,
- char FAR * FAR * );
+ char ** );
krb5_error_code KRB5_CALLCONV krb5_unparse_name_ext
(krb5_context,
krb5_const_principal,
- char FAR * FAR *,
- unsigned int FAR *);
+ char **,
+ unsigned int *);
krb5_error_code KRB5_CALLCONV krb5_set_principal_realm
- (krb5_context, krb5_principal, const char FAR *);
+ (krb5_context, krb5_principal, const char *);
krb5_boolean krb5_address_search
(krb5_context,
@@ -1478,48 +1476,48 @@ krb5_boolean KRB5_CALLCONV krb5_principal_compare
krb5_const_principal);
krb5_error_code KRB5_CALLCONV krb5_copy_keyblock
(krb5_context,
- krb5_const krb5_keyblock FAR *,
- krb5_keyblock FAR * FAR *);
+ krb5_const krb5_keyblock *,
+ krb5_keyblock **);
krb5_error_code KRB5_CALLCONV krb5_copy_keyblock_contents
(krb5_context,
- krb5_const krb5_keyblock FAR *,
- krb5_keyblock FAR *);
+ krb5_const krb5_keyblock *,
+ krb5_keyblock *);
krb5_error_code KRB5_CALLCONV krb5_copy_creds
(krb5_context,
- krb5_const krb5_creds FAR *,
- krb5_creds FAR * FAR *);
+ krb5_const krb5_creds *,
+ krb5_creds **);
krb5_error_code KRB5_CALLCONV krb5_copy_data
(krb5_context,
- krb5_const krb5_data FAR *,
- krb5_data FAR * FAR *);
+ krb5_const krb5_data *,
+ krb5_data **);
krb5_error_code KRB5_CALLCONV krb5_copy_principal
(krb5_context,
krb5_const_principal,
- krb5_principal FAR *);
+ krb5_principal *);
krb5_error_code KRB5_CALLCONV krb5_copy_addr
(krb5_context,
- const krb5_address FAR *,
- krb5_address FAR * FAR *);
+ const krb5_address *,
+ krb5_address **);
krb5_error_code KRB5_CALLCONV krb5_copy_addresses
(krb5_context,
- krb5_address FAR * krb5_const FAR *,
- krb5_address FAR * FAR * FAR *);
+ krb5_address * krb5_const *,
+ krb5_address ***);
krb5_error_code KRB5_CALLCONV krb5_copy_ticket
(krb5_context,
- krb5_const krb5_ticket FAR *,
- krb5_ticket FAR * FAR *);
+ krb5_const krb5_ticket *,
+ krb5_ticket **);
krb5_error_code KRB5_CALLCONV krb5_copy_authdata
(krb5_context,
- krb5_authdata FAR * krb5_const FAR *,
- krb5_authdata FAR * FAR * FAR *);
+ krb5_authdata * krb5_const *,
+ krb5_authdata ***);
krb5_error_code KRB5_CALLCONV krb5_copy_authenticator
(krb5_context,
- krb5_const krb5_authenticator FAR *,
- krb5_authenticator FAR * FAR *);
+ krb5_const krb5_authenticator *,
+ krb5_authenticator **);
krb5_error_code KRB5_CALLCONV krb5_copy_checksum
(krb5_context,
- krb5_const krb5_checksum FAR *,
- krb5_checksum FAR * FAR *);
+ krb5_const krb5_checksum *,
+ krb5_checksum **);
void krb5_init_ets
(krb5_context);
void krb5_free_ets
@@ -1534,9 +1532,9 @@ krb5_error_code KRB5_CALLCONV krb5_get_server_rcache
(krb5_context,
krb5_const krb5_data *, krb5_rcache *);
krb5_error_code KRB5_CALLCONV_C krb5_build_principal_ext
- (krb5_context, krb5_principal FAR *, unsigned int, krb5_const char FAR *, ...);
+ (krb5_context, krb5_principal *, unsigned int, krb5_const char *, ...);
krb5_error_code KRB5_CALLCONV_C krb5_build_principal
- (krb5_context, krb5_principal FAR *, unsigned int, krb5_const char FAR *, ...);
+ (krb5_context, krb5_principal *, unsigned int, krb5_const char *, ...);
#ifdef va_start
/* XXX depending on varargs include file defining va_start... */
krb5_error_code krb5_build_principal_va
@@ -1546,13 +1544,13 @@ krb5_error_code krb5_build_principal_va
krb5_error_code KRB5_CALLCONV krb5_425_conv_principal
(krb5_context,
- krb5_const char FAR *name,
- krb5_const char FAR *instance, krb5_const char FAR *realm,
- krb5_principal FAR *princ);
+ krb5_const char *name,
+ krb5_const char *instance, krb5_const char *realm,
+ krb5_principal *princ);
krb5_error_code KRB5_CALLCONV krb5_524_conv_principal
(krb5_context context, krb5_const krb5_principal princ,
- char FAR *name, char FAR *inst, char FAR *realm);
+ char *name, char *inst, char *realm);
krb5_error_code KRB5_CALLCONV krb5_mk_chpw_req
(krb5_context context, krb5_auth_context auth_context,
@@ -1568,31 +1566,31 @@ krb5_error_code KRB5_CALLCONV krb5_chpw_result_code_string
/* libkt.spec */
krb5_error_code KRB5_CALLCONV krb5_kt_register
(krb5_context,
- krb5_kt_ops FAR * );
+ krb5_kt_ops * );
krb5_error_code KRB5_CALLCONV krb5_kt_resolve
(krb5_context,
- krb5_const char FAR *,
- krb5_keytab FAR * );
+ krb5_const char *,
+ krb5_keytab * );
krb5_error_code KRB5_CALLCONV krb5_kt_default_name
(krb5_context,
- char FAR *,
+ char *,
int );
krb5_error_code KRB5_CALLCONV krb5_kt_default
(krb5_context,
- krb5_keytab FAR * );
+ krb5_keytab * );
krb5_error_code KRB5_CALLCONV krb5_kt_free_entry
(krb5_context,
- krb5_keytab_entry FAR * );
+ krb5_keytab_entry * );
/* remove and add are functions, so that they can return NOWRITE
if not a writable keytab */
krb5_error_code KRB5_CALLCONV krb5_kt_remove_entry
(krb5_context,
krb5_keytab,
- krb5_keytab_entry FAR * );
+ krb5_keytab_entry * );
krb5_error_code KRB5_CALLCONV krb5_kt_add_entry
(krb5_context,
krb5_keytab,
- krb5_keytab_entry FAR * );
+ krb5_keytab_entry * );
krb5_error_code krb5_principal2salt
(krb5_context,
krb5_const_principal, krb5_data *);
@@ -1605,15 +1603,15 @@ krb5_error_code krb5_principal2salt_norealm
/* libcc.spec */
krb5_error_code KRB5_CALLCONV krb5_cc_resolve
(krb5_context,
- const char FAR *,
- krb5_ccache FAR * );
-const char FAR * KRB5_CALLCONV krb5_cc_default_name
+ const char *,
+ krb5_ccache * );
+const char * KRB5_CALLCONV krb5_cc_default_name
(krb5_context);
krb5_error_code KRB5_CALLCONV krb5_cc_set_default_name
(krb5_context, const char *);
krb5_error_code KRB5_CALLCONV krb5_cc_default
(krb5_context,
- krb5_ccache FAR *);
+ krb5_ccache *);
unsigned int KRB5_CALLCONV krb5_get_notification_message
(void);
@@ -1637,97 +1635,97 @@ void krb5_free_realm_tree
void KRB5_CALLCONV krb5_free_principal
(krb5_context, krb5_principal );
void KRB5_CALLCONV krb5_free_authenticator
- (krb5_context, krb5_authenticator FAR * );
+ (krb5_context, krb5_authenticator * );
void KRB5_CALLCONV krb5_free_authenticator_contents
- (krb5_context, krb5_authenticator FAR * );
+ (krb5_context, krb5_authenticator * );
void KRB5_CALLCONV krb5_free_addresses
- (krb5_context, krb5_address FAR * FAR * );
+ (krb5_context, krb5_address ** );
void KRB5_CALLCONV krb5_free_address
- (krb5_context, krb5_address FAR * );
+ (krb5_context, krb5_address * );
void KRB5_CALLCONV krb5_free_authdata
- (krb5_context, krb5_authdata FAR * FAR * );
+ (krb5_context, krb5_authdata ** );
void KRB5_CALLCONV krb5_free_enc_tkt_part
- (krb5_context, krb5_enc_tkt_part FAR * );
+ (krb5_context, krb5_enc_tkt_part * );
void KRB5_CALLCONV krb5_free_ticket
- (krb5_context, krb5_ticket FAR * );
+ (krb5_context, krb5_ticket * );
void KRB5_CALLCONV krb5_free_tickets
- (krb5_context, krb5_ticket FAR * FAR * );
+ (krb5_context, krb5_ticket ** );
void KRB5_CALLCONV krb5_free_kdc_req
- (krb5_context, krb5_kdc_req FAR * );
+ (krb5_context, krb5_kdc_req * );
void KRB5_CALLCONV krb5_free_kdc_rep
- (krb5_context, krb5_kdc_rep FAR * );
+ (krb5_context, krb5_kdc_rep * );
void KRB5_CALLCONV krb5_free_last_req
- (krb5_context, krb5_last_req_entry FAR * FAR * );
+ (krb5_context, krb5_last_req_entry ** );
void KRB5_CALLCONV krb5_free_enc_kdc_rep_part
- (krb5_context, krb5_enc_kdc_rep_part FAR * );
+ (krb5_context, krb5_enc_kdc_rep_part * );
void KRB5_CALLCONV krb5_free_error
- (krb5_context, krb5_error FAR * );
+ (krb5_context, krb5_error * );
void KRB5_CALLCONV krb5_free_ap_req
- (krb5_context, krb5_ap_req FAR * );
+ (krb5_context, krb5_ap_req * );
void KRB5_CALLCONV krb5_free_ap_rep
- (krb5_context, krb5_ap_rep FAR * );
+ (krb5_context, krb5_ap_rep * );
void KRB5_CALLCONV krb5_free_cred
- (krb5_context, krb5_cred FAR *);
+ (krb5_context, krb5_cred *);
void KRB5_CALLCONV krb5_free_creds
- (krb5_context, krb5_creds FAR *);
+ (krb5_context, krb5_creds *);
void KRB5_CALLCONV krb5_free_cred_contents
- (krb5_context, krb5_creds FAR *);
+ (krb5_context, krb5_creds *);
void KRB5_CALLCONV krb5_free_cred_enc_part
- (krb5_context, krb5_cred_enc_part FAR *);
+ (krb5_context, krb5_cred_enc_part *);
void KRB5_CALLCONV krb5_free_checksum
- (krb5_context, krb5_checksum FAR *);
+ (krb5_context, krb5_checksum *);
void KRB5_CALLCONV krb5_free_checksum_contents
- (krb5_context, krb5_checksum FAR *);
+ (krb5_context, krb5_checksum *);
void KRB5_CALLCONV krb5_free_keyblock
- (krb5_context, krb5_keyblock FAR *);
+ (krb5_context, krb5_keyblock *);
void KRB5_CALLCONV krb5_free_keyblock_contents
- (krb5_context, krb5_keyblock FAR *);
+ (krb5_context, krb5_keyblock *);
void KRB5_CALLCONV krb5_free_pa_data
- (krb5_context, krb5_pa_data FAR * FAR *);
+ (krb5_context, krb5_pa_data **);
void KRB5_CALLCONV krb5_free_ap_rep_enc_part
- (krb5_context, krb5_ap_rep_enc_part FAR *);
+ (krb5_context, krb5_ap_rep_enc_part *);
void KRB5_CALLCONV krb5_free_tkt_authent
- (krb5_context, krb5_tkt_authent FAR *);
+ (krb5_context, krb5_tkt_authent *);
void KRB5_CALLCONV krb5_free_pwd_data
- (krb5_context, krb5_pwd_data FAR *);
+ (krb5_context, krb5_pwd_data *);
void KRB5_CALLCONV krb5_free_pwd_sequences
- (krb5_context, passwd_phrase_element FAR * FAR *);
+ (krb5_context, passwd_phrase_element **);
void KRB5_CALLCONV krb5_free_data
- (krb5_context, krb5_data FAR *);
+ (krb5_context, krb5_data *);
void KRB5_CALLCONV krb5_free_data_contents
- (krb5_context, krb5_data FAR *);
+ (krb5_context, krb5_data *);
void KRB5_CALLCONV krb5_free_unparsed_name
- (krb5_context, char FAR *);
+ (krb5_context, char *);
void KRB5_CALLCONV krb5_free_cksumtypes
- (krb5_context, krb5_cksumtype FAR *);
+ (krb5_context, krb5_cksumtype *);
/* From krb5/os but needed but by the outside world */
krb5_error_code KRB5_CALLCONV krb5_us_timeofday
(krb5_context,
- krb5_int32 FAR *,
- krb5_int32 FAR * );
+ krb5_int32 *,
+ krb5_int32 * );
krb5_error_code KRB5_CALLCONV krb5_timeofday
(krb5_context,
- krb5_int32 FAR * );
+ krb5_int32 * );
/* get all the addresses of this host */
krb5_error_code KRB5_CALLCONV krb5_os_localaddr
(krb5_context,
- krb5_address FAR * FAR * FAR *);
+ krb5_address ***);
krb5_error_code KRB5_CALLCONV krb5_get_default_realm
(krb5_context,
- char FAR * FAR * );
+ char ** );
krb5_error_code KRB5_CALLCONV krb5_set_default_realm
(krb5_context,
- krb5_const char FAR * );
+ krb5_const char * );
void KRB5_CALLCONV krb5_free_default_realm
(krb5_context,
- char FAR * );
+ char * );
krb5_error_code KRB5_CALLCONV krb5_sname_to_principal
(krb5_context,
- krb5_const char FAR *,
- krb5_const char FAR *,
+ krb5_const char *,
+ krb5_const char *,
krb5_int32,
- krb5_principal FAR *);
+ krb5_principal *);
krb5_error_code KRB5_CALLCONV
krb5_change_password
(krb5_context context, krb5_creds *creds, char *newpw,
@@ -1736,7 +1734,7 @@ krb5_change_password
#ifndef macintosh
krb5_error_code krb5_set_config_files
- (krb5_context, krb5_const char FAR * FAR *);
+ (krb5_context, krb5_const char **);
krb5_error_code KRB5_CALLCONV krb5_get_default_config_files
(char ***filenames);
@@ -1766,56 +1764,56 @@ krb5_error_code krb5_send_tgs
krb5_error_code KRB5_CALLCONV krb5_get_in_tkt
(krb5_context,
krb5_const krb5_flags,
- krb5_address FAR * krb5_const FAR *,
- krb5_enctype FAR *,
- krb5_preauthtype FAR *,
- krb5_error_code ( FAR * )(krb5_context,
+ krb5_address * krb5_const *,
+ krb5_enctype *,
+ krb5_preauthtype *,
+ krb5_error_code ( * )(krb5_context,
krb5_const krb5_enctype,
- krb5_data FAR *,
+ krb5_data *,
krb5_const_pointer,
- krb5_keyblock FAR * FAR *),
+ krb5_keyblock **),
krb5_const_pointer,
- krb5_error_code ( FAR * )(krb5_context,
- krb5_const krb5_keyblock FAR *,
+ krb5_error_code ( * )(krb5_context,
+ krb5_const krb5_keyblock *,
krb5_const_pointer,
- krb5_kdc_rep FAR * ),
+ krb5_kdc_rep * ),
krb5_const_pointer,
- krb5_creds FAR *,
+ krb5_creds *,
krb5_ccache,
- krb5_kdc_rep FAR * FAR * );
+ krb5_kdc_rep ** );
krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_password
(krb5_context,
krb5_const krb5_flags,
- krb5_address FAR * krb5_const FAR *,
- krb5_enctype FAR *,
- krb5_preauthtype FAR *,
- krb5_const char FAR *,
+ krb5_address * krb5_const *,
+ krb5_enctype *,
+ krb5_preauthtype *,
+ krb5_const char *,
krb5_ccache,
- krb5_creds FAR *,
- krb5_kdc_rep FAR * FAR * );
+ krb5_creds *,
+ krb5_kdc_rep ** );
krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_skey
(krb5_context,
krb5_const krb5_flags,
- krb5_address FAR * krb5_const FAR *,
- krb5_enctype FAR *,
- krb5_preauthtype FAR *,
- krb5_const krb5_keyblock FAR *,
+ krb5_address * krb5_const *,
+ krb5_enctype *,
+ krb5_preauthtype *,
+ krb5_const krb5_keyblock *,
krb5_ccache,
- krb5_creds FAR *,
- krb5_kdc_rep FAR * FAR * );
+ krb5_creds *,
+ krb5_kdc_rep ** );
krb5_error_code KRB5_CALLCONV krb5_get_in_tkt_with_keytab
(krb5_context,
krb5_const krb5_flags,
- krb5_address FAR * krb5_const FAR *,
- krb5_enctype FAR *,
- krb5_preauthtype FAR *,
+ krb5_address * krb5_const *,
+ krb5_enctype *,
+ krb5_preauthtype *,
krb5_const krb5_keytab,
krb5_ccache,
- krb5_creds FAR *,
- krb5_kdc_rep FAR * FAR * );
+ krb5_creds *,
+ krb5_kdc_rep ** );
krb5_error_code krb5_decode_kdc_rep
@@ -1826,12 +1824,12 @@ krb5_error_code krb5_decode_kdc_rep
krb5_error_code KRB5_CALLCONV krb5_rd_req
(krb5_context,
- krb5_auth_context FAR *,
- krb5_const krb5_data FAR *,
+ krb5_auth_context *,
+ krb5_const krb5_data *,
krb5_const_principal,
krb5_keytab,
- krb5_flags FAR *,
- krb5_ticket FAR * FAR *);
+ krb5_flags *,
+ krb5_ticket **);
krb5_error_code krb5_rd_req_decoded
(krb5_context,
@@ -1857,57 +1855,57 @@ krb5_error_code KRB5_CALLCONV krb5_kt_read_service_key
krb5_principal,
krb5_kvno,
krb5_enctype,
- krb5_keyblock FAR * FAR *);
+ krb5_keyblock **);
krb5_error_code KRB5_CALLCONV krb5_mk_safe
(krb5_context,
krb5_auth_context,
- krb5_const krb5_data FAR *,
- krb5_data FAR *,
- krb5_replay_data FAR *);
+ krb5_const krb5_data *,
+ krb5_data *,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_mk_priv
(krb5_context,
krb5_auth_context,
- krb5_const krb5_data FAR *,
- krb5_data FAR *,
- krb5_replay_data FAR *);
+ krb5_const krb5_data *,
+ krb5_data *,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_cc_register
(krb5_context,
- krb5_cc_ops FAR *,
+ krb5_cc_ops *,
krb5_boolean );
krb5_error_code KRB5_CALLCONV krb5_sendauth
(krb5_context,
- krb5_auth_context FAR *,
+ krb5_auth_context *,
krb5_pointer,
- char FAR *,
+ char *,
krb5_principal,
krb5_principal,
krb5_flags,
- krb5_data FAR *,
- krb5_creds FAR *,
+ krb5_data *,
+ krb5_creds *,
krb5_ccache,
- krb5_error FAR * FAR *,
- krb5_ap_rep_enc_part FAR * FAR *,
- krb5_creds FAR * FAR *);
+ krb5_error **,
+ krb5_ap_rep_enc_part **,
+ krb5_creds **);
krb5_error_code KRB5_CALLCONV krb5_recvauth
(krb5_context,
- krb5_auth_context FAR *,
+ krb5_auth_context *,
krb5_pointer,
- char FAR *,
+ char *,
krb5_principal,
krb5_int32,
krb5_keytab,
- krb5_ticket FAR * FAR *);
+ krb5_ticket **);
krb5_error_code KRB5_CALLCONV krb5_recvauth_version
(krb5_context,
- krb5_auth_context FAR *,
+ krb5_auth_context *,
krb5_pointer,
krb5_principal,
krb5_int32,
krb5_keytab,
- krb5_ticket FAR * FAR *,
- krb5_data FAR *);
+ krb5_ticket **,
+ krb5_data *);
krb5_error_code krb5_walk_realm_tree
(krb5_context,
@@ -1919,37 +1917,37 @@ krb5_error_code krb5_walk_realm_tree
krb5_error_code KRB5_CALLCONV krb5_mk_ncred
(krb5_context,
krb5_auth_context,
- krb5_creds FAR * FAR *,
- krb5_data FAR * FAR *,
- krb5_replay_data FAR *);
+ krb5_creds **,
+ krb5_data **,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_mk_1cred
(krb5_context,
krb5_auth_context,
- krb5_creds FAR *,
- krb5_data FAR * FAR *,
- krb5_replay_data FAR *);
+ krb5_creds *,
+ krb5_data **,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_rd_cred
(krb5_context,
krb5_auth_context,
- krb5_data FAR *,
- krb5_creds FAR * FAR * FAR *,
- krb5_replay_data FAR *);
+ krb5_data *,
+ krb5_creds ***,
+ krb5_replay_data *);
krb5_error_code KRB5_CALLCONV krb5_fwd_tgt_creds
(krb5_context,
krb5_auth_context,
- char FAR *,
+ char *,
krb5_principal,
krb5_principal,
krb5_ccache,
int forwardable,
- krb5_data FAR *);
+ krb5_data *);
krb5_error_code KRB5_CALLCONV krb5_auth_con_init
(krb5_context,
- krb5_auth_context FAR *);
+ krb5_auth_context *);
krb5_error_code KRB5_CALLCONV krb5_auth_con_free
(krb5_context,
@@ -1963,7 +1961,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_setflags
krb5_error_code KRB5_CALLCONV krb5_auth_con_getflags
(krb5_context,
krb5_auth_context,
- krb5_int32 FAR *);
+ krb5_int32 *);
krb5_error_code krb5_auth_con_setaddrs
(krb5_context,
@@ -1986,7 +1984,7 @@ krb5_error_code krb5_auth_con_setports
krb5_error_code KRB5_CALLCONV krb5_auth_con_setuseruserkey
(krb5_context,
krb5_auth_context,
- krb5_keyblock FAR *);
+ krb5_keyblock *);
krb5_error_code KRB5_CALLCONV krb5_auth_con_getkey
(krb5_context,
@@ -1996,7 +1994,7 @@ krb5_error_code KRB5_CALLCONV krb5_auth_con_getkey
krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalsubkey
(krb5_context,
krb5_auth_context,
- krb5_keyblock FAR * FAR *);
+ krb5_keyblock **);
krb5_error_code KRB5_CALLCONV krb5_auth_con_set_req_cksumtype
(krb5_context,
@@ -2016,12 +2014,12 @@ krb5_error_code krb5_auth_con_getcksumtype
krb5_error_code KRB5_CALLCONV krb5_auth_con_getlocalseqnumber
(krb5_context,
krb5_auth_context,
- krb5_int32 FAR *);
+ krb5_int32 *);
krb5_error_code KRB5_CALLCONV krb5_auth_con_getremoteseqnumber
(krb5_context,
krb5_auth_context,
- krb5_int32 FAR *);
+ krb5_int32 *);
krb5_error_code krb5_auth_con_initivector
(krb5_context,
@@ -2060,12 +2058,12 @@ krb5_error_code krb5_auth_con_getpermetypes
krb5_error_code KRB5_CALLCONV krb5_auth_con_getauthenticator
(krb5_context,
krb5_auth_context,
- krb5_authenticator FAR * FAR *);
+ krb5_authenticator **);
krb5_error_code KRB5_CALLCONV krb5_auth_con_getremotesubkey
(krb5_context,
krb5_auth_context,
- krb5_keyblock FAR * FAR *);
+ krb5_keyblock **);
#define KRB5_REALM_BRANCH_CHAR '.'
@@ -2084,10 +2082,10 @@ int krb5_net_write (krb5_context, int , const char *, int);
krb5_error_code KRB5_CALLCONV krb5_read_password
(krb5_context,
- const char FAR *,
- const char FAR *,
- char FAR *,
- unsigned int FAR * );
+ const char *,
+ const char *,
+ char *,
+ unsigned int * );
krb5_error_code krb5_aname_to_localname
(krb5_context,
krb5_const_principal,
@@ -2095,11 +2093,11 @@ krb5_error_code krb5_aname_to_localname
char * );
krb5_error_code KRB5_CALLCONV krb5_get_host_realm
(krb5_context,
- const char FAR *,
- char FAR * FAR * FAR * );
+ const char *,
+ char *** );
krb5_error_code KRB5_CALLCONV krb5_free_host_realm
(krb5_context,
- char FAR * const FAR * );
+ char * const * );
krb5_error_code KRB5_CALLCONV krb5_get_realm_domain
(krb5_context,
const char *,
@@ -2140,27 +2138,27 @@ krb5_error_code krb5_set_time_offsets
/* str_conv.c */
krb5_error_code KRB5_CALLCONV krb5_string_to_enctype
- (char FAR *, krb5_enctype FAR *);
+ (char *, krb5_enctype *);
krb5_error_code KRB5_CALLCONV krb5_string_to_salttype
- (char FAR *, krb5_int32 FAR *);
+ (char *, krb5_int32 *);
krb5_error_code KRB5_CALLCONV krb5_string_to_cksumtype
- (char FAR *, krb5_cksumtype FAR *);
+ (char *, krb5_cksumtype *);
krb5_error_code KRB5_CALLCONV krb5_string_to_timestamp
- (char FAR *, krb5_timestamp FAR *);
+ (char *, krb5_timestamp *);
krb5_error_code KRB5_CALLCONV krb5_string_to_deltat
- (char FAR *, krb5_deltat FAR *);
+ (char *, krb5_deltat *);
krb5_error_code KRB5_CALLCONV krb5_enctype_to_string
- (krb5_enctype, char FAR *, size_t);
+ (krb5_enctype, char *, size_t);
krb5_error_code KRB5_CALLCONV krb5_salttype_to_string
- (krb5_int32, char FAR *, size_t);
+ (krb5_int32, char *, size_t);
krb5_error_code KRB5_CALLCONV krb5_cksumtype_to_string
- (krb5_cksumtype, char FAR *, size_t);
+ (krb5_cksumtype, char *, size_t);
krb5_error_code KRB5_CALLCONV krb5_timestamp_to_string
- (krb5_timestamp, char FAR *, size_t);
+ (krb5_timestamp, char *, size_t);
krb5_error_code KRB5_CALLCONV krb5_timestamp_to_sfstring
- (krb5_timestamp, char FAR *, size_t, char FAR *);
+ (krb5_timestamp, char *, size_t, char *);
krb5_error_code KRB5_CALLCONV krb5_deltat_to_string
- (krb5_deltat, char FAR *, size_t);
+ (krb5_deltat, char *, size_t);
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index de32044ba..2baa1ecd1 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-05 Ken Raeburn <raeburn@mit.edu>
+
+ * adm_defs.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h, kwinsock.h:
+ Don't explicitly declare pointers or functions FAR any more. Drop
+ _MSDOS support.
+
2001-10-03 Ken Raeburn <raeburn@mit.edu>
* adm_proto.h: Don't use KRB5_DLLIMP.
diff --git a/src/include/krb5/adm_defs.h b/src/include/krb5/adm_defs.h
index 4ac70031a..b2b747446 100644
--- a/src/include/krb5/adm_defs.h
+++ b/src/include/krb5/adm_defs.h
@@ -95,11 +95,11 @@ typedef struct {
char appl_code;
char oper_code;
char retn_code;
- char FAR *message;
+ char *message;
} kadmin_requests;
#if 0
-static char FAR *oper_type[] = {
+static char *oper_type[] = {
"complete", /* 0 */
"addition", /* 1 */
"deletion", /* 2 */
@@ -114,7 +114,7 @@ static char FAR *oper_type[] = {
#if 0
-static char FAR *ksrvutil_message[] = {
+static char *ksrvutil_message[] = {
"Service Key Changed", /* 0 */
"New Key and Version Received" /* 1 */
};
@@ -124,7 +124,7 @@ static char FAR *ksrvutil_message[] = {
#define KADMSAG 0x01
#if 0
-static char FAR *kadmind_general_response[] = {
+static char *kadmind_general_response[] = {
"Success", /* 0 */
"Service Access Granted" /* 1 */
};
@@ -135,7 +135,7 @@ static char FAR *kadmind_general_response[] = {
#define KPASSBAD 0x01
#if 0
-static char FAR *kadmind_kpasswd_response[] = {
+static char *kadmind_kpasswd_response[] = {
"Password Changed", /* 0 */
"Password NOT Changed!" /* 1 */
};
@@ -146,7 +146,7 @@ static char FAR *kadmind_kpasswd_response[] = {
#define KSRVCATASTROPHE 0x02
#if 0
-static char FAR *kadmind_ksrvutil_response[] = {
+static char *kadmind_ksrvutil_response[] = {
"Service Password Change Complete", /* 0 */
"One or More Service Password Change(s) Failed!", /* 1 */
"Database Update Failure - Possible Catastrophe!!" /* 2 */
@@ -157,7 +157,7 @@ static char FAR *kadmind_ksrvutil_response[] = {
#define KADMBAD 0x01
#if 0
-static char FAR *kadmind_kadmin_response[] = {
+static char *kadmind_kadmin_response[] = {
"Administrative Service Completed", /* 0 */
"Principal Unknown!", /* 1 */
"Principal Already Exists!", /* 2 */
diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h
index 7539b27b7..17015ec64 100644
--- a/src/include/krb5/adm_proto.h
+++ b/src/include/krb5/adm_proto.h
@@ -70,7 +70,7 @@ void KRB5_CALLCONV krb5_adm_disconnect
krb5_auth_context,
krb5_ccache);
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
/* adm_kw_dec.c */
krb5_error_code krb5_adm_proto_to_dbent
(krb5_context,
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index af921a6e6..f21fa8457 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -84,7 +84,7 @@
#define KRB5_KDB_CREATE_BTREE 0x00000001
#define KRB5_KDB_CREATE_HASH 0x00000002
-#if !defined(macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined(macintosh) && !defined(_WIN32)
/*
* Note --- these structures cannot be modified without changing the
@@ -326,5 +326,5 @@ krb5_error_code krb5_ser_db_context_init (krb5_context);
#define KRB5_KDB_DEF_FLAGS 0
-#endif /* !defined(macintosh) && !defined(_MSDOS) &&!defined(_WIN32) */
+#endif /* !defined(macintosh) &&!defined(_WIN32) */
#endif /* KRB5_KDB5__ */
diff --git a/src/include/krb5/kdb_dbc.h b/src/include/krb5/kdb_dbc.h
index 134d63014..676940dfe 100644
--- a/src/include/krb5/kdb_dbc.h
+++ b/src/include/krb5/kdb_dbc.h
@@ -57,7 +57,7 @@
#ifndef KRB5_KDB5_DBC__
#define KRB5_KDB5_DBC__
-#if !defined(macintosh) && !defined(_MSDOS)
+#if !defined(macintosh)
#include "kdb.h"
@@ -85,5 +85,5 @@ krb5_error_code krb5_dbm_db_set_mkey
krb5_error_code krb5_dbm_db_get_mkey
(krb5_context,krb5_db_context *,krb5_encrypt_block **);
-#endif /* !defined(macintosh) && !defined(_MSDOS) */
+#endif /* !defined(macintosh) */
#endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index 17fe29f0e..73f7f6218 100644
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -31,7 +31,7 @@
#ifndef KRB5_KDB5_DBM__
#define KRB5_KDB5_DBM__
-#if !defined(macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined(macintosh) && !defined(_WIN32)
/* exclusive or shared lock flags */
#define KRB5_DBM_SHARED 0
@@ -116,5 +116,5 @@ krb5_error_code krb5_dbm_db_open_database
krb5_error_code krb5_dbm_db_close_database
(krb5_context);
-#endif /* !defined(macintosh) && !defined(_MSDOS) && !defined(WIN32) */
+#endif /* !defined(macintosh) && !defined(WIN32) */
#endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/krb5/kdb_kt.h b/src/include/krb5/kdb_kt.h
index cd0bf9290..e0afae1ca 100644
--- a/src/include/krb5/kdb_kt.h
+++ b/src/include/krb5/kdb_kt.h
@@ -31,11 +31,11 @@
#ifndef KRB5_KDB5_KT_H
#define KRB5_KDB5_KT_H
-#if !defined(macintosh) && !defined(_MSDOS)
+#if !defined(macintosh)
#include "kdb.h"
krb5_error_code krb5_ktkdb_resolve (krb5_context, krb5_keytab *);
-#endif /* !defined(macintosh) && !defined(_MSDOS) */
+#endif /* !defined(macintosh) */
#endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/krb5/kwinsock.h b/src/include/krb5/kwinsock.h
index f4c128868..ae20cdc57 100644
--- a/src/include/krb5/kwinsock.h
+++ b/src/include/krb5/kwinsock.h
@@ -70,7 +70,7 @@ typedef struct fd_set {
extern "C" {
#endif
-extern int PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR *);
+extern int PASCAL __WSAFDIsSet(SOCKET, fd_set *);
#ifdef __cplusplus
}
@@ -78,27 +78,27 @@ extern int PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR *);
#define FD_CLR(fd, set) do { \
u_int __i; \
- for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \
- if (((fd_set FAR *)(set))->fd_array[__i] == fd) { \
- while (__i < ((fd_set FAR *)(set))->fd_count-1) { \
- ((fd_set FAR *)(set))->fd_array[__i] = \
- ((fd_set FAR *)(set))->fd_array[__i+1]; \
+ for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) { \
+ if (((fd_set *)(set))->fd_array[__i] == fd) { \
+ while (__i < ((fd_set *)(set))->fd_count-1) { \
+ ((fd_set *)(set))->fd_array[__i] = \
+ ((fd_set *)(set))->fd_array[__i+1]; \
__i++; \
} \
- ((fd_set FAR *)(set))->fd_count--; \
+ ((fd_set *)(set))->fd_count--; \
break; \
} \
} \
} while(0)
#define FD_SET(fd, set) do { \
- if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) \
- ((fd_set FAR *)(set))->fd_array[((fd_set FAR *)(set))->fd_count++]=fd;\
+ if (((fd_set *)(set))->fd_count < FD_SETSIZE) \
+ ((fd_set *)(set))->fd_array[((fd_set *)(set))->fd_count++]=fd;\
} while(0)
-#define FD_ZERO(set) (((fd_set FAR *)(set))->fd_count=0)
+#define FD_ZERO(set) (((fd_set *)(set))->fd_count=0)
-#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)fd, (fd_set FAR *)set)
+#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)fd, (fd_set *)set)
/*
* Structure used in select() call, taken from the BSD file sys/time.h.
@@ -160,11 +160,11 @@ struct timeval {
*/
struct hostent {
- char FAR * h_name; /* official name of host */
- char FAR * FAR * h_aliases; /* alias list */
+ char * h_name; /* official name of host */
+ char ** h_aliases; /* alias list */
short h_addrtype; /* host address type */
short h_length; /* length of address */
- char FAR * FAR * h_addr_list; /* list of addresses */
+ char ** h_addr_list; /* list of addresses */
#define h_addr h_addr_list[0] /* address, for backward compat */
};
@@ -173,22 +173,22 @@ struct hostent {
* fits in 32 bits.
*/
struct netent {
- char FAR * n_name; /* official name of net */
- char FAR * FAR * n_aliases; /* alias list */
+ char * n_name; /* official name of net */
+ char ** n_aliases; /* alias list */
short n_addrtype; /* net address type */
u_long n_net; /* network # */
};
struct servent {
- char FAR * s_name; /* official service name */
- char FAR * FAR * s_aliases; /* alias list */
+ char * s_name; /* official service name */
+ char ** s_aliases; /* alias list */
short s_port; /* port # */
- char FAR * s_proto; /* protocol to use */
+ char * s_proto; /* protocol to use */
};
struct protoent {
- char FAR * p_name; /* official protocol name */
- char FAR * FAR * p_aliases; /* alias list */
+ char * p_name; /* official protocol name */
+ char ** p_aliases; /* alias list */
short p_proto; /* protocol # */
};
@@ -336,10 +336,10 @@ typedef struct WSAData {
char szSystemStatus[WSASYS_STATUS_LEN+1];
unsigned short iMaxSockets;
unsigned short iMaxUdpDg;
- char FAR * lpVendorInfo;
+ char * lpVendorInfo;
} WSADATA;
-typedef WSADATA FAR *LPWSADATA;
+typedef WSADATA *LPWSADATA;
/*
* Options for use with [gs]etsockopt at the IP level.
@@ -650,124 +650,124 @@ struct linger {
extern "C" {
#endif
-SOCKET PASCAL FAR accept (SOCKET s, struct sockaddr FAR *addr,
- int FAR *addrlen);
+SOCKET PASCAL accept (SOCKET s, struct sockaddr *addr,
+ int *addrlen);
-int PASCAL FAR bind (SOCKET s, const struct sockaddr FAR *addr, int namelen);
+int PASCAL bind (SOCKET s, const struct sockaddr *addr, int namelen);
-int PASCAL FAR closesocket (SOCKET s);
+int PASCAL closesocket (SOCKET s);
-int PASCAL FAR connect (SOCKET s, const struct sockaddr FAR *name, int namelen);
+int PASCAL connect (SOCKET s, const struct sockaddr *name, int namelen);
-int PASCAL FAR ioctlsocket (SOCKET s, long cmd, u_long FAR *argp);
+int PASCAL ioctlsocket (SOCKET s, long cmd, u_long *argp);
-int PASCAL FAR getpeername (SOCKET s, struct sockaddr FAR *name,
- int FAR * namelen);
+int PASCAL getpeername (SOCKET s, struct sockaddr *name,
+ int * namelen);
-int PASCAL FAR getsockname (SOCKET s, struct sockaddr FAR *name,
- int FAR * namelen);
+int PASCAL getsockname (SOCKET s, struct sockaddr *name,
+ int * namelen);
-int PASCAL FAR getsockopt (SOCKET s, int level, int optname,
- char FAR * optval, int FAR *optlen);
+int PASCAL getsockopt (SOCKET s, int level, int optname,
+ char * optval, int *optlen);
-u_long PASCAL FAR htonl (u_long hostlong);
+u_long PASCAL htonl (u_long hostlong);
-u_short PASCAL FAR htons (u_short hostshort);
+u_short PASCAL htons (u_short hostshort);
-unsigned long PASCAL FAR inet_addr (const char FAR * cp);
+unsigned long PASCAL inet_addr (const char * cp);
-char FAR * PASCAL FAR inet_ntoa (struct in_addr in);
+char * PASCAL inet_ntoa (struct in_addr in);
-int PASCAL FAR listen (SOCKET s, int backlog);
+int PASCAL listen (SOCKET s, int backlog);
-u_long PASCAL FAR ntohl (u_long netlong);
+u_long PASCAL ntohl (u_long netlong);
-u_short PASCAL FAR ntohs (u_short netshort);
+u_short PASCAL ntohs (u_short netshort);
-int PASCAL FAR recv (SOCKET s, char FAR * buf, int len, int flags);
+int PASCAL recv (SOCKET s, char * buf, int len, int flags);
-int PASCAL FAR recvfrom (SOCKET s, char FAR * buf, int len, int flags,
- struct sockaddr FAR *from, int FAR * fromlen);
+int PASCAL recvfrom (SOCKET s, char * buf, int len, int flags,
+ struct sockaddr *from, int * fromlen);
-int PASCAL FAR select (int nfds, fd_set FAR *readfds, fd_set FAR *writefds,
- fd_set FAR *exceptfds, const struct timeval FAR *timeout);
+int PASCAL select (int nfds, fd_set *readfds, fd_set *writefds,
+ fd_set *exceptfds, const struct timeval *timeout);
-int PASCAL FAR send (SOCKET s, const char FAR * buf, int len, int flags);
+int PASCAL send (SOCKET s, const char * buf, int len, int flags);
-int PASCAL FAR sendto (SOCKET s, const char FAR * buf, int len, int flags,
- const struct sockaddr FAR *to, int tolen);
+int PASCAL sendto (SOCKET s, const char * buf, int len, int flags,
+ const struct sockaddr *to, int tolen);
-int PASCAL FAR setsockopt (SOCKET s, int level, int optname,
- const char FAR * optval, int optlen);
+int PASCAL setsockopt (SOCKET s, int level, int optname,
+ const char * optval, int optlen);
-int PASCAL FAR shutdown (SOCKET s, int how);
+int PASCAL shutdown (SOCKET s, int how);
-SOCKET PASCAL FAR socket (int af, int type, int protocol);
+SOCKET PASCAL socket (int af, int type, int protocol);
/* Database function prototypes */
-struct hostent FAR * PASCAL FAR gethostbyaddr(const char FAR * addr,
+struct hostent * PASCAL gethostbyaddr(const char * addr,
int len, int type);
-struct hostent FAR * PASCAL FAR gethostbyname(const char FAR * name);
+struct hostent * PASCAL gethostbyname(const char * name);
-int PASCAL FAR gethostname (char FAR * name, int namelen);
+int PASCAL gethostname (char * name, int namelen);
-struct servent FAR * PASCAL FAR getservbyport(int port, const char FAR * proto);
+struct servent * PASCAL getservbyport(int port, const char * proto);
-struct servent FAR * PASCAL FAR getservbyname(const char FAR * name,
- const char FAR * proto);
+struct servent * PASCAL getservbyname(const char * name,
+ const char * proto);
-struct protoent FAR * PASCAL FAR getprotobynumber(int proto);
+struct protoent * PASCAL getprotobynumber(int proto);
-struct protoent FAR * PASCAL FAR getprotobyname(const char FAR * name);
+struct protoent * PASCAL getprotobyname(const char * name);
/* Microsoft Windows Extension function prototypes */
-int PASCAL FAR WSAStartup(WORD wVersionRequired, LPWSADATA lpWSAData);
+int PASCAL WSAStartup(WORD wVersionRequired, LPWSADATA lpWSAData);
-int PASCAL FAR WSACleanup(void);
+int PASCAL WSACleanup(void);
-void PASCAL FAR WSASetLastError(int iError);
+void PASCAL WSASetLastError(int iError);
-int PASCAL FAR WSAGetLastError(void);
+int PASCAL WSAGetLastError(void);
-BOOL PASCAL FAR WSAIsBlocking(void);
+BOOL PASCAL WSAIsBlocking(void);
-int PASCAL FAR WSAUnhookBlockingHook(void);
+int PASCAL WSAUnhookBlockingHook(void);
-FARPROC PASCAL FAR WSASetBlockingHook(FARPROC lpBlockFunc);
+FARPROC PASCAL WSASetBlockingHook(FARPROC lpBlockFunc);
-int PASCAL FAR WSACancelBlockingCall(void);
+int PASCAL WSACancelBlockingCall(void);
-HANDLE PASCAL FAR WSAAsyncGetServByName(HWND hWnd, u_int wMsg,
- const char FAR * name,
- const char FAR * proto,
- char FAR * buf, int buflen);
+HANDLE PASCAL WSAAsyncGetServByName(HWND hWnd, u_int wMsg,
+ const char * name,
+ const char * proto,
+ char * buf, int buflen);
-HANDLE PASCAL FAR WSAAsyncGetServByPort(HWND hWnd, u_int wMsg, int port,
- const char FAR * proto, char FAR * buf,
+HANDLE PASCAL WSAAsyncGetServByPort(HWND hWnd, u_int wMsg, int port,
+ const char * proto, char * buf,
int buflen);
-HANDLE PASCAL FAR WSAAsyncGetProtoByName(HWND hWnd, u_int wMsg,
- const char FAR * name, char FAR * buf,
+HANDLE PASCAL WSAAsyncGetProtoByName(HWND hWnd, u_int wMsg,
+ const char * name, char * buf,
int buflen);
-HANDLE PASCAL FAR WSAAsyncGetProtoByNumber(HWND hWnd, u_int wMsg,
- int number, char FAR * buf,
+HANDLE PASCAL WSAAsyncGetProtoByNumber(HWND hWnd, u_int wMsg,
+ int number, char * buf,
int buflen);
-HANDLE PASCAL FAR WSAAsyncGetHostByName(HWND hWnd, u_int wMsg,
- const char FAR * name, char FAR * buf,
+HANDLE PASCAL WSAAsyncGetHostByName(HWND hWnd, u_int wMsg,
+ const char * name, char * buf,
int buflen);
-HANDLE PASCAL FAR WSAAsyncGetHostByAddr(HWND hWnd, u_int wMsg,
- const char FAR * addr, int len, int type,
- char FAR * buf, int buflen);
+HANDLE PASCAL WSAAsyncGetHostByAddr(HWND hWnd, u_int wMsg,
+ const char * addr, int len, int type,
+ char * buf, int buflen);
-int PASCAL FAR WSACancelAsyncRequest(HANDLE hAsyncTaskHandle);
+int PASCAL WSACancelAsyncRequest(HANDLE hAsyncTaskHandle);
-int PASCAL FAR WSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
+int PASCAL WSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
long lEvent);
#ifdef __cplusplus
@@ -777,39 +777,39 @@ int PASCAL FAR WSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
/* Microsoft Windows Extended data types */
typedef struct sockaddr SOCKADDR;
typedef struct sockaddr *PSOCKADDR;
-typedef struct sockaddr FAR *LPSOCKADDR;
+typedef struct sockaddr *LPSOCKADDR;
typedef struct sockaddr_in SOCKADDR_IN;
typedef struct sockaddr_in *PSOCKADDR_IN;
-typedef struct sockaddr_in FAR *LPSOCKADDR_IN;
+typedef struct sockaddr_in *LPSOCKADDR_IN;
typedef struct linger LINGER;
typedef struct linger *PLINGER;
-typedef struct linger FAR *LPLINGER;
+typedef struct linger *LPLINGER;
typedef struct in_addr IN_ADDR;
typedef struct in_addr *PIN_ADDR;
-typedef struct in_addr FAR *LPIN_ADDR;
+typedef struct in_addr *LPIN_ADDR;
typedef struct fd_set FD_SET;
typedef struct fd_set *PFD_SET;
-typedef struct fd_set FAR *LPFD_SET;
+typedef struct fd_set *LPFD_SET;
typedef struct hostent HOSTENT;
typedef struct hostent *PHOSTENT;
-typedef struct hostent FAR *LPHOSTENT;
+typedef struct hostent *LPHOSTENT;
typedef struct servent SERVENT;
typedef struct servent *PSERVENT;
-typedef struct servent FAR *LPSERVENT;
+typedef struct servent *LPSERVENT;
typedef struct protoent PROTOENT;
typedef struct protoent *PPROTOENT;
-typedef struct protoent FAR *LPPROTOENT;
+typedef struct protoent *LPPROTOENT;
typedef struct timeval TIMEVAL;
typedef struct timeval *PTIMEVAL;
-typedef struct timeval FAR *LPTIMEVAL;
+typedef struct timeval *LPTIMEVAL;
/*
* Windows message parameter composition and decomposition
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index 60e3d30b7..6b42f340f 100644
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05 Ken Raeburn <raeburn@mit.edu>
+
+ * osconf.h: Drop _MSDOS support.
+
1999-09-20 Ken Raeburn <raeburn@mit.edu>
* osconf.h (KPASSWD_PORTNAME): Define.
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 37c8a7a63..3224b5ca1 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -30,7 +30,7 @@
#ifndef KRB5_OSCONF__
#define KRB5_OSCONF__
-#if !defined(_MSDOS) || !defined(_WIN32)
+#if !!defined(_WIN32)
/* Don't try to pull in autoconf.h for Windows, since it's not used */
#ifndef KRB5_AUTOCONF__
#define KRB5_AUTOCONF__
@@ -38,7 +38,7 @@
#endif
#endif
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#define DEFAULT_PROFILE_FILENAME "krb5.ini"
#define DEFAULT_LNAME_FILENAME "/aname"
#define DEFAULT_KEYTAB_NAME "FILE:%s\\krb5kt"
diff --git a/src/include/krb54proto.h b/src/include/krb54proto.h
index 7ecbba88c..11bec3fc6 100644
--- a/src/include/krb54proto.h
+++ b/src/include/krb54proto.h
@@ -3,9 +3,9 @@
*/
extern krb5_error_code krb54_get_service_keyblock
- PROTOTYPE((char FAR *service, char FAR *instance, char FAR *realm,
- int kvno, char FAR *file,
- krb5_keyblock FAR * keyblock));
+ PROTOTYPE((char *service, char *instance, char *realm,
+ int kvno, char *file,
+ krb5_keyblock * keyblock));
extern int decomp_tkt_krb5
PROTOTYPE((KTEXT tkt, unsigned char *flags, char *pname,
char *pinstance, char *prealm, unsigned KRB4_32 *paddress,
diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h
index da7ebc2b6..3a398fddb 100644
--- a/src/include/port-sockets.h
+++ b/src/include/port-sockets.h
@@ -1,6 +1,6 @@
#ifndef _PORT_SOCKET_H
#define _PORT_SOCKET_H
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
#include <winsock.h>
@@ -18,7 +18,7 @@
int win_socket_initialize();
-#else /* not _MSDOS and not _WIN32 */
+#else /* not _WIN32 */
/* If this source file requires it, define struct sockaddr_in
(and possibly other things related to network I/O). */
@@ -59,5 +59,5 @@ int win_socket_initialize();
#endif /* HAVE_MACSOCK_H */
-#endif /* _MSDOS */
+#endif /* _WIN32 */
#endif /*_PORT_SOCKET_H*/
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index d92a11a3f..60039d8f7 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -7,10 +7,11 @@
#ifndef _KRB5_WIN_MAC_H
#define _KRB5_WIN_MAC_H
-#if (defined(_MSDOS) || defined(_WIN32))
+#if defined(_WIN32)
/*
* Machine-type definitions: PC Clone 386 running Microloss Windows
*/
+/* Windows 32 specific */
#define ID_READ_PWD_DIALOG 10000
#define ID_READ_PWD_PROMPT 10001
@@ -24,45 +25,11 @@
#else
-#if defined(_MSDOS)
- /* Windows 16 specific */
-#define BITS16
-#define SIZEOF_INT 2
-#define SIZEOF_SHORT 2
-#define SIZEOF_LONG 4
-
-#ifndef KRB5_CALLCONV
-#define KRB5_CALLCONV __far __export __pascal
-#define KRB5_CALLCONV_C __far __export __cdecl
-#define KRB5_EXPORTVAR __far __export
-#endif /* !KRB5_CALLCONV */
-
-#include <windows.h>
-
-/*
- * The following defines are needed to make <windows.h> work
- * in stdc mode (/Za flag). Winsock.h needs <windows.h>.
- */
-#ifndef FAR
-#define FAR __far
-#define NEAR __near
-#endif
-
-#ifndef _far
-#define _far __far
-#define _near __near
-#define _pascal __pascal
-#define _cdecl __cdecl
-#define _huge __huge
-#endif
-
-#else
- /* Windows 32 specific */
#define SIZEOF_INT 4
#define SIZEOF_SHORT 2
#define SIZEOF_LONG 4
-#include <windows.h> /* always include this here, to get correct FAR and NEAR */
+#include <windows.h>
#define HAVE_LABS
@@ -72,8 +39,6 @@
# define KRB5_EXPORTVAR
#endif /* !KRB5_CALLCONV */
-#endif /* _MSDOS */
-
#ifndef KRB5_SYSTYPES__
#define KRB5_SYSTYPES__
#include <sys/types.h>
@@ -204,7 +169,7 @@ HINSTANCE get_lib_instance(void);
#endif /* !RES_ONLY */
-#endif /* _MSDOS || _WIN32 */
+#endif /* _WIN32 */
#ifdef macintosh
@@ -212,12 +177,6 @@ HINSTANCE get_lib_instance(void);
#define KRB5_CALLCONV
#define KRB5_CALLCONV_C
-#ifndef FAR
-#define FAR
-#endif
-#ifndef NEAR
-#define NEAR
-#endif
#define SIZEOF_INT 4
#define SIZEOF_SHORT 2
@@ -285,11 +244,5 @@ int fstat(int fildes, struct stat *buf);
#define KRB5_CALLCONV
#define KRB5_CALLCONV_C
#endif
-#ifndef FAR
-#define FAR
-#endif
-#ifndef NEAR
-#define NEAR
-#endif
#endif /* _KRB5_WIN_MAC_H */
generated by cgit (git 2.34.1) at 2026-01-08 22:47:58 +0000