Windows global stuff:
authorKeith Vetter <keithv@fusion.com>
Fri, 14 Apr 1995 00:56:21 +0000 (00:56 +0000)
committerKeith Vetter <keithv@fusion.com>
Fri, 14 Apr 1995 00:56:21 +0000 (00:56 +0000)
 o removed INTERFACE from non-api functions
 o add FAR to pointers visible to the world
 o made the tests for __STDC__ also check for _WINDOWS
 o creates GSSAPI.DLL & GSSAPI.LIB as per spec.

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

309 files changed:
src/config/ChangeLog
src/config/windows.in
src/include/ChangeLog
src/include/bsdlib.h
src/include/bstring.h
src/include/fake-stdlib.h
src/include/krb5.h
src/include/krb5/ChangeLog
src/include/krb5/adm_defs.h
src/include/krb5/asn1.h
src/include/krb5/base-defs.h
src/include/krb5/ccache.h
src/include/krb5/encryption.h
src/include/krb5/ext-proto.h
src/include/krb5/func-proto.h
src/include/krb5/hostaddr.h
src/include/krb5/k5-free.h
src/include/krb5/keytab.h
src/include/krb5/los-proto.h
src/include/krb5/macros.h
src/include/krb5/preauth.h
src/include/krb5/rcache.h
src/include/krb5/rsa-md5.h
src/include/sys/ChangeLog [new file with mode: 0644]
src/include/sys/syslog.h
src/include/syslog.h
src/lib/ChangeLog
src/lib/Makefile.in
src/lib/crypto/ChangeLog
src/lib/crypto/crc32/ChangeLog
src/lib/crypto/crc32/crc.c
src/lib/crypto/des/ChangeLog
src/lib/crypto/des/cbc_cksum.c
src/lib/crypto/des/cs_entry.c
src/lib/crypto/des/des_int.h
src/lib/crypto/des/f_cbc.c
src/lib/crypto/des/f_cksum.c
src/lib/crypto/des/f_ecb.c
src/lib/crypto/des/f_parity.c
src/lib/crypto/des/f_pcbc.c
src/lib/crypto/des/f_sched.c
src/lib/crypto/des/f_tables.h
src/lib/crypto/des/fin_rndkey.c
src/lib/crypto/des/finish_key.c
src/lib/crypto/des/init_rkey.c
src/lib/crypto/des/key_sched.c
src/lib/crypto/des/new_rn_key.c
src/lib/crypto/des/process_ky.c
src/lib/crypto/des/random_key.c
src/lib/crypto/des/string2key.c
src/lib/crypto/des/weak_key.c
src/lib/crypto/des_crc.c
src/lib/crypto/des_md5.c
src/lib/crypto/md4/ChangeLog
src/lib/crypto/md4/md4.c
src/lib/crypto/md4/md4crypto.c
src/lib/crypto/md4/md4glue.c
src/lib/crypto/md4/rsa-md4.h
src/lib/crypto/md5/ChangeLog
src/lib/crypto/md5/md5.c
src/lib/crypto/md5/md5crypto.c
src/lib/crypto/md5/md5glue.c
src/lib/crypto/os/ChangeLog
src/lib/crypto/os/rnd_confoun.c
src/lib/crypto/raw_des.c
src/lib/des425/ChangeLog
src/lib/des425/cksum.c
src/lib/des425/des.c
src/lib/des425/des.h
src/lib/des425/enc_dec.c
src/lib/des425/key_parity.c
src/lib/des425/key_sched.c
src/lib/des425/new_rnd_key.c
src/lib/des425/pcbc_encrypt.c
src/lib/des425/quad_cksum.c
src/lib/des425/random_key.c
src/lib/des425/read_passwd.c
src/lib/des425/str_to_key.c
src/lib/des425/unix_time.c
src/lib/des425/weak_key.c
src/lib/gssapi.def [new file with mode: 0644]
src/lib/gssapi/generic/ChangeLog
src/lib/gssapi/generic/disp_com_err_status.c
src/lib/gssapi/generic/disp_major_status.c
src/lib/gssapi/generic/gssapi.h
src/lib/gssapi/generic/gssapiP_generic.h
src/lib/gssapi/generic/gssapi_generic.h
src/lib/gssapi/generic/rel_buffer.c
src/lib/gssapi/generic/rel_oid_set.c
src/lib/gssapi/generic/util_buffer.c
src/lib/gssapi/generic/util_canonhost.c
src/lib/gssapi/generic/util_dup.c
src/lib/gssapi/generic/util_oid.c
src/lib/gssapi/generic/util_token.c
src/lib/gssapi/generic/util_validate.c
src/lib/gssapi/generic/utl_nohash_validate.c
src/lib/gssapi/krb5/ChangeLog
src/lib/gssapi/krb5/accept_sec_context.c
src/lib/gssapi/krb5/acquire_cred.c
src/lib/gssapi/krb5/compare_name.c
src/lib/gssapi/krb5/context_time.c
src/lib/gssapi/krb5/delete_sec_context.c
src/lib/gssapi/krb5/disp_name.c
src/lib/gssapi/krb5/disp_status.c
src/lib/gssapi/krb5/get_tkt_flags.c
src/lib/gssapi/krb5/gssapiP_krb5.h
src/lib/gssapi/krb5/gssapi_krb5.c
src/lib/gssapi/krb5/gssapi_krb5.h
src/lib/gssapi/krb5/import_name.c
src/lib/gssapi/krb5/indicate_mechs.c
src/lib/gssapi/krb5/init_sec_context.c
src/lib/gssapi/krb5/inq_context.c
src/lib/gssapi/krb5/inq_cred.c
src/lib/gssapi/krb5/k5seal.c
src/lib/gssapi/krb5/k5unseal.c
src/lib/gssapi/krb5/process_context_token.c
src/lib/gssapi/krb5/rel_cred.c
src/lib/gssapi/krb5/rel_name.c
src/lib/gssapi/krb5/seal.c
src/lib/gssapi/krb5/sign.c
src/lib/gssapi/krb5/unseal.c
src/lib/gssapi/krb5/util_cksum.c
src/lib/gssapi/krb5/util_crypt.c
src/lib/gssapi/krb5/util_seed.c
src/lib/gssapi/krb5/util_seqnum.c
src/lib/gssapi/krb5/verify.c
src/lib/krb5/asn.1/ChangeLog
src/lib/krb5/asn.1/asn1_decode.c
src/lib/krb5/asn.1/asn1_decode.h
src/lib/krb5/asn.1/asn1_encode.c
src/lib/krb5/asn.1/asn1_encode.h
src/lib/krb5/asn.1/asn1_get.c
src/lib/krb5/asn.1/asn1_get.h
src/lib/krb5/asn.1/asn1_k_decode.c
src/lib/krb5/asn.1/asn1_k_decode.h
src/lib/krb5/asn.1/asn1_k_encode.c
src/lib/krb5/asn.1/asn1_k_encode.h
src/lib/krb5/asn.1/asn1_make.c
src/lib/krb5/asn.1/asn1_make.h
src/lib/krb5/asn.1/asn1_misc.c
src/lib/krb5/asn.1/asn1_misc.h
src/lib/krb5/asn.1/asn1buf.c
src/lib/krb5/asn.1/asn1buf.h
src/lib/krb5/asn.1/krb5_decode.c
src/lib/krb5/asn.1/krb5_encode.c
src/lib/krb5/ccache/ChangeLog
src/lib/krb5/ccache/ccbase.c
src/lib/krb5/ccache/file/ChangeLog
src/lib/krb5/ccache/file/fcc-proto.h
src/lib/krb5/ccache/file/fcc_errs.c
src/lib/krb5/ccache/file/fcc_maybe.c
src/lib/krb5/ccache/file/fcc_read.c
src/lib/krb5/ccache/file/fcc_skip.c
src/lib/krb5/ccache/file/fcc_write.c
src/lib/krb5/ccache/stdio/ChangeLog
src/lib/krb5/ccache/stdio/scc_gennew.c
src/lib/krb5/error_tables/ChangeLog
src/lib/krb5/error_tables/Makefile.in
src/lib/krb5/free/ChangeLog
src/lib/krb5/free/f_addr.c
src/lib/krb5/free/f_ap_rep.c
src/lib/krb5/free/f_ap_req.c
src/lib/krb5/free/f_auth_cnt.c
src/lib/krb5/free/f_authdata.c
src/lib/krb5/free/f_authent.c
src/lib/krb5/free/f_chksum.c
src/lib/krb5/free/f_cred.c
src/lib/krb5/free/f_cred_enc.c
src/lib/krb5/free/f_enc_kdc.c
src/lib/krb5/free/f_enc_tkt.c
src/lib/krb5/free/f_error.c
src/lib/krb5/free/f_kdc_rp.c
src/lib/krb5/free/f_kdc_rq.c
src/lib/krb5/free/f_keyblock.c
src/lib/krb5/free/f_last_req.c
src/lib/krb5/free/f_padata.c
src/lib/krb5/free/f_priv.c
src/lib/krb5/free/f_priv_enc.c
src/lib/krb5/free/f_pwd_data.c
src/lib/krb5/free/f_pwd_seq.c
src/lib/krb5/free/f_safe.c
src/lib/krb5/free/f_tckt.c
src/lib/krb5/free/f_tckts.c
src/lib/krb5/free/f_tgt_cred.c
src/lib/krb5/free/f_tkt_auth.c
src/lib/krb5/keytab/ChangeLog
src/lib/krb5/keytab/file/ChangeLog
src/lib/krb5/keytab/file/ktf_add.c
src/lib/krb5/keytab/file/ktf_close.c
src/lib/krb5/keytab/file/ktf_endget.c
src/lib/krb5/keytab/file/ktf_g_ent.c
src/lib/krb5/keytab/file/ktf_g_name.c
src/lib/krb5/keytab/file/ktf_next.c
src/lib/krb5/keytab/file/ktf_remove.c
src/lib/krb5/keytab/file/ktf_resolv.c
src/lib/krb5/keytab/file/ktf_ssget.c
src/lib/krb5/keytab/file/ktf_util.c
src/lib/krb5/keytab/file/ktf_wreslv.c
src/lib/krb5/keytab/file/ktfile.h
src/lib/krb5/keytab/ktadd.c
src/lib/krb5/keytab/ktbase.c
src/lib/krb5/keytab/ktdefault.c
src/lib/krb5/keytab/ktfr_entry.c
src/lib/krb5/keytab/ktremove.c
src/lib/krb5/keytab/read_servi.c
src/lib/krb5/krb/ChangeLog
src/lib/krb5/krb/addr_comp.c
src/lib/krb5/krb/addr_order.c
src/lib/krb5/krb/addr_srch.c
src/lib/krb5/krb/auth_con.c
src/lib/krb5/krb/bld_princ.c
src/lib/krb5/krb/chk_trans.c
src/lib/krb5/krb/conv_princ.c
src/lib/krb5/krb/copy_addrs.c
src/lib/krb5/krb/copy_athctr.c
src/lib/krb5/krb/copy_auth.c
src/lib/krb5/krb/copy_cksum.c
src/lib/krb5/krb/copy_creds.c
src/lib/krb5/krb/copy_data.c
src/lib/krb5/krb/copy_key.c
src/lib/krb5/krb/copy_princ.c
src/lib/krb5/krb/copy_tick.c
src/lib/krb5/krb/cp_key_cnt.c
src/lib/krb5/krb/decode_kdc.c
src/lib/krb5/krb/decrypt_tk.c
src/lib/krb5/krb/encode_kdc.c
src/lib/krb5/krb/encrypt_tk.c
src/lib/krb5/krb/faddr_ordr.c
src/lib/krb5/krb/free_rtree.c
src/lib/krb5/krb/gc_2tgt.c
src/lib/krb5/krb/gc_frm_kdc.c
src/lib/krb5/krb/gc_via_tgt.c
src/lib/krb5/krb/gen_seqnum.c
src/lib/krb5/krb/gen_subkey.c
src/lib/krb5/krb/get_fcreds.c
src/lib/krb5/krb/get_in_tkt.c
src/lib/krb5/krb/in_tkt_ktb.c
src/lib/krb5/krb/in_tkt_pwd.c
src/lib/krb5/krb/in_tkt_sky.c
src/lib/krb5/krb/init_ctx.c
src/lib/krb5/krb/int-proto.h
src/lib/krb5/krb/kdc_rep_dc.c
src/lib/krb5/krb/mk_cred.c
src/lib/krb5/krb/mk_error.c
src/lib/krb5/krb/mk_priv.c
src/lib/krb5/krb/mk_rep.c
src/lib/krb5/krb/mk_req.c
src/lib/krb5/krb/mk_safe.c
src/lib/krb5/krb/pr_to_salt.c
src/lib/krb5/krb/preauth.c
src/lib/krb5/krb/princ_comp.c
src/lib/krb5/krb/rd_cred.c
src/lib/krb5/krb/rd_error.c
src/lib/krb5/krb/rd_priv.c
src/lib/krb5/krb/rd_req.c
src/lib/krb5/krb/rd_req_dec.c
src/lib/krb5/krb/rd_safe.c
src/lib/krb5/krb/recvauth.c
src/lib/krb5/krb/send_tgs.c
src/lib/krb5/krb/sendauth.c
src/lib/krb5/krb/srv_rcache.c
src/lib/krb5/krb/tgtname.c
src/lib/krb5/krb/unparse.c
src/lib/krb5/krb/walk_rtree.c
src/lib/krb5/os/ChangeLog
src/lib/krb5/os/an_to_ln.c
src/lib/krb5/os/ccdefname.c
src/lib/krb5/os/free_hstrl.c
src/lib/krb5/os/free_krbhs.c
src/lib/krb5/os/full_ipadr.c
src/lib/krb5/os/gen_port.c
src/lib/krb5/os/gen_rname.c
src/lib/krb5/os/get_krbhst.c
src/lib/krb5/os/hst_realm.c
src/lib/krb5/os/init_os_ctx.c
src/lib/krb5/os/krbfileio.c
src/lib/krb5/os/ktdefname.c
src/lib/krb5/os/kuserok.c
src/lib/krb5/os/locate_kdc.c
src/lib/krb5/os/lock_file.c
src/lib/krb5/os/net_read.c
src/lib/krb5/os/net_write.c
src/lib/krb5/os/os-proto.h
src/lib/krb5/os/port2ip.c
src/lib/krb5/os/read_msg.c
src/lib/krb5/os/read_pwd.c
src/lib/krb5/os/realm_dom.c
src/lib/krb5/os/sendto_kdc.c
src/lib/krb5/os/unlck_file.c
src/lib/krb5/os/write_msg.c
src/lib/krb5/posix/ChangeLog
src/lib/krb5/posix/syslog.c
src/lib/krb5/rcache/ChangeLog
src/lib/krb5/rcache/rc_base.c
src/lib/krb5/rcache/rc_conv.c
src/lib/krb5/rcache/rc_dfl.c
src/lib/krb5/rcache/rc_dfl.h
src/lib/krb5/rcache/rc_io.c
src/lib/krb5/rcache/rc_io.h
src/lib/libkrb5.def
src/util/et/ChangeLog
src/util/et/com_err.c
src/util/et/compile_et.c
src/util/et/error_table.h
src/util/et/et_c.awk
src/util/et/internal.h
src/windows/cns/changelo
src/windows/cns/cns.c
src/windows/cns/tktlist.c

index 0e5c6b2a7118d9e045c0145baad68a3ca8e26112..483466453ead7d10fa09336bdbf85686e5f35e2a 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 16:20:28 1995 Keith Vetter (keithv@fusion.com)
+
+       * windows.in: compile with stdc extensions enabled versus
+           strict stdc adherence.
+
 Tue Mar 28 17:58:55 1995  John Gilmore  (gnu at toad.com)
 
        * mac-config.cache:  Correct some entries.
index e101a3c9e2782d4eaf0306ee1f29d45d3cd19539..14e496cd9cb3e43cd82ecd141da12769f1290f98 100644 (file)
@@ -14,8 +14,8 @@ srcdir = .
 # /* The name of the C compiler for the target */
 CC=cl /nologo
 CL=
-CCOPTS=/ALw /Zpa /GD2s /Os /Zi /Od /W3 $(XTRA)
-CCOPTS2=/AL /Zpa /G2s  /Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA)
+CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 $(XTRA)
+CCOPTS2=/AL /Zp /G2s  /Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA)
 CPPFLAGS =  -I$(SRCTOP)/include -I$(SRCTOP)/include/krb5
 DEFS = $(CPPFLAGS)
 CFLAGS2 = $(CCOPTS2) $(DEFS)
index 2de0f8fb0e28760e16e3611c4bec2a7b0f5450f9..70c42d3b6d5a1f99268940dd16622efe11dd519a 100644 (file)
@@ -1,3 +1,9 @@
+Thu Apr 13 16:05:08 1995 Keith Vetter (keithv@fusion.com)
+
+       * bsdlib.h, bstring.h, fake-std.h, syslog.h:  __STDC__ conditionals
+           also check for the _WINDOWS define.
+        * krb5.h: added FAR to pointers visible to the world.
+
 Tue Mar 28 18:12:32 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (KRB5_HEADERS, install):  `Make install' now works.
index 60e203e579b81e422e77ccfb5a57d36c545f98cd..8ee3d40cf6c0bc7ab1c209837dc574449875690b 100644 (file)
@@ -4,7 +4,7 @@
  */
 #ifndef __BSDLIB__
 #define __BSDLIB__
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 /* compat-4.3 */
 extern char *ecvt  (double , int , int *, int *);
 extern char *fcvt  (double , int , int *, int *);
index 33d0ba6060a9b88fa88a382961483de3f13909c9..c7d0d61372c5f809dff019ac5b1a6f6b10323a49 100644 (file)
@@ -4,7 +4,7 @@
  */
 #ifndef __BSTRING__
 #define __BSTRING__
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 /* compat-sys5 */
 /* these are in <string.h> */
 extern int bcmp  (const char *, const char *, int );
index 77dfe4019c7ae10a17693be81c29505c598228f2..5f021a22803f86ff4cc654afd471b21f8581901c 100644 (file)
@@ -1,5 +1,4 @@
-#ifdef __STDC__
-# define       P(s) s
+#if defined(__STDC__) || defined(_WINDOWS)
 #else
 # define P(s) ()
 #endif
@@ -201,7 +200,7 @@ char *initstate P((unsigned , char *, int ));
 int isatty P((int ));
 double ldexp P((double , int ));
 int longjmperror P((void ));
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 void *malloc P((size_t ));
 #else
 char *malloc P((unsigned ));
@@ -466,7 +465,7 @@ struct ttyent *getttyent P((void ));
 struct ttyent *getttynam P((const char * ));
 unsigned long inet_network P((const char * ));
 int initgroups P((char * , int  ));
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 void *malloc P((unsigned ));
 #else
 char *malloc P((unsigned ));
index f322bac9c8cd3538b41fea0f9e79038c04e0e323..239ff4ebc7b11a9160d9937b5d9aa95a60c4af2a 100644 (file)
 
 typedef struct _krb5_context {
        krb5_magic      magic;
-       krb5_enctype  etypes;
+       krb5_enctype  FAR *etypes;
        int             etype_count;
-       void          os_context;
-} * krb5_context;
+       void          FAR *os_context;
+} FAR * krb5_context;
 
 struct _krb5_auth_context;
 typedef struct _krb5_auth_context krb5_auth_context;
@@ -64,7 +64,7 @@ typedef struct _krb5_authdata {
     krb5_magic magic;
     krb5_authdatatype ad_type;
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_authdata;
 
 /* structure for transited encoding */
@@ -78,12 +78,12 @@ typedef struct _krb5_enc_tkt_part {
     krb5_magic magic;
     /* to-be-encrypted portion */
     krb5_flags flags;                  /* flags */
-    krb5_keyblock *session;            /* session key: includes keytype */
+    krb5_keyblock FAR *session;                /* session key: includes keytype */
     krb5_principal client;             /* client name/realm */
     krb5_transited transited;          /* list of transited realms */
     krb5_ticket_times times;           /* auth, start, end, renew_till */
-    krb5_address **caddrs;             /* array of ptrs to addresses */
-    krb5_authdata **authorization_data;        /* auth data */
+    krb5_address FAR * FAR *caddrs;    /* array of ptrs to addresses */
+    krb5_authdata FAR * FAR *authorization_data; /* auth data */
 } krb5_enc_tkt_part;
 
 typedef struct _krb5_ticket {
@@ -92,7 +92,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 *enc_part2;      /* ptr to decrypted version, if
+    krb5_enc_tkt_part FAR *enc_part2;  /* ptr to decrypted version, if
                                           available */
 } krb5_ticket;
 
@@ -100,18 +100,18 @@ typedef struct _krb5_ticket {
 typedef struct _krb5_authenticator {
     krb5_magic magic;
     krb5_principal client;             /* client name/realm */
-    krb5_checksum *checksum;           /* checksum, includes type, optional */
+    krb5_checksum FAR *checksum;       /* checksum, includes type, optional */
     krb5_int32 cusec;                  /* client usec portion */
     krb5_timestamp ctime;              /* client sec portion */
-    krb5_keyblock *subkey;             /* true session key, optional */
+    krb5_keyblock FAR *subkey;         /* true session key, optional */
     krb5_int32 seq_number;             /* sequence #, optional */
-    krb5_authdata **authorization_data; /* New add by Ari, auth data */
+    krb5_authdata FAR * FAR *authorization_data; /* New add by Ari, auth data */
 } krb5_authenticator;
 
 typedef struct _krb5_tkt_authent {
     krb5_magic magic;
-    krb5_ticket *ticket;
-    krb5_authenticator *authenticator;
+    krb5_ticket FAR *ticket;
+    krb5_authenticator FAR *authenticator;
     krb5_flags ap_options;
 } krb5_tkt_authent;
 
@@ -125,12 +125,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 **addresses;          /* addrs in ticket */
+    krb5_address FAR * FAR *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 **authdata;          /* authorization data */
+    krb5_authdata FAR * FAR *authdata; /* authorization data */
 } krb5_creds;
 
 /* Last request fields */
@@ -145,13 +145,13 @@ typedef struct _krb5_pa_data {
     krb5_magic magic;
     krb5_ui_2  pa_type;
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_pa_data;
 
 typedef struct _krb5_kdc_req {
     krb5_magic magic;
     krb5_msgtype msg_type;             /* AS_REQ or TGS_REQ? */
-    krb5_pa_data **padata;             /* e.g. encoded AP_REQ */
+    krb5_pa_data FAR * FAR *padata;    /* e.g. encoded AP_REQ */
     /* real body */
     krb5_flags kdc_options;            /* requested options */
     krb5_principal client;             /* includes realm; optional */
@@ -162,26 +162,26 @@ typedef struct _krb5_kdc_req {
     krb5_timestamp rtime;              /* (optional) requested renew_till */
     krb5_int32 nonce;                  /* nonce to match request/response */
     int netypes;                       /* # of etypes, must be positive */
-    krb5_enctype *etype;               /* requested encryption type(s) */
-    krb5_address **addresses;          /* requested addresses, optional */
+    krb5_enctype FAR *etype;           /* requested encryption type(s) */
+    krb5_address FAR * FAR *addresses; /* requested addresses, optional */
     krb5_enc_data authorization_data;  /* encrypted auth data; OPTIONAL */
-    krb5_authdata **unenc_authdata;    /* unencrypted auth data,
+    krb5_authdata FAR * FAR *unenc_authdata; /* unencrypted auth data,
                                           if available */
-    krb5_ticket **second_ticket;       /* second ticket array; OPTIONAL */
+    krb5_ticket FAR * FAR *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 *session;            /* session key */
-    krb5_last_req_entry **last_req;    /* array of ptrs to entries */
+    krb5_keyblock FAR *session;                /* session key */
+    krb5_last_req_entry FAR * FAR *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 **caddrs;             /* array of ptrs to addresses,
+    krb5_address FAR * FAR *caddrs;    /* array of ptrs to addresses,
                                           optional */
 } krb5_enc_kdc_rep_part;
 
@@ -189,12 +189,12 @@ typedef struct _krb5_kdc_rep {
     krb5_magic magic;
     /* cleartext part: */
     krb5_msgtype msg_type;             /* AS_REP or KDC_REP? */
-    krb5_pa_data **padata;             /* preauthentication data from KDC */
+    krb5_pa_data FAR * FAR *padata;    /* preauthentication data from KDC */
     krb5_principal client;             /* client's principal identifier */
-    krb5_ticket *ticket;               /* ticket */
+    krb5_ticket FAR *ticket;           /* ticket */
     krb5_enc_data enc_part;            /* encryption type, kvno, encrypted
                                           encoding */
-    krb5_enc_kdc_rep_part *enc_part2;  /* unencrypted version, if available */
+    krb5_enc_kdc_rep_part FAR *enc_part2;/* unencrypted version, if available */
 } krb5_kdc_rep;
 
 /* error message structure */
@@ -216,7 +216,7 @@ typedef struct _krb5_error {
 typedef struct _krb5_ap_req {
     krb5_magic magic;
     krb5_flags ap_options;             /* requested options */
-    krb5_ticket *ticket;               /* ticket */
+    krb5_ticket FAR *ticket;           /* ticket */
     krb5_enc_data authenticator;       /* authenticator (already encrypted) */
 } krb5_ap_req;
 
@@ -229,7 +229,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 *subkey;             /* true session key, optional */
+    krb5_keyblock FAR *subkey;         /* true session key, optional */
     krb5_int32 seq_number;             /* sequence #, optional */
 } krb5_ap_rep_enc_part;
 
@@ -246,9 +246,9 @@ typedef struct _krb5_safe {
     krb5_int32 usec;                   /* microsecond portion of time,
                                           optional */
     krb5_int32 seq_number;             /* sequence #, optional */
-    krb5_address *s_address;           /* sender address */
-    krb5_address *r_address;           /* recipient address, optional */
-    krb5_checksum *checksum;           /* data integrity checksum */
+    krb5_address FAR *s_address;       /* sender address */
+    krb5_address FAR *r_address;       /* recipient address, optional */
+    krb5_checksum FAR *checksum;       /* data integrity checksum */
 } krb5_safe;
 
 typedef struct _krb5_priv {
@@ -262,20 +262,20 @@ 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 *s_address;           /* sender address */
-    krb5_address *r_address;           /* recipient address, optional */
+    krb5_address FAR *s_address;       /* sender address */
+    krb5_address FAR *r_address;       /* recipient address, optional */
 } krb5_priv_enc_part;
 
 typedef struct _krb5_cred_info {
     krb5_magic magic;
-    krb5_keyblock* session;             /* session key used to encrypt */
+    krb5_keyblock FAR *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 **caddrs;             /* array of ptrs to addresses */
+    krb5_address FAR * FAR *caddrs;    /* array of ptrs to addresses */
 } krb5_cred_info;
 
 typedef struct _krb5_cred_enc_part {
@@ -283,29 +283,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 *s_address;            /* sender address, optional */
-    krb5_address *r_address;            /* recipient address, optional */
-    krb5_cred_info **ticket_info;
+    krb5_address FAR *s_address;        /* sender address, optional */
+    krb5_address FAR *r_address;        /* recipient address, optional */
+    krb5_cred_info FAR * FAR *ticket_info;
 } krb5_cred_enc_part;    
 
 typedef struct _krb5_cred {
     krb5_magic magic;
-    krb5_ticket **tickets;             /* tickets */
+    krb5_ticket FAR * FAR *tickets;    /* tickets */
     krb5_enc_data enc_part;            /* encrypted part */
-    krb5_cred_enc_part *enc_part2;     /* unencrypted version, if available*/
+    krb5_cred_enc_part FAR *enc_part2;         /* unencrypted version, if available*/
 } krb5_cred;
 
 /* Sandia password generation structures */
 typedef struct _passwd_phrase_element {
     krb5_magic magic;
-    krb5_data *passwd;
-    krb5_data *phrase;
+    krb5_data FAR *passwd;
+    krb5_data FAR *phrase;
 } passwd_phrase_element;
 
 typedef struct _krb5_pwd_data {
     krb5_magic magic;
     int sequence_count;
-    passwd_phrase_element **element;
+    passwd_phrase_element FAR * FAR *element;
 } krb5_pwd_data;
 
 /* these need to be here so the typedefs are available for the prototypes */
index bdafb01f66a276da9d9ed4dd59b57553fe8203c0..023c2b663027a1f1ed61384b38d308704f485cc3 100644 (file)
@@ -1,3 +1,14 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+        * asn1.h, ccache.h, encryption.h, func-pro.h, hostaddr.h, keytab.h,
+          los-prot.h, preauth.h, rcache.h: 
+            removed unneeded INTERFACE from non-api functions.
+        * adm_defs.h, ccache.h, encryption.h, hostaddr.h, k5-free.h, keytab.h,
+          macros.h, rcache.h:
+           Added FAR to pointers visible to the world.
+        * base-def.h, ext-prot.h, rsa-md5.h: __STDC__ condition also 
+           checks for the _WINDOWS define.
+
 Wed Apr 5 16:41:41 1995 Keith Vetter (keithv@fusion.com)
 
        * los-proto.h, func-proto.h: moved krb5_us_timeofday and 
index 6bca9c0b782bf0465dd654e8b7e0c15160e1cab0..0c4ed05c36811702f6bbea6a4629b0ac4fc0994e 100644 (file)
@@ -92,11 +92,11 @@ typedef struct {
     char appl_code;
     char oper_code;
     char retn_code;
-    char *message;
+    char FAR *message;
 } kadmin_requests;
 
 #if 0
-static char *oper_type[] = {
+static char FAR *oper_type[] = {
        "complete",                                     /* 0 */
        "addition",                                     /* 1 */
        "deletion",                                     /* 2 */
@@ -111,7 +111,7 @@ static char *oper_type[] = {
 
 
 #if 0
-static char *ksrvutil_message[] = {
+static char FAR *ksrvutil_message[] = {
        "Service Key Changed",                          /* 0 */
        "New Key and Version Received"                  /* 1 */
 };
@@ -121,7 +121,7 @@ static char *ksrvutil_message[] = {
 #define KADMSAG                0x01
 
 #if 0
-static char *kadmind_general_response[] = {
+static char FAR *kadmind_general_response[] = {
        "Success",                                      /* 0 */
        "Service Access Granted"                        /* 1 */
 };
@@ -132,7 +132,7 @@ static char *kadmind_general_response[] = {
 #define KPASSBAD       0x01
 
 #if 0
-static char *kadmind_kpasswd_response[] = {
+static char FAR *kadmind_kpasswd_response[] = {
        "Password Changed",                             /* 0 */
        "Password NOT Changed!"                         /* 1 */
 };
@@ -143,7 +143,7 @@ static char *kadmind_kpasswd_response[] = {
 #define KSRVCATASTROPHE        0x02
 
 #if 0
-static char *kadmind_ksrvutil_response[] = {
+static char FAR *kadmind_ksrvutil_response[] = {
        "Service Password Change Complete",             /* 0 */
        "One or More Service Password Change(s) Failed!",       /* 1 */
        "Database Update Failure - Possible Catastrophe!!"      /* 2 */
@@ -154,7 +154,7 @@ static char *kadmind_ksrvutil_response[] = {
 #define KADMBAD                0x01
 
 #if 0
-static char *kadmind_kadmin_response[] = {
+static char FAR *kadmind_kadmin_response[] = {
        "Administrative Service Completed",             /* 0 */
        "Principal Unknown!",                           /* 1 */
        "Principal Already Exists!",                    /* 2 */
index f142179f8750d8bd7efd5e9d327cae1a0f33af39..89efd4cda2cb34c760f81c75f511584f8509c7d0 100644 (file)
              Returns ENOMEM if memory runs out.
 */
 
-krb5_error_code INTERFACE encode_krb5_authenticator
+krb5_error_code encode_krb5_authenticator
        PROTOTYPE((const krb5_authenticator *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ticket
+krb5_error_code encode_krb5_ticket
        PROTOTYPE((const krb5_ticket *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_encryption_key
+krb5_error_code encode_krb5_encryption_key
        PROTOTYPE((const krb5_keyblock *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_tkt_part
+krb5_error_code encode_krb5_enc_tkt_part
        PROTOTYPE((const krb5_enc_tkt_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part
+krb5_error_code encode_krb5_enc_kdc_rep_part
        PROTOTYPE((const krb5_enc_kdc_rep_part *rep, krb5_data **code));
 
 /* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code INTERFACE encode_krb5_as_rep
+krb5_error_code encode_krb5_as_rep
        PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
 
 /* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code INTERFACE encode_krb5_tgs_rep
+krb5_error_code encode_krb5_tgs_rep
        PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ap_req
+krb5_error_code encode_krb5_ap_req
        PROTOTYPE((const krb5_ap_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ap_rep
+krb5_error_code encode_krb5_ap_rep
        PROTOTYPE((const krb5_ap_rep *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part
+krb5_error_code encode_krb5_ap_rep_enc_part
        PROTOTYPE((const krb5_ap_rep_enc_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_as_req
+krb5_error_code encode_krb5_as_req
        PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_tgs_req
+krb5_error_code encode_krb5_tgs_req
        PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_kdc_req_body
+krb5_error_code encode_krb5_kdc_req_body
        PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_safe
+krb5_error_code encode_krb5_safe
        PROTOTYPE((const krb5_safe *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_priv
+krb5_error_code encode_krb5_priv
        PROTOTYPE((const krb5_priv *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_priv_part
+krb5_error_code encode_krb5_enc_priv_part
        PROTOTYPE((const krb5_priv_enc_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_cred
+krb5_error_code encode_krb5_cred
        PROTOTYPE((const krb5_cred *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_enc_cred_part
+krb5_error_code encode_krb5_enc_cred_part
        PROTOTYPE((const krb5_cred_enc_part *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_error
+krb5_error_code encode_krb5_error
        PROTOTYPE((const krb5_error *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_authdata
+krb5_error_code encode_krb5_authdata
        PROTOTYPE((const krb5_authdata **rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_pwd_sequence
+krb5_error_code encode_krb5_pwd_sequence
        PROTOTYPE((const passwd_phrase_element *rep, krb5_data **code));
 
-krb5_error_code INTERFACE encode_krb5_pwd_data
+krb5_error_code encode_krb5_pwd_data
        PROTOTYPE((const krb5_pwd_data *rep, krb5_data **code));
 
 /*************************************************************************
@@ -203,70 +203,70 @@ krb5_error_code INTERFACE encode_krb5_pwd_data
              Returns asn1 and krb5 errors.
 */
 
-krb5_error_code INTERFACE decode_krb5_authenticator
+krb5_error_code decode_krb5_authenticator
        PROTOTYPE((const krb5_data *code, krb5_authenticator **rep));
 
-krb5_error_code INTERFACE decode_krb5_ticket
+krb5_error_code decode_krb5_ticket
        PROTOTYPE((const krb5_data *code, krb5_ticket **rep));
 
-krb5_error_code INTERFACE decode_krb5_encryption_key
+krb5_error_code decode_krb5_encryption_key
        PROTOTYPE((const krb5_data *output, krb5_keyblock **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_tkt_part
+krb5_error_code decode_krb5_enc_tkt_part
        PROTOTYPE((const krb5_data *output, krb5_enc_tkt_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part
+krb5_error_code decode_krb5_enc_kdc_rep_part
        PROTOTYPE((const krb5_data *output, krb5_enc_kdc_rep_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_as_rep
+krb5_error_code decode_krb5_as_rep
        PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
 
-krb5_error_code INTERFACE decode_krb5_tgs_rep
+krb5_error_code decode_krb5_tgs_rep
        PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep));
 
-krb5_error_code INTERFACE decode_krb5_ap_req
+krb5_error_code decode_krb5_ap_req
        PROTOTYPE((const krb5_data *output, krb5_ap_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_ap_rep
+krb5_error_code decode_krb5_ap_rep
        PROTOTYPE((const krb5_data *output, krb5_ap_rep **rep));
 
-krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part
+krb5_error_code decode_krb5_ap_rep_enc_part
        PROTOTYPE((const krb5_data *output, krb5_ap_rep_enc_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_as_req
+krb5_error_code decode_krb5_as_req
        PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_tgs_req
+krb5_error_code decode_krb5_tgs_req
        PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_kdc_req_body
+krb5_error_code decode_krb5_kdc_req_body
        PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep));
 
-krb5_error_code INTERFACE decode_krb5_safe
+krb5_error_code decode_krb5_safe
        PROTOTYPE((const krb5_data *output, krb5_safe **rep));
 
-krb5_error_code INTERFACE decode_krb5_priv
+krb5_error_code decode_krb5_priv
        PROTOTYPE((const krb5_data *output, krb5_priv **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_priv_part
+krb5_error_code decode_krb5_enc_priv_part
        PROTOTYPE((const krb5_data *output, krb5_priv_enc_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_cred
+krb5_error_code decode_krb5_cred
        PROTOTYPE((const krb5_data *output, krb5_cred **rep));
 
-krb5_error_code INTERFACE decode_krb5_enc_cred_part
+krb5_error_code decode_krb5_enc_cred_part
        PROTOTYPE((const krb5_data *output, krb5_cred_enc_part **rep));
 
-krb5_error_code INTERFACE decode_krb5_error
+krb5_error_code decode_krb5_error
        PROTOTYPE((const krb5_data *output, krb5_error **rep));
 
-krb5_error_code INTERFACE decode_krb5_authdata
+krb5_error_code decode_krb5_authdata
        PROTOTYPE((const krb5_data *output, krb5_authdata ***rep));
 
-krb5_error_code INTERFACE decode_krb5_pwd_sequence
+krb5_error_code decode_krb5_pwd_sequence
        PROTOTYPE((const krb5_data *output, passwd_phrase_element **rep));
 
-krb5_error_code INTERFACE decode_krb5_pwd_data
+krb5_error_code decode_krb5_pwd_data
        PROTOTYPE((const krb5_data *output, krb5_pwd_data **rep));
 
 /*************************************************************************
index 2929c7cab5d333d893615473e3eb768c288bb9ae..52ce3d5c93446fa825a255e998922bf01958e63c 100644 (file)
@@ -62,14 +62,14 @@ typedef struct _krb5_data {
 
 /* make const & volatile available without effect */
 
-#if !defined(__STDC__) && !defined(HAS_ANSI_CONST)
+#if !defined(__STDC__) && !defined(HAS_ANSI_CONST) && !defined(_WINDOWS)
 #define const
 #endif
-#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE)
+#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE) && !defined(_WINDOWS)
 #define volatile
 #endif
 
-#if defined(__STDC__) || defined(HAS_VOID_TYPE)
+#if defined(__STDC__) || defined(HAS_VOID_TYPE) || defined(_WINDOWS)
 typedef        void FAR * krb5_pointer;
 typedef void const FAR * krb5_const_pointer;
 #else
@@ -77,9 +77,9 @@ typedef char FAR * krb5_pointer;
 typedef char const FAR * krb5_const_pointer;
 #endif
 
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 #define PROTOTYPE(x) x
-#if defined(__STDC__) || defined(HAVE_STDARG_H)
+#if defined(__STDC__) || defined(HAVE_STDARG_H) || defined(_WINDOWS)
 #define        STDARG_P(x) x
 #else
 #define STDARG_P(x) ()
index 90d855da3003ed4a4d954873d04d17d2fdaa6a7a..988ec731bac83499a4d7b25c745805f1ee72249b 100644 (file)
@@ -32,36 +32,36 @@ typedef     krb5_pointer    krb5_cc_cursor; /* cursor for sequential lookup */
 
 typedef struct _krb5_ccache {
     krb5_magic magic;
-    struct _krb5_cc_ops *ops;
+    struct _krb5_cc_ops FAR *ops;
     krb5_pointer data;
-} *krb5_ccache;
+} FAR *krb5_ccache;
 
 typedef struct _krb5_cc_ops {
     krb5_magic magic;
-    char *prefix;
-    char *(INTERFACE *get_name) NPROTOTYPE((krb5_context, krb5_ccache));
-    krb5_error_code (INTERFACE *resolve) NPROTOTYPE((krb5_context, krb5_ccache *, 
-                                           char *));
-    krb5_error_code (INTERFACE *gen_new) NPROTOTYPE((krb5_context, krb5_ccache *));
+    char FAR *prefix;
+    char FAR * (INTERFACE *get_name) NPROTOTYPE((krb5_context, krb5_ccache));
+    krb5_error_code (INTERFACE *resolve) NPROTOTYPE((krb5_context, krb5_ccache FAR *,
+                                           char FAR *));
+    krb5_error_code (INTERFACE *gen_new) NPROTOTYPE((krb5_context, krb5_ccache FAR *));
     krb5_error_code (INTERFACE *init) NPROTOTYPE((krb5_context, krb5_ccache,
                                            krb5_principal));
     krb5_error_code (INTERFACE *destroy) NPROTOTYPE((krb5_context, krb5_ccache));
     krb5_error_code (INTERFACE *close) NPROTOTYPE((krb5_context, krb5_ccache));
     krb5_error_code (INTERFACE *store) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_creds *));
+                                           krb5_creds FAR *));
     krb5_error_code (INTERFACE *retrieve) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_flags, krb5_creds *,
-                                           krb5_creds *));
+                                           krb5_flags, krb5_creds FAR *,
+                                           krb5_creds FAR *));
     krb5_error_code (INTERFACE *get_princ) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_principal *));
+                                           krb5_principal FAR *));
     krb5_error_code (INTERFACE *get_first) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_cc_cursor *));
+                                           krb5_cc_cursor FAR *));
     krb5_error_code (INTERFACE *get_next) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_cc_cursor *, krb5_creds *));
+                                           krb5_cc_cursor FAR *, krb5_creds FAR *));
     krb5_error_code (INTERFACE *end_get) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_cc_cursor *));
+                                           krb5_cc_cursor FAR *));
     krb5_error_code (INTERFACE *remove_cred) NPROTOTYPE((krb5_context, krb5_ccache,
-                                           krb5_flags, krb5_creds *));
+                                           krb5_flags, krb5_creds FAR *));
     krb5_error_code (INTERFACE *set_flags) NPROTOTYPE((krb5_context, krb5_ccache,
                                            krb5_flags));
 } krb5_cc_ops;
@@ -93,6 +93,6 @@ typedef struct _krb5_cc_ops {
 #define krb5_cc_set_flags(context, cache, flags) (*(cache)->ops->set_flags)(context, cache, flags)
 #define krb5_cc_get_name(context, cache) (*(cache)->ops->get_name)(context, cache)
 
-extern krb5_cc_ops *krb5_cc_dfl_ops;
+extern krb5_cc_ops FAR *krb5_cc_dfl_ops;
 
 #endif /* KRB5_CCACHE__ */
index c54630e38ee2eafc45cb96e311a17d4d80a22237..0b72c20505da45792215e0fb82d3b5e84c049eef 100644 (file)
@@ -33,20 +33,20 @@ typedef struct _krb5_keyblock {
     krb5_keytype keytype;
     krb5_enctype etype;        /* hint of what encryption type to use */
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_keyblock;
 
 typedef struct _krb5_checksum {
     krb5_magic magic;
     krb5_cksumtype checksum_type;      /* checksum type */
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_checksum;
 
 typedef struct _krb5_encrypt_block {
     krb5_magic magic;
-    struct _krb5_cryptosystem_entry *crypto_entry;
-    krb5_keyblock *key;
+    struct _krb5_cryptosystem_entry FAR *crypto_entry;
+    krb5_keyblock FAR *key;
     krb5_pointer priv;                 /* for private use, e.g. DES
                                           key schedules */
 } krb5_encrypt_block;
@@ -61,30 +61,30 @@ typedef struct _krb5_enc_data {
 /* could be used in a table to find an etype and initialize a block */
 typedef struct _krb5_cryptosystem_entry {
     krb5_magic magic;
-    krb5_error_code (INTERFACE *encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
+    krb5_error_code (*encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
                                               krb5_pointer /* out */,
                                               const size_t,
-                                              krb5_encrypt_block *,
+                                              krb5_encrypt_block FAR *,
                                               krb5_pointer));
-    krb5_error_code (INTERFACE *decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
+    krb5_error_code (*decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
                                               krb5_pointer /* out */,
                                               const size_t,
-                                              krb5_encrypt_block *,
+                                              krb5_encrypt_block FAR *,
                                               krb5_pointer));
-    krb5_error_code (INTERFACE *process_key) NPROTOTYPE(( krb5_encrypt_block *,
-                                             const krb5_keyblock *));
-    krb5_error_code (INTERFACE *finish_key) NPROTOTYPE(( krb5_encrypt_block *));
-    krb5_error_code (INTERFACE *string_to_key) NPROTOTYPE(( const krb5_encrypt_block *,
+    krb5_error_code (*process_key) NPROTOTYPE(( krb5_encrypt_block FAR *,
+                                             const krb5_keyblock FAR *));
+    krb5_error_code (*finish_key) NPROTOTYPE(( krb5_encrypt_block FAR *));
+    krb5_error_code (*string_to_key) NPROTOTYPE((const krb5_encrypt_block FAR *,
                                                 const krb5_keytype,
-                                               krb5_keyblock *,
-                                               const krb5_data *,
-                                               const krb5_data *));
-    krb5_error_code  (INTERFACE *init_random_key) NPROTOTYPE(( const krb5_keyblock *,
-                                                  krb5_pointer *));
-    krb5_error_code  (INTERFACE *finish_random_key) NPROTOTYPE(( krb5_pointer *));
-    krb5_error_code (INTERFACE *random_key) NPROTOTYPE(( const krb5_encrypt_block *,
+                                               krb5_keyblock FAR *,
+                                               const krb5_data FAR *,
+                                               const krb5_data FAR *));
+    krb5_error_code  (*init_random_key) NPROTOTYPE((const krb5_keyblock FAR *,
+                                                  krb5_pointer FAR *));
+    krb5_error_code  (*finish_random_key) NPROTOTYPE(( krb5_pointer FAR *));
+    krb5_error_code (*random_key) NPROTOTYPE(( const krb5_encrypt_block FAR *,
                                              krb5_pointer,
-                                             krb5_keyblock **));
+                                             krb5_keyblock FAR * FAR *));
     int block_length;
     int pad_minimum;                   /* needed for cksum size computation */
     int keysize;
@@ -98,12 +98,12 @@ typedef struct _krb5_cryptosystem_entry {
 
 typedef struct _krb5_cs_table_entry {
     krb5_magic magic;
-    krb5_cryptosystem_entry *system;
+    krb5_cryptosystem_entry FAR *system;
     krb5_pointer random_sequence;      /* from init_random_key() */
 } krb5_cs_table_entry;
 
 /* could be used in a table to find a sumtype */
-typedef krb5_error_code  (INTERFACE *SUM_FUNC) NPROTOTYPE (
+typedef krb5_error_code  (*SUM_FUNC) NPROTOTYPE (
                        (krb5_pointer /* in */,
                        size_t /* in_length */,
                        krb5_pointer /* key/seed */,
index e916fa0008296212bb12aabd798a7ab5d5a8e384..d6919dc1a9f9e748490400dbca2684975f5098d6 100644 (file)
@@ -31,7 +31,7 @@
 #ifdef HAS_STDLIB_H
 #include <stdlib.h>
 #else
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 #ifdef NO_STDLIB_H
 #include <fake-stdlib.h>
 #else
index ce1c9280b07e062979c8859c6b6f5e76a4ccb4d6..f7fb11b2185e81bde93dcd3a01c1f57c2401dcf0 100644 (file)
 
 krb5_error_code INTERFACE krb5_init_context
        PROTOTYPE((krb5_context FAR *));
-void INTERFACE krb5_free_context
+void krb5_free_context
        PROTOTYPE((krb5_context));
 
-krb5_error_code        INTERFACE krb5_set_default_in_tkt_etypes
+krb5_error_code krb5_set_default_in_tkt_etypes
        PROTOTYPE((krb5_context,
                   const krb5_enctype *));
-krb5_error_code        INTERFACE krb5_get_default_in_tkt_etypes
+krb5_error_code krb5_get_default_in_tkt_etypes
        PROTOTYPE((krb5_context,
                   krb5_enctype **));
 
@@ -44,32 +44,32 @@ krb5_error_code     INTERFACE krb5_get_default_in_tkt_etypes
 extern krb5_context global_context;
 
 /* libkrb.spec */
-krb5_error_code INTERFACE krb5_kdc_rep_decrypt_proc
+krb5_error_code krb5_kdc_rep_decrypt_proc
        PROTOTYPE((krb5_context,
                   const krb5_keyblock *,
                   krb5_const_pointer,
                   krb5_kdc_rep * ));
-krb5_error_code INTERFACE krb5_encode_ticket
+krb5_error_code krb5_encode_ticket
        PROTOTYPE((krb5_context,
                   const krb5_ticket *,
                   krb5_data ** ));
-krb5_error_code INTERFACE krb5_encrypt_tkt_part
+krb5_error_code krb5_encrypt_tkt_part
        PROTOTYPE((krb5_context,
                   krb5_encrypt_block *,
                   const krb5_keyblock *,
                   krb5_ticket * ));
-krb5_error_code INTERFACE krb5_decrypt_tkt_part
+krb5_error_code krb5_decrypt_tkt_part
        PROTOTYPE((krb5_context,
                   const krb5_keyblock *,
                   krb5_ticket * ));
-krb5_error_code INTERFACE krb5_get_cred_from_kdc
+krb5_error_code krb5_get_cred_from_kdc
        PROTOTYPE((krb5_context,
                   krb5_ccache,         /* not const, as reading may save
                                           state */
                   krb5_creds *,
                   krb5_creds **,
                   krb5_creds *** ));
-void INTERFACE krb5_free_tgt_creds
+void krb5_free_tgt_creds
        PROTOTYPE((krb5_context,
                   krb5_creds ** ));    /* XXX too hard to do with const */
 
@@ -82,7 +82,7 @@ krb5_error_code INTERFACE krb5_get_credentials
                   krb5_ccache,
                   krb5_creds FAR *,
                   krb5_creds FAR * FAR *));
-krb5_error_code        INTERFACE krb5_get_for_creds
+krb5_error_code krb5_get_for_creds
        PROTOTYPE((krb5_context,
                   const krb5_cksumtype,
                   char *,
@@ -90,7 +90,7 @@ krb5_error_code       INTERFACE krb5_get_for_creds
                   krb5_keyblock *,
                   int,
                   krb5_data * ));
-krb5_error_code INTERFACE krb5_mk_req
+krb5_error_code krb5_mk_req
        PROTOTYPE((krb5_context,
                   krb5_auth_context **,
                   const krb5_flags,
@@ -106,7 +106,7 @@ krb5_error_code INTERFACE krb5_mk_req_extended
                   krb5_data FAR *,
                   krb5_creds FAR *,
                   krb5_data FAR * ));
-krb5_error_code INTERFACE krb5_mk_rep
+krb5_error_code krb5_mk_rep
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_data *));
@@ -115,21 +115,21 @@ krb5_error_code INTERFACE krb5_rd_rep
                   krb5_auth_context FAR *,
                   const krb5_data FAR *,
                   krb5_ap_rep_enc_part FAR * FAR *));
-krb5_error_code INTERFACE krb5_mk_error
+krb5_error_code krb5_mk_error
        PROTOTYPE((krb5_context,
                   const krb5_error *,
                   krb5_data * ));
-krb5_error_code INTERFACE krb5_rd_error
+krb5_error_code krb5_rd_error
        PROTOTYPE((krb5_context,
                   const krb5_data *,
                   krb5_error ** ));
-krb5_error_code INTERFACE krb5_rd_safe
+krb5_error_code krb5_rd_safe
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   const krb5_data *,
                   krb5_data *,
                   krb5_replay_data *));
-krb5_error_code INTERFACE krb5_rd_priv
+krb5_error_code krb5_rd_priv
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   const krb5_data *,
@@ -143,158 +143,158 @@ krb5_error_code INTERFACE krb5_unparse_name
        PROTOTYPE((krb5_context,
                   krb5_const_principal,
                   char FAR * FAR * ));
-krb5_error_code INTERFACE krb5_unparse_name_ext
+krb5_error_code krb5_unparse_name_ext
        PROTOTYPE((krb5_context,
                   krb5_const_principal,
                   char **,
                   int *));
-krb5_boolean INTERFACE krb5_address_search
+krb5_boolean krb5_address_search
        PROTOTYPE((krb5_context,
                   const krb5_address *,
                   krb5_address * const *));
-krb5_boolean INTERFACE krb5_address_compare
+krb5_boolean krb5_address_compare
        PROTOTYPE((krb5_context,
                   const krb5_address *,
                   const krb5_address *));
-int INTERFACE krb5_address_order
+int krb5_address_order
        PROTOTYPE((krb5_context,
                   const krb5_address *,
                   const krb5_address *));
-krb5_boolean INTERFACE krb5_realm_compare
+krb5_boolean krb5_realm_compare
        PROTOTYPE((krb5_context,
                   krb5_const_principal,
                   krb5_const_principal));
-krb5_boolean INTERFACE krb5_principal_compare
+krb5_boolean krb5_principal_compare
        PROTOTYPE((krb5_context,
                   krb5_const_principal,
                   krb5_const_principal));
-int INTERFACE krb5_fulladdr_order
+int krb5_fulladdr_order
        PROTOTYPE((krb5_context,
                   const krb5_fulladdr *,
                   const krb5_fulladdr *));
-krb5_error_code INTERFACE krb5_copy_keyblock
+krb5_error_code krb5_copy_keyblock
        PROTOTYPE((krb5_context,
                   const krb5_keyblock *,
               krb5_keyblock **));
-krb5_error_code INTERFACE krb5_copy_keyblock_contents
+krb5_error_code krb5_copy_keyblock_contents
        PROTOTYPE((krb5_context,
                   const krb5_keyblock *,
               krb5_keyblock *));
-krb5_error_code INTERFACE krb5_copy_creds
+krb5_error_code krb5_copy_creds
        PROTOTYPE((krb5_context,
                   const krb5_creds *,
               krb5_creds **));
-krb5_error_code INTERFACE krb5_copy_data
+krb5_error_code krb5_copy_data
        PROTOTYPE((krb5_context,
                   const krb5_data *,
               krb5_data **));
-krb5_error_code INTERFACE krb5_copy_principal
+krb5_error_code krb5_copy_principal
        PROTOTYPE((krb5_context,
                   krb5_const_principal,
               krb5_principal *));
-krb5_error_code INTERFACE krb5_copy_addresses
+krb5_error_code krb5_copy_addresses
        PROTOTYPE((krb5_context,
                   krb5_address * const *,
               krb5_address ***));
-krb5_error_code INTERFACE krb5_copy_ticket
+krb5_error_code krb5_copy_ticket
        PROTOTYPE((krb5_context,
                   const krb5_ticket *, krb5_ticket **));
-krb5_error_code INTERFACE krb5_copy_authdata
+krb5_error_code krb5_copy_authdata
        PROTOTYPE((krb5_context,
                   krb5_authdata * const *,
               krb5_authdata ***));
-krb5_error_code INTERFACE krb5_copy_authenticator
+krb5_error_code krb5_copy_authenticator
        PROTOTYPE((krb5_context,
                   const krb5_authenticator *,
               krb5_authenticator **));
-krb5_error_code INTERFACE krb5_copy_checksum
+krb5_error_code krb5_copy_checksum
        PROTOTYPE((krb5_context,
                   const krb5_checksum *,
               krb5_checksum **));
 void INTERFACE krb5_init_ets PROTOTYPE((krb5_context));
-krb5_error_code INTERFACE krb5_generate_subkey
+krb5_error_code krb5_generate_subkey
        PROTOTYPE((krb5_context,
                   const krb5_keyblock *, krb5_keyblock **));
-krb5_error_code INTERFACE krb5_generate_seq_number
+krb5_error_code krb5_generate_seq_number
        PROTOTYPE((krb5_context,
                   const krb5_keyblock *, krb5_int32 *));
-krb5_error_code INTERFACE krb5_get_server_rcache
+krb5_error_code krb5_get_server_rcache
        PROTOTYPE((krb5_context,
                   const krb5_data *, krb5_rcache *));
 krb5_error_code INTERFACE_C krb5_build_principal_ext
        STDARG_P((krb5_context, krb5_principal FAR *, int, const char FAR *, ...));
-krb5_error_code INTERFACE_C krb5_build_principal
+krb5_error_code krb5_build_principal
        STDARG_P((krb5_context, krb5_principal *, int, const char *, ...));
 #ifdef va_start
 /* XXX depending on varargs include file defining va_start... */
-krb5_error_code INTERFACE_C krb5_build_principal_va
+krb5_error_code krb5_build_principal_va
        PROTOTYPE((krb5_context,
                   krb5_principal *, int, const char *, va_list));
 #endif
 
-krb5_error_code INTERFACE krb5_425_conv_principal
+krb5_error_code krb5_425_conv_principal
        PROTOTYPE((krb5_context,
                   const char *name, const char *instance, const char *realm,
                   krb5_principal *princ));
 
-krb5_error_code INTERFACE krb5_obtain_padata
+krb5_error_code krb5_obtain_padata
        PROTOTYPE((krb5_context,
                   int type, krb5_principal client, krb5_address **src_addr,
                   krb5_keyblock *encrypt_key, krb5_pa_data **data));
 
-krb5_error_code INTERFACE krb5_verify_padata
+krb5_error_code krb5_verify_padata
        PROTOTYPE((krb5_context,
                   krb5_pa_data * data, krb5_principal client,
               krb5_address **src_addr, krb5_keyblock *decrypt_key,
               int *req_id, int *flags));
 
 /* libkt.spec */
-krb5_error_code INTERFACE krb5_kt_register
+krb5_error_code krb5_kt_register
        PROTOTYPE((krb5_context,
                   krb5_kt_ops * ));
-krb5_error_code INTERFACE krb5_kt_resolve
+krb5_error_code krb5_kt_resolve
        PROTOTYPE((krb5_context,
                   const char *,
                   krb5_keytab * ));
-krb5_error_code INTERFACE krb5_kt_default_name
+krb5_error_code krb5_kt_default_name
        PROTOTYPE((krb5_context,
                   char *,
                   int ));
-krb5_error_code INTERFACE krb5_kt_default
+krb5_error_code krb5_kt_default
        PROTOTYPE((krb5_context,
                   krb5_keytab * ));
-krb5_error_code INTERFACE krb5_kt_free_entry
+krb5_error_code krb5_kt_free_entry
        PROTOTYPE((krb5_context,
                   krb5_keytab_entry * ));
 /* remove and add are functions, so that they can return NOWRITE
    if not a writable keytab */
-krb5_error_code INTERFACE krb5_kt_remove_entry
+krb5_error_code krb5_kt_remove_entry
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry * ));
-krb5_error_code INTERFACE krb5_kt_add_entry
+krb5_error_code krb5_kt_add_entry
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry * ));
-krb5_error_code INTERFACE krb5_principal2salt
+krb5_error_code krb5_principal2salt
        PROTOTYPE((krb5_context,
                   krb5_const_principal, krb5_data *));
-krb5_error_code INTERFACE krb5_principal2salt_norealm
+krb5_error_code krb5_principal2salt_norealm
        PROTOTYPE((krb5_context,
                   krb5_const_principal, krb5_data *));
 
 /* librc.spec--see rcache.h */
 
 /* libcc.spec */
-krb5_error_code INTERFACE krb5_cc_resolve
+krb5_error_code krb5_cc_resolve
        PROTOTYPE((krb5_context,
                   char *,
                   krb5_ccache * ));
-krb5_error_code INTERFACE krb5_cc_generate_new
+krb5_error_code krb5_cc_generate_new
        PROTOTYPE((krb5_context,
                   krb5_cc_ops *,
                   krb5_ccache * ));
-char * INTERFACE krb5_cc_default_name
+char * krb5_cc_default_name
        PROTOTYPE((krb5_context));
 krb5_error_code INTERFACE krb5_cc_default
        PROTOTYPE((krb5_context,
@@ -303,12 +303,12 @@ unsigned int INTERFACE krb5_get_notification_message
    PROTOTYPE((void));
 
 /* chk_trans.c */
-krb5_error_code INTERFACE krb5_check_transited_list
+krb5_error_code krb5_check_transited_list
     PROTOTYPE((krb5_context,
                   krb5_data *trans, krb5_data *realm1, krb5_data *realm2));
 
 /* free_rtree.c */
-void INTERFACE krb5_free_realm_tree
+void krb5_free_realm_tree
        PROTOTYPE((krb5_context,
                   krb5_principal *));
 
@@ -316,64 +316,64 @@ void INTERFACE krb5_free_realm_tree
 void INTERFACE krb5_free_principal
        PROTOTYPE((krb5_context,
                   krb5_principal ));
-void INTERFACE krb5_free_authenticator
+void krb5_free_authenticator
        PROTOTYPE((krb5_context,
                   krb5_authenticator * ));
-void INTERFACE krb5_free_authenticator_contents
+void krb5_free_authenticator_contents
        PROTOTYPE((krb5_context,
                   krb5_authenticator * ));
 void INTERFACE krb5_free_addresses
        PROTOTYPE((krb5_context,
                   krb5_address FAR * FAR * ));
-void INTERFACE krb5_free_address
+void krb5_free_address
        PROTOTYPE((krb5_context,
                   krb5_address * ));
-void INTERFACE krb5_free_authdata
+void krb5_free_authdata
        PROTOTYPE((krb5_context,
                   krb5_authdata ** ));
-void INTERFACE krb5_free_enc_tkt_part
+void krb5_free_enc_tkt_part
        PROTOTYPE((krb5_context,
                   krb5_enc_tkt_part * ));
-void INTERFACE krb5_free_ticket
+void krb5_free_ticket
        PROTOTYPE((krb5_context,
                   krb5_ticket * ));
-void INTERFACE krb5_free_tickets
+void krb5_free_tickets
        PROTOTYPE((krb5_context,
                   krb5_ticket ** ));
-void INTERFACE krb5_free_kdc_req
+void krb5_free_kdc_req
        PROTOTYPE((krb5_context,
                   krb5_kdc_req * ));
-void INTERFACE krb5_free_kdc_rep
+void krb5_free_kdc_rep
        PROTOTYPE((krb5_context,
                   krb5_kdc_rep * ));
-void INTERFACE krb5_free_last_req
+void krb5_free_last_req
        PROTOTYPE((krb5_context,
                   krb5_last_req_entry ** ));
-void INTERFACE krb5_free_enc_kdc_rep_part
+void krb5_free_enc_kdc_rep_part
        PROTOTYPE((krb5_context,
                   krb5_enc_kdc_rep_part * ));
-void INTERFACE krb5_free_error
+void krb5_free_error
        PROTOTYPE((krb5_context,
                   krb5_error * ));
-void INTERFACE krb5_free_ap_req
+void krb5_free_ap_req
        PROTOTYPE((krb5_context,
                   krb5_ap_req * ));
-void INTERFACE krb5_free_ap_rep
+void krb5_free_ap_rep
        PROTOTYPE((krb5_context,
                   krb5_ap_rep * ));
-void INTERFACE krb5_free_safe
+void krb5_free_safe
        PROTOTYPE((krb5_context,
                   krb5_safe * ));
-void INTERFACE krb5_free_priv
+void krb5_free_priv
        PROTOTYPE((krb5_context,
                   krb5_priv * ));
-void INTERFACE krb5_free_priv_enc_part
+void krb5_free_priv_enc_part
        PROTOTYPE((krb5_context,
                   krb5_priv_enc_part * ));
-void INTERFACE krb5_free_kdc_req
+void krb5_free_kdc_req
        PROTOTYPE((krb5_context,
                   krb5_kdc_req * ));
-void INTERFACE krb5_free_cred
+void krb5_free_cred
    PROTOTYPE((krb5_context, 
          krb5_cred *));
 void INTERFACE krb5_free_creds
@@ -382,28 +382,28 @@ void INTERFACE krb5_free_creds
 void INTERFACE krb5_free_cred_contents
        PROTOTYPE((krb5_context,
                   krb5_creds FAR *));
-void INTERFACE krb5_free_cred_enc_part
+void krb5_free_cred_enc_part
    PROTOTYPE((krb5_context,
          krb5_cred_enc_part *));
-void INTERFACE krb5_free_checksum
+void krb5_free_checksum
        PROTOTYPE((krb5_context,
                   krb5_checksum *));
-void INTERFACE krb5_free_keyblock
+void krb5_free_keyblock
        PROTOTYPE((krb5_context,
                   krb5_keyblock *));
-void INTERFACE krb5_free_pa_data
+void krb5_free_pa_data
        PROTOTYPE((krb5_context,
                   krb5_pa_data **));
 void INTERFACE krb5_free_ap_rep_enc_part
        PROTOTYPE((krb5_context,
                   krb5_ap_rep_enc_part FAR *));
-void INTERFACE krb5_free_tkt_authent
+void krb5_free_tkt_authent
        PROTOTYPE((krb5_context,
                   krb5_tkt_authent *));
-void INTERFACE krb5_free_pwd_data
+void krb5_free_pwd_data
    PROTOTYPE((krb5_context,
          krb5_pwd_data *));
-void INTERFACE krb5_free_pwd_sequences
+void krb5_free_pwd_sequences
    PROTOTYPE((krb5_context,
          passwd_phrase_element **));
 
@@ -431,7 +431,7 @@ krb5_error_code INTERFACE krb5_sname_to_principal
 /* Only put things which don't have pointers to the narrow types in this
    section */
 
-krb5_error_code INTERFACE krb5_encode_kdc_rep
+krb5_error_code krb5_encode_kdc_rep
        PROTOTYPE((krb5_context,
                   const krb5_msgtype,
                   const krb5_enc_kdc_rep_part *,
@@ -440,7 +440,7 @@ krb5_error_code INTERFACE krb5_encode_kdc_rep
                   krb5_kdc_rep *,
                   krb5_data ** ));
 
-krb5_error_code INTERFACE krb5_send_tgs
+krb5_error_code krb5_send_tgs
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   const krb5_ticket_times *,
@@ -454,19 +454,19 @@ krb5_error_code INTERFACE krb5_send_tgs
                   krb5_creds *,
                   krb5_response * ));
 
-krb5_error_code INTERFACE krb5_get_in_tkt
+krb5_error_code krb5_get_in_tkt
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   krb5_address * const *,
                   krb5_enctype *,
                   krb5_preauthtype *,
-                  krb5_error_code (INTERFACE * )(krb5_context,
+                  krb5_error_code ( * )(krb5_context,
                                        const krb5_keytype,
                                         krb5_data *,
                                         krb5_const_pointer,
                                         krb5_keyblock **),
                   krb5_const_pointer,
-                  krb5_error_code (INTERFACE * )(krb5_context,
+                  krb5_error_code ( * )(krb5_context,
                                        const krb5_keyblock *,
                                        krb5_const_pointer,
                                        krb5_kdc_rep * ),
@@ -486,7 +486,7 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_password
                   krb5_creds FAR *,
                   krb5_kdc_rep FAR * FAR * ));
 
-krb5_error_code INTERFACE krb5_get_in_tkt_with_skey
+krb5_error_code krb5_get_in_tkt_with_skey
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   krb5_address * const *,
@@ -497,7 +497,7 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_skey
                   krb5_creds *,
                   krb5_kdc_rep ** ));
 
-krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab
+krb5_error_code krb5_get_in_tkt_with_keytab
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   krb5_address * const *,
@@ -509,14 +509,14 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab
                   krb5_kdc_rep ** ));
 
 
-krb5_error_code INTERFACE krb5_decode_kdc_rep
+krb5_error_code krb5_decode_kdc_rep
        PROTOTYPE((krb5_context,
                   krb5_data *,
                   const krb5_keyblock *,
                   const krb5_enctype,
                   krb5_kdc_rep ** ));
 
-krb5_error_code INTERFACE krb5_rd_req
+krb5_error_code krb5_rd_req
        PROTOTYPE((krb5_context,
                   krb5_auth_context **,
                   const krb5_data *,
@@ -525,7 +525,7 @@ krb5_error_code INTERFACE krb5_rd_req
                   krb5_flags *,
                   krb5_ticket **));
 
-krb5_error_code INTERFACE krb5_rd_req_decoded
+krb5_error_code krb5_rd_req_decoded
        PROTOTYPE((krb5_context,
                   krb5_auth_context **,
                   const krb5_ap_req *,
@@ -534,31 +534,31 @@ krb5_error_code INTERFACE krb5_rd_req_decoded
                   krb5_flags *,
                   krb5_ticket **));
 
-krb5_error_code INTERFACE krb5_kt_read_service_key
+krb5_error_code krb5_kt_read_service_key
        PROTOTYPE((krb5_context,
                   krb5_pointer,
                   krb5_principal,
                   krb5_kvno,
                   krb5_keytype,
                   krb5_keyblock **));
-krb5_error_code INTERFACE krb5_mk_safe
+krb5_error_code krb5_mk_safe
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   const krb5_data *,
                   krb5_data *,
                   krb5_replay_data *));
-krb5_error_code INTERFACE krb5_mk_priv
+krb5_error_code krb5_mk_priv
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   const krb5_data *,
                   krb5_data *,
                   krb5_replay_data *));
-krb5_error_code INTERFACE krb5_cc_register
+krb5_error_code krb5_cc_register
        PROTOTYPE((krb5_context,
                   krb5_cc_ops *,
                   krb5_boolean ));
 
-krb5_error_code INTERFACE krb5_sendauth 
+krb5_error_code krb5_sendauth 
        PROTOTYPE((krb5_context,
                   krb5_auth_context **,
                   krb5_pointer,
@@ -573,7 +573,7 @@ krb5_error_code INTERFACE krb5_sendauth
                   krb5_ap_rep_enc_part **,
                   krb5_creds **));
        
-krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context,
+krb5_error_code krb5_recvauth PROTOTYPE((krb5_context,
                   krb5_auth_context **,
                   krb5_pointer,
                   char *,
@@ -583,14 +583,14 @@ krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_ticket **));
 
-krb5_error_code INTERFACE krb5_walk_realm_tree
+krb5_error_code krb5_walk_realm_tree
        PROTOTYPE((krb5_context,
                   const krb5_data *,
               const krb5_data *,
               krb5_principal **,
               int));
 
-krb5_error_code INTERFACE krb5_mk_cred
+krb5_error_code krb5_mk_cred
        PROTOTYPE((krb5_context,
                    krb5_kdc_rep *,
                    krb5_enctype,
@@ -599,92 +599,92 @@ krb5_error_code INTERFACE krb5_mk_cred
                    krb5_address *,
                    krb5_data *));
 
-krb5_error_code INTERFACE krb5_auth_con_init
+krb5_error_code krb5_auth_con_init
        PROTOTYPE((krb5_context,
                   krb5_auth_context **));
 
-krb5_error_code INTERFACE krb5_auth_con_free
+krb5_error_code krb5_auth_con_free
        PROTOTYPE((krb5_context,
                   krb5_auth_context *));
 
-krb5_error_code INTERFACE krb5_auth_con_setflags
+krb5_error_code krb5_auth_con_setflags
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_int32));
 
-krb5_error_code INTERFACE krb5_auth_con_getflags
+krb5_error_code krb5_auth_con_getflags
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_auth_con_setaddrs
+krb5_error_code krb5_auth_con_setaddrs
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_address *,
                   krb5_address *));
 
-krb5_error_code INTERFACE krb5_auth_con_getaddrs
+krb5_error_code krb5_auth_con_getaddrs
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_address **,
                   krb5_address **));
 
-krb5_error_code INTERFACE krb5_auth_con_setuseruserkey
+krb5_error_code krb5_auth_con_setuseruserkey
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_keyblock *));
 
-krb5_error_code INTERFACE krb5_auth_con_getlocalsubkey
+krb5_error_code krb5_auth_con_getlocalsubkey
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_keyblock **));
 
-krb5_error_code INTERFACE krb5_auth_con_setcksumtype
+krb5_error_code krb5_auth_con_setcksumtype
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_cksumtype));
 
-krb5_error_code INTERFACE krb5_auth_con_getcksumtype
+krb5_error_code krb5_auth_con_getcksumtype
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_cksumtype *));
 
-krb5_error_code INTERFACE krb5_auth_con_getlocalseqnumber
+krb5_error_code krb5_auth_con_getlocalseqnumber
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_auth_con_getremoteseqnumber
+krb5_error_code krb5_auth_con_getremoteseqnumber
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_auth_con_setivector
+krb5_error_code krb5_auth_con_setivector
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_pointer));
 
-krb5_error_code INTERFACE krb5_auth_con_getivector
+krb5_error_code krb5_auth_con_getivector
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_pointer *));
 
-krb5_error_code INTERFACE krb5_auth_con_setrcache
+krb5_error_code krb5_auth_con_setrcache
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_rcache));
 
-krb5_error_code INTERFACE krb5_auth_con_getrcache
+krb5_error_code krb5_auth_con_getrcache
        PROTOTYPE((krb5_context,
                   krb5_auth_context *,
                   krb5_rcache *));
 
-krb5_error_code INTERFACE krb5_auth_con_getauthenticator
+krb5_error_code krb5_auth_con_getauthenticator
    PROTOTYPE((krb5_context,
          krb5_auth_context *,
          krb5_authenticator **));
 
-krb5_error_code INTERFACE krb5_auth_con_getremotesubkey
+krb5_error_code krb5_auth_con_getremotesubkey
    PROTOTYPE((krb5_context,
          krb5_auth_context *,
          krb5_keyblock **));
index a7a8b9922f381a88f9daf2a69a179c8ba249b11d..ff420164fd81954aeb230678b45f87d37c40d67a 100644 (file)
@@ -32,7 +32,7 @@ typedef struct _krb5_address {
     krb5_magic magic;
     krb5_addrtype addrtype;
     int length;
-    krb5_octet *contents;
+    krb5_octet FAR *contents;
 } krb5_address;
 
 /* per Kerberos v5 protocol spec */
@@ -50,7 +50,7 @@ typedef struct _krb5_address {
 
 /* implementation-specific stuff: */
 typedef struct _krb5_fulladdr {
-    krb5_address *address;
+    krb5_address FAR *address;
     unsigned long port;                        /* port, for some address types.
                                           large enough for most protos? */
 } krb5_fulladdr;
index 600f3cd7cc1b9c7d9ae831369f8820d6d1471ac1..e45abdfa93ea6ad29cd977f11e8949a1a7bb8f55 100644 (file)
@@ -29,7 +29,7 @@
 #define KRB5_FREE__
 
 /* to keep lint happy */
-#define krb5_xfree(val) free((char *)(val))
+#define krb5_xfree(val) free((char FAR *)(val))
 
 #define krb5_free_data(context, val) { krb5_xfree((val)->data); krb5_xfree(val);}
 
index c9e138c1419e4e7af4944331a13119ce32bdc6c0..5135f3eee3f55f6c1c9370e6c83087ff0820b0b3 100644 (file)
@@ -45,56 +45,56 @@ typedef struct krb5_keytab_entry_st {
 
 typedef struct _krb5_kt {
     krb5_magic magic;
-    struct _krb5_kt_ops *ops;
+    struct _krb5_kt_ops FAR *ops;
     krb5_pointer data;
-} *krb5_keytab;
+} FAR *krb5_keytab;
 
 
 typedef struct _krb5_kt_ops {
     krb5_magic magic;
-    char *prefix;
+    char FAR *prefix;
     /* routines always present */
-    krb5_error_code (INTERFACE *resolve) 
+    krb5_error_code (*resolve) 
        NPROTOTYPE((krb5_context,
-                   const char *,
-                   krb5_keytab *));
-    krb5_error_code (INTERFACE *get_name) 
+                   const char FAR *,
+                   krb5_keytab FAR *));
+    krb5_error_code (*get_name) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
-                   char *,
+                   char FAR *,
                    int));
-    krb5_error_code (INTERFACE *close) 
+    krb5_error_code (*close) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab));
-    krb5_error_code (INTERFACE *get) 
+    krb5_error_code (*get) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
                    krb5_principal,
                    krb5_kvno,
                    krb5_keytype,
-                   krb5_keytab_entry *));
-    krb5_error_code (INTERFACE *start_seq_get) 
+                   krb5_keytab_entry FAR *));
+    krb5_error_code (*start_seq_get) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
-                   krb5_kt_cursor *)); 
-    krb5_error_code (INTERFACE *get_next) 
+                   krb5_kt_cursor FAR *));     
+    krb5_error_code (*get_next) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
-                   krb5_keytab_entry *,
-                   krb5_kt_cursor *));
-    krb5_error_code (INTERFACE *end_get) 
+                   krb5_keytab_entry FAR *,
+                   krb5_kt_cursor FAR *));
+    krb5_error_code (*end_get) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
-                   krb5_kt_cursor *));
+                   krb5_kt_cursor FAR *));
     /* routines to be included on extended version (write routines) */
-    krb5_error_code (INTERFACE *add) 
+    krb5_error_code (*add) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
-                   krb5_keytab_entry *));
-    krb5_error_code (INTERFACE *remove) 
+                   krb5_keytab_entry FAR *));
+    krb5_error_code (*remove) 
        NPROTOTYPE((krb5_context,
                    krb5_keytab,
-                 krb5_keytab_entry *));
+                 krb5_keytab_entry FAR *));
 } krb5_kt_ops;
 
 #define krb5_kt_get_name(context, keytab, name, namelen) (*(keytab)->ops->get_name)(context, keytab,name,namelen)
index 202f6a1400bcfc57b431fd87ca4df8e2d09177be..d0f4f361aa3fbc357ad00557796160e4a5eb6aef 100644 (file)
 
 #include <stdio.h>
 
-krb5_error_code INTERFACE krb5_init_os_context
+krb5_error_code krb5_init_os_context
        PROTOTYPE((krb5_context));
-void INTERFACE krb5_free_os_context
+void krb5_free_os_context
        PROTOTYPE((krb5_context));
 
 /* libos.spec */
-krb5_error_code INTERFACE krb5_read_password
+krb5_error_code krb5_read_password
        PROTOTYPE((krb5_context,
                   char *,
                   char *,
                   char *,
                   int * ));
-krb5_error_code INTERFACE krb5_lock_file
+krb5_error_code krb5_lock_file
        PROTOTYPE((krb5_context,
                   FILE *,
                   char *,
                   int  ));
-krb5_error_code INTERFACE krb5_unlock_file
+krb5_error_code krb5_unlock_file
        PROTOTYPE((krb5_context,
                   FILE *,
                   char * ));
-int INTERFACE krb5_net_read
+int krb5_net_read
        PROTOTYPE((krb5_context,
                   int ,
                   char *,
                   int  ));
-int INTERFACE krb5_net_write
+int krb5_net_write
        PROTOTYPE((krb5_context,
                   int ,
                   const char *,
                   int  ));
-krb5_error_code INTERFACE krb5_sendto_kdc
+krb5_error_code krb5_sendto_kdc
        PROTOTYPE((krb5_context,
                   const krb5_data *,
                   const krb5_data *,
                   krb5_data * ));
-krb5_error_code INTERFACE krb5_get_krbhst
+krb5_error_code krb5_get_krbhst
        PROTOTYPE((krb5_context,
                   const krb5_data *,
                   char *** ));
-krb5_error_code INTERFACE krb5_free_krbhst
+krb5_error_code krb5_free_krbhst
        PROTOTYPE((krb5_context,
                   char * const * ));
-krb5_error_code INTERFACE krb5_aname_to_localname
+krb5_error_code krb5_aname_to_localname
        PROTOTYPE((krb5_context,
                   krb5_const_principal,
                   const int,
                   char * ));
-krb5_error_code INTERFACE krb5_get_host_realm
+krb5_error_code krb5_get_host_realm
        PROTOTYPE((krb5_context,
                   const char *,
                   char *** ));
-krb5_error_code INTERFACE krb5_free_host_realm
+krb5_error_code krb5_free_host_realm
        PROTOTYPE((krb5_context,
                   char * const * ));
-krb5_error_code INTERFACE krb5_get_realm_domain
+krb5_error_code krb5_get_realm_domain
        PROTOTYPE((krb5_context,
                   const char *,
                   char ** ));
-krb5_boolean INTERFACE krb5_kuserok
+krb5_boolean krb5_kuserok
        PROTOTYPE((krb5_context,
                   krb5_principal, const char *));
-krb5_error_code INTERFACE krb5_random_confounder
+krb5_error_code krb5_random_confounder
        PROTOTYPE((int,
                   krb5_pointer ));
-krb5_error_code INTERFACE krb5_gen_replay_name
+krb5_error_code krb5_gen_replay_name
     PROTOTYPE((krb5_context,
                   const krb5_address *,
               const char *,
               char **));
-krb5_error_code INTERFACE krb5_gen_portaddr
+krb5_error_code krb5_gen_portaddr
     PROTOTYPE((krb5_context,
                   const krb5_address *,
               krb5_const_pointer,
               krb5_address **));
-krb5_error_code INTERFACE krb5_create_secure_file
+krb5_error_code krb5_create_secure_file
        PROTOTYPE((krb5_context,
                   const char * pathname));
-krb5_error_code INTERFACE krb5_sync_disk_file
+krb5_error_code krb5_sync_disk_file
        PROTOTYPE((krb5_context,
                   FILE *fp));
 
 
-krb5_error_code INTERFACE krb5_read_message 
+krb5_error_code krb5_read_message 
        PROTOTYPE((krb5_context,
                   krb5_pointer, 
                   krb5_data *));
-krb5_error_code INTERFACE krb5_write_message 
+krb5_error_code krb5_write_message 
        PROTOTYPE((krb5_context,
                   krb5_pointer, 
                   krb5_data *));
 
-krb5_error_code INTERFACE krb5_os_init_context
+krb5_error_code krb5_os_init_context
         PROTOTYPE((krb5_context));
 
-void INTERFACE krb5_os_free_context
+void krb5_os_free_context
         PROTOTYPE((krb5_context));
 
 krb5_error_code krb5_find_config_files
index 263a25c17c5d2f2b39022591c88b8e4236410378..e4085c1943dc0e21a743eaf4eec57e7646ed5f1d 100644 (file)
@@ -28,6 +28,6 @@
 #ifndef KRB5_MACROS__
 #define KRB5_MACROS__
 
-#define krb5_princ_aref(princ, n, plen) (char *)(*plen = princ[n]->length, princ[n]->data)
+#define krb5_princ_aref(princ, n, plen) (char FAR *)(*plen = princ[n]->length, princ[n]->data)
 
 #endif /* KRB5_MACROS__ */
index 3a16ee5cca3063e2cb736829c789d09be3718fd1..a22e196b8f48eea6be0ba1ed222b17bd5b415de2 100644 (file)
 /*
  * Note: these typedefs are subject to change.... [tytso:19920903.1609EDT]
  */
-typedef krb5_error_code (INTERFACE krb5_preauth_obtain_proc)
+typedef krb5_error_code (krb5_preauth_obtain_proc)
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_pa_data *pa_data));
 
-typedef krb5_error_code (INTERFACE krb5_preauth_verify_proc)
+typedef krb5_error_code (krb5_preauth_verify_proc)
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 
@@ -67,19 +67,19 @@ krb5_error_code verify_random_padata
               krb5_data *data));
 #endif
 
-krb5_error_code INTERFACE get_unixtime_padata
+krb5_error_code get_unixtime_padata
     PROTOTYPE((krb5_context, krb5_principal client, 
               krb5_address **src_addr, krb5_pa_data *data));
 
-krb5_error_code INTERFACE verify_unixtime_padata
+krb5_error_code verify_unixtime_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 
-krb5_error_code INTERFACE get_securid_padata
+krb5_error_code get_securid_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_pa_data *data));
 
-krb5_error_code INTERFACE verify_securid_padata
+krb5_error_code verify_securid_padata
     PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
               krb5_data *data));
 
index 249514e244af2f6c68ccd2024b43630866311b11..93833f7c4a1ae5a5f2905d33d565a1ba9d0d902a 100644 (file)
 
 typedef struct krb5_rc_st {
     krb5_magic magic;
-    struct _krb5_rc_ops *ops;
+    struct _krb5_rc_ops FAR *ops;
     krb5_pointer data;
-} *krb5_rcache;
+} FAR *krb5_rcache;
 
 typedef struct _krb5_donot_replay {
     krb5_magic magic;
-    char *server;                      /* null-terminated */
-    char *client;                      /* null-terminated */
+    char FAR *server;                  /* null-terminated */
+    char FAR *client;                  /* null-terminated */
     krb5_int32 cusec;
     krb5_timestamp ctime;
 } krb5_donot_replay;
 
 typedef struct _krb5_rc_ops {
     krb5_magic magic;
-    char *type;
-    krb5_error_code (INTERFACE *init)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat)); /* create */
-    krb5_error_code (INTERFACE *recover)NPROTOTYPE((krb5_context, krb5_rcache)); /* open */
-    krb5_error_code (INTERFACE *destroy)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *close)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *store)NPROTOTYPE((krb5_context, krb5_rcache,krb5_donot_replay *));
-    krb5_error_code (INTERFACE *expunge)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *get_span)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat *));
-    char *(INTERFACE *get_name)NPROTOTYPE((krb5_context, krb5_rcache));
-    krb5_error_code (INTERFACE *resolve)NPROTOTYPE((krb5_context, krb5_rcache, char *));
+    char FAR *type;
+    krb5_error_code (*init)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat)); /* create */
+    krb5_error_code (*recover)NPROTOTYPE((krb5_context, krb5_rcache)); /* open */
+    krb5_error_code (*destroy)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*close)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*store)NPROTOTYPE((krb5_context, krb5_rcache,krb5_donot_replay FAR *));
+    krb5_error_code (*expunge)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*get_span)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat FAR *));
+    char FAR *(*get_name)NPROTOTYPE((krb5_context, krb5_rcache));
+    krb5_error_code (*resolve)NPROTOTYPE((krb5_context, krb5_rcache, char FAR *));
 } krb5_rc_ops;
 
-krb5_error_code INTERFACE krb5_rc_default 
+krb5_error_code krb5_rc_default 
        PROTOTYPE((krb5_context,
-                  krb5_rcache *));
-krb5_error_code INTERFACE krb5_rc_register_type 
+                  krb5_rcache FAR *));
+krb5_error_code krb5_rc_register_type 
        PROTOTYPE((krb5_context,
-                  krb5_rc_ops *));
-krb5_error_code INTERFACE krb5_rc_resolve_type 
+                  krb5_rc_ops FAR *));
+krb5_error_code krb5_rc_resolve_type 
        PROTOTYPE((krb5_context,
-                  krb5_rcache *,char *));
-krb5_error_code INTERFACE krb5_rc_resolve_full 
+                  krb5_rcache FAR *,char FAR *));
+krb5_error_code krb5_rc_resolve_full 
        PROTOTYPE((krb5_context,
-                  krb5_rcache *,char *));
-char * INTERFACE krb5_rc_get_type 
+                  krb5_rcache FAR *,char FAR *));
+char FAR * krb5_rc_get_type 
        PROTOTYPE((krb5_context,
                   krb5_rcache));
-char * INTERFACE krb5_rc_default_type 
+char FAR * krb5_rc_default_type 
        PROTOTYPE((krb5_context));
-char * INTERFACE krb5_rc_default_name 
+char FAR * krb5_rc_default_name 
        PROTOTYPE((krb5_context));
-krb5_error_code INTERFACE krb5_auth_to_rep 
+krb5_error_code krb5_auth_to_rep 
        PROTOTYPE((krb5_context,
-                  krb5_tkt_authent *,
-                  krb5_donot_replay *));
+                  krb5_tkt_authent FAR *,
+                  krb5_donot_replay FAR *));
 
 #define krb5_rc_initialize(context, id, span) (*(id)->ops->init)(context, id, span)
 #define krb5_rc_recover(context, id) (*(id)->ops->recover)(context, id)
index f315df1ba5c16437df06e667a6b491e89ac6f069..b962830aaff15985db875258a959d6de4ecbe511 100644 (file)
@@ -48,14 +48,14 @@ typedef struct {
   unsigned char digest[16];            /* actual digest after MD5Final call */
 } MD5_CTX;
 
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
-extern void INTERFACE MD5Init(MD5_CTX FAR *);
-extern void INTERFACE MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int);
-extern void INTERFACE MD5Final (MD5_CTX FAR *);
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
+extern void MD5Init(MD5_CTX FAR *);
+extern void MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int);
+extern void MD5Final (MD5_CTX FAR *);
 #else
-extern void INTERFACE MD5Init();
-extern void INTERFACE MD5Update ();
-extern void INTERFACE MD5Final ();
+extern void MD5Init();
+extern void MD5Update ();
+extern void MD5Final ();
 #endif
 
 #define        RSA_MD5_CKSUM_LENGTH            16
diff --git a/src/include/sys/ChangeLog b/src/include/sys/ChangeLog
new file mode 100644 (file)
index 0000000..c8ddad3
--- /dev/null
@@ -0,0 +1,3 @@
+Thu Apr 13 16:05:08 1995 Keith Vetter (keithv@fusion.com)
+
+       * syslog.h:  __STDC__ conditionals also check for the _WINDOWS define.
index 8e3a80f215bec1fa2aa3f8dcbaf5d1ca7f535469..682243e76bf2dd28cb2f704ba230068cc1e4b406 100644 (file)
@@ -90,7 +90,7 @@
 #define LOG_NOWAIT     0x10    /* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start                                
 /* XXX depending on #define of va_start in <stdarg.h> */
index dcbda9782d41bb5b82704c250ba656266b1cb244..567fc74f3ef4f16ea31cc41338fc2c436c5d6f7e 100644 (file)
@@ -90,7 +90,7 @@
 #define LOG_NOWAIT     0x10    /* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start                                
 /* XXX depending on #define of va_start in <stdarg.h> */
index 5bb0712bb96bfed85c2f44d803d3ddf7233af5fb..9e6e698ba33e1aae6f94c6dbdff930cbf9f3640e 100644 (file)
@@ -1,3 +1,9 @@
+Thu Apr 13 16:56:50 1995 Keith Vetter (keithv@fusion.com)
+
+       * Makefile.in, libkrb5.def, gssapi.def (new): 
+           Spec says we need a gssapi.dll & gssapi.lib.
+        * Makefile.in: re-inserted make-$(ALL) rule.
+
 Wed Apr 5 16:27:53 1995 Keith Vetter (keithv@fusion.com)
 
        * libkrb5.def: added krb5_us_timeofday to export list
index 656b2534fc454677111ad47ddf7c3c2a67fcddfd..55a8a86911ecc533b2bdc3334644aadfcfc5d7f2 100644 (file)
@@ -3,7 +3,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 ##DOSBUILDTOP = ..
 ##DOS!include $(BUILDTOP)\config\windows.in
 
-all:: 
+all:: all-$(WHAT)
 
 all-unix::
 
@@ -22,6 +22,7 @@ clean-mac::
 
 clean-windows::
        $(RM) libkrb5.dll libkrb5.lib libkrb5.bak libkrb5.map winsock.lib
+       $(RM) gssapi.dll gssapi.lib gssapi.bak gssapi.map
 #
 # Windows stuff to make libkrb5.dll and libkrb5.lib. Currently it
 # combines crypto, krb5 and the util/et directories.
@@ -33,29 +34,16 @@ ETLIB = $(BUILDTOP)\util\et\comerr.lib
 WLIB  = .\winsock.lib
 LIBS  = $(CLIB) $(KLIB) $(GLIB) $(ETLIB) $(WLIB)
 
-#
-# Fast: is a faster way to make things on the PC. Unfortunately it requires
-# the unix utility sed so it can't be part of the final production release.
-#
-fast: win_glue.obj winsock.lib
-       $(RM) libkrb5.lib libkrb5.dll
-       cd crypto
-       $(MAKE) -$(MFLAGS) LIBCMD=rem
-       libdir crypto.lib
-       cd ..\krb5
-       $(MAKE) -$(MFLAGS) LIBCMD=rem
-       libdir krb5.lib
-       cd ..
-       cd $(BUILDTOP)\util\et
-       $(MAKE) -$(MFLAGS)
-       cd ..\..\lib\gssapi
-       $(MAKE) -$(MFLAGS)
-       cd ..
-       link /co /seg:400 /noe /nologo win_glue, libkrb5.dll, libkrb5.map, \
-          $(LIBS) ldllcew libw, libkrb5.def
-       rc /nologo /p /k libkrb5.dll
-       implib /nologo libkrb5.lib libkrb5.dll
-               
+lib-windows: winsock.lib libkrb5.lib gssapi.lib 
+
+gssapi.lib:: gssapi.dll
+       implib /nologo gssapi.lib gssapi.dll
+
+gssapi.dll:: $(GLIB) $(LIBS) gssapi.def
+       link /co /seg:400 /noe /nol win_glue, gssapi.dll, gssapi.map, \
+          $(LIBS) ldllcew libw, gssapi.def
+       rc /nologo /p /k gssapi.dll
+
 libkrb5.lib:: libkrb5.dll
        implib /nologo libkrb5.lib libkrb5.dll
        
index 3c669e034c1a13fc8bdb01209abbb0cb02ac2fc1..a54982194b94e56655ee8c85491fc2e2f1ede85c 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Tue Mar 28 20:00:00 1995 Keith Vetter (keithv@fusion.com)
 
        * Makefile.in: more of nmake's strange behavior. Problem goes
index 24b0660f458855b154b2737434b4dac9d0002635..a0b358fa27e5f3f800ee144dc2e5b0f1e43801c8 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Thu Mar 16 21:14:15 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (crctest, crctest.exe):  Replace crctest-unix and
index cb41e17341231e5291cfba4c518d1b10682840ef..3ecdd75f72fdf1ac351522076e3707ecfdd1fa56 100644 (file)
@@ -143,11 +143,11 @@ static u_long const crc_table[256] = {
     0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
     };
 
-krb5_error_code INTERFACE
+krb5_error_code
 crc32_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 crc32_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
index 4d99e7de5716f5aaeb43a1dbe5100e87420e8d6f..8b24e7d8628ef53badcc5f1b2ed8ca34417e0b07 100644 (file)
@@ -1,3 +1,9 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+        * f_tables.h: __STDC__ condition also checks _WINDOWS
+
 Tue Mar 28 15:09:43 1995  John Gilmore  (gnu at toad.com)
 
        Bring in portability fixes from Cygnus K4 release.
index e4868b4a5df2b215695734fc0f25e7a353f4fc06..dc795f962b72aaf6eebf5cafec231d983ebdf9f6 100644 (file)
@@ -42,7 +42,7 @@
 
        returns: errors
 */
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
     krb5_pointer in;
     size_t in_length;
index 3004961ddcdf7845992763905d7568532bcb8f1a..9bf9d7c0250eab67b761a9b315a4444f915b810e 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-extern krb5_error_code INTERFACE mit_des_cbc_checksum PROTOTYPE ((
+extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((
                                                         krb5_pointer ,
                                                        size_t ,
                                                        krb5_pointer ,
index 8da43335fa61956138baaed113cb44cfb3a0514b..b19735f5630e7c5ecb2ac0eb7695ebe3b3dc866c 100644 (file)
 #include "mit-des.h"           /* From include/krb5 */
 
 /* cbc_cksum.c */
-extern krb5_error_code INTERFACE mit_des_cbc_checksum
+extern krb5_error_code mit_des_cbc_checksum
     PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * ));
 
 /* cksum.c */
-extern long INTERFACE mit_des_cbc_cksum
-    PROTOTYPE((krb5_octet *, krb5_octet *, long , mit_des_key_schedule ,
-              krb5_octet *));
+extern long mit_des_cbc_cksum
+    PROTOTYPE((krb5_octet FAR *, krb5_octet FAR *, long , mit_des_key_schedule ,
+              krb5_octet FAR *));
 /* des.c */
-extern int INTERFACE mit_des_ecb_encrypt
-    PROTOTYPE((unsigned long *, unsigned long *, mit_des_key_schedule , int ));
+extern int mit_des_ecb_encrypt
+    PROTOTYPE((unsigned long FAR *, unsigned long FAR *, mit_des_key_schedule , int ));
 
 /* f_cbc.c */
-extern int INTERFACE mit_des_cbc_encrypt
-    PROTOTYPE((const mit_des_cblock *in, mit_des_cblock *out, long length,
+extern int mit_des_cbc_encrypt
+    PROTOTYPE((const mit_des_cblock FAR *in, mit_des_cblock FAR *out, long length,
               mit_des_key_schedule schedule, mit_des_cblock ivec,
               int encrypt));
     
 /* fin_rndkey.c */
-extern krb5_error_code INTERFACE mit_des_finish_random_key
-    PROTOTYPE(( krb5_pointer *));
+extern krb5_error_code mit_des_finish_random_key
+    PROTOTYPE(( krb5_pointer FAR *));
 
 /* finish_key.c */
-extern krb5_error_code INTERFACE mit_des_finish_key
+extern krb5_error_code mit_des_finish_key
     PROTOTYPE(( krb5_encrypt_block FAR *));
 
 /* init_rkey.c */
-extern krb5_error_code INTERFACE mit_des_init_random_key
-    PROTOTYPE(( const krb5_keyblock *,  krb5_pointer *));
+extern krb5_error_code mit_des_init_random_key
+    PROTOTYPE(( const krb5_keyblock FAR *,  krb5_pointer FAR *));
 
 /* key_parity.c */
-extern void INTERFACE mit_des_fixup_key_parity PROTOTYPE((mit_des_cblock ));
-extern int INTERFACE mit_des_check_key_parity PROTOTYPE((mit_des_cblock ));
+extern void mit_des_fixup_key_parity PROTOTYPE((mit_des_cblock ));
+extern int mit_des_check_key_parity PROTOTYPE((mit_des_cblock ));
 
 /* key_sched.c */
-extern int INTERFACE mit_des_key_sched
+extern int mit_des_key_sched
     PROTOTYPE((mit_des_cblock , mit_des_key_schedule ));
 
 /* new_rnd_key.c */
-extern int INTERFACE mit_des_new_random_key
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
-extern void INTERFACE mit_des_init_random_number_generator
-    PROTOTYPE((mit_des_cblock, mit_des_random_key_seed *));
-extern void INTERFACE mit_des_set_random_generator_seed
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
-extern void INTERFACE mit_des_set_sequence_number
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
-extern void INTERFACE mit_des_generate_random_block
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
+extern int mit_des_new_random_key
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
+extern void mit_des_init_random_number_generator
+    PROTOTYPE((mit_des_cblock, mit_des_random_key_seed FAR *));
+extern void mit_des_set_random_generator_seed
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
+extern void mit_des_set_sequence_number
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
+extern void mit_des_generate_random_block
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
 
 /* process_ky.c */
-extern krb5_error_code INTERFACE mit_des_process_key
-    PROTOTYPE(( krb5_encrypt_block *,  const krb5_keyblock *));
+extern krb5_error_code mit_des_process_key
+    PROTOTYPE(( krb5_encrypt_block FAR *,  const krb5_keyblock FAR *));
 
 /* random_key.c */
-extern krb5_error_code INTERFACE mit_des_random_key
-    PROTOTYPE(( const krb5_encrypt_block *, krb5_pointer ,  krb5_keyblock **));
+extern krb5_error_code mit_des_random_key
+    PROTOTYPE(( const krb5_encrypt_block FAR *, krb5_pointer ,
+                krb5_keyblock FAR * FAR *));
 
 /* string2key.c */
-extern krb5_error_code INTERFACE mit_des_string_to_key
-    PROTOTYPE(( const krb5_encrypt_block *, const krb5_keytype,
-              krb5_keyblock *, const krb5_data *, const krb5_data *));
+extern krb5_error_code mit_des_string_to_key
+    PROTOTYPE(( const krb5_encrypt_block FAR *, const krb5_keytype,
+              krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *));
 
 /* weak_key.c */
-extern int INTERFACE mit_des_is_weak_key PROTOTYPE((mit_des_cblock ));
+extern int mit_des_is_weak_key PROTOTYPE((mit_des_cblock ));
 
 /* cmb_keys.c */
 krb5_error_code mit_des_combine_subkeys
-    PROTOTYPE((const krb5_keyblock *, const krb5_keyblock *,
-              krb5_keyblock **));
+    PROTOTYPE((const krb5_keyblock FAR *, const krb5_keyblock FAR *,
+              krb5_keyblock FAR * FAR *));
 
 /* f_pcbc.c */
-int INTERFACE mit_des_pcbc_encrypt ();
+int mit_des_pcbc_encrypt ();
 
 /* f_sched.c */
-int INTERFACE make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule));
+int make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule));
 
 
 /* misc.c */
-extern void swap_bits PROTOTYPE((char *));
+extern void swap_bits PROTOTYPE((char FAR *));
 extern unsigned long long_swap_bits PROTOTYPE((unsigned long ));
 extern unsigned long swap_six_bits_to_ansi PROTOTYPE((unsigned long ));
 extern unsigned long swap_four_bits_to_ansi PROTOTYPE((unsigned long ));
index 8b93174dbd861af1c6c920e38d49e050b3273449..0e4ffe41ddf496c2fba19a79fded6b45bf47ac8b 100644 (file)
@@ -36,7 +36,7 @@
  * cleartext.
  */
 
-int INTERFACE
+int
 mit_des_cbc_encrypt(in, out, length, schedule, ivec, encrypt)
        const des_cblock *in;
        des_cblock *out;
index 05c94c5372455f7cb6eba5ef93ec0cd87429501a..17a5db0c23d9ef337a76f234ce11e41ad1aa6af2 100644 (file)
@@ -28,7 +28,7 @@
  * multiple of eight bytes.
  */
 
-unsigned long INTERFACE
+unsigned long
 mit_des_cbc_cksum(in, out, length, schedule, ivec)
        des_cblock *in;
        des_cblock *out;
index 133ba130120cab2d29f0a605a4e8c7d46cd24ac5..f17073ebfcdaf98c88e16ecca3c633bc6e97899b 100644 (file)
@@ -16,7 +16,7 @@
 /*
  * des_ecb_encrypt - {en,de}crypt a block in ECB mode
  */
-int INTERFACE
+int
 mit_des_ecb_encrypt(in, out, schedule, encrypt)
        des_cblock *in;
        des_cblock *out;
index 4d387f19818c2305424d02cf12ea9eddc32ca3e9..7244482d75173aa4bda352706bdf28833d558489 100644 (file)
@@ -20,7 +20,7 @@
 #define pstep(x,step) (((x)&smask(step))^(((x)>>step)&smask(step)))
 #define parity_char(x) pstep(pstep(pstep((x),4),2),1)
 
-void INTERFACE
+void
 mit_des_fixup_key_parity(key)
      register des_cblock key;
 {
@@ -39,7 +39,7 @@ mit_des_fixup_key_parity(key)
  *                       See des_fix_key_parity for the definition of
  *                       correct des parity.
  */
-int INTERFACE
+int
 mit_des_check_key_parity(key)
      register des_cblock key;
 {
index efc2ce2139f68ca66c016916230e7c8db75ab5cc..8de7d1aaa14993a85b902d4a7b5e060a94fd4ed7 100644 (file)
@@ -16,7 +16,7 @@
 /*
  * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode
  */
-int INTERFACE
+int
 mit_des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
        des_cblock *in;
        des_cblock *out;
index 36a44f41f50240be6434601b7703ecef5bdd6803..7b8c36f7a081efe9441caed102400a71f9837050 100644 (file)
@@ -209,7 +209,7 @@ static const unsigned KRB_INT32 PC2_D[4][64] = {
 /*
  * Permute the key to give us our key schedule.
  */
-int INTERFACE
+int
 make_key_sched(key, schedule)
      mit_des_cblock key;
      mit_des_key_schedule schedule;
index 92ee871afe11f7a602c698306abf2f1c89684ff9..121fca3aad2eece7fd936fd0c39e1d992f4bb6f5 100644 (file)
@@ -15,7 +15,7 @@
 #define        __DES_TABLES_H__        /* nothing */
 
 #ifndef const
-#ifndef __STDC__
+#if !defined(__STDC__) && !defined(_WINDOWS)
 #define const /* nothing */
 #endif
 #endif
index 3872cdcb7c063a8a0a20534aecb0637617bbebb5..ea718b2be6ead35be81036a88325ae1108bf3fa6 100644 (file)
@@ -29,7 +29,7 @@
         free any resources held by "seed" and assigned by init_random_key()
  */
 
-krb5_error_code INTERFACE mit_des_finish_random_key (seed)
+krb5_error_code mit_des_finish_random_key (seed)
     krb5_pointer * seed;
 {
     memset((char *)*seed, 0, sizeof(mit_des_random_key_seed) );
index d18c7ba3b04dd605be29827df113eefd3c2bdcb7..0214d1f69e713cb36afe3468fc4f0327ff257076 100644 (file)
@@ -32,7 +32,7 @@
        returns: errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_finish_key (eblock)
     krb5_encrypt_block FAR * eblock;
 {
index d70cef1e846b9b798e8a3da28cded6d2a6dc621b..c240b9dce53bbf962d383756eedbd8d7b893d95e 100644 (file)
@@ -32,7 +32,7 @@
         sequence information.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_init_random_key (seedblock, seed)
     const krb5_keyblock * seedblock;
     krb5_pointer * seed;
index 58e5d6d0dd8a2f523a60ad1dedf45d3e11cd0567..dfe973dcfdc64258702bb5f7be33dd04c2ba83fd 100644 (file)
@@ -42,7 +42,7 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-int INTERFACE
+int
 mit_des_key_sched(k,schedule)
     mit_des_cblock k;
     mit_des_key_schedule schedule;
index 63f68c47291852aa5eb7892f37a6e185fa468378..ac72bb622d6d7936cec7c03771092c1aa671192b 100644 (file)
@@ -47,7 +47,7 @@
  *        to be a weak des key.  Mit_Des_generate_random_block is used to
  *        provide the random bits.
  */
-int INTERFACE
+int
 mit_des_new_random_key(key, p_seed)
     mit_des_cblock key;
     mit_des_random_key_seed    *p_seed;
@@ -75,7 +75,7 @@ mit_des_new_random_key(key, p_seed)
  * Note: this routine calls mit_des_set_random_generator_seed.
  */
 
-void INTERFACE
+void
 mit_des_init_random_number_generator(key,p_seed)
     mit_des_cblock key;
     mit_des_random_key_seed    *p_seed;
@@ -156,7 +156,7 @@ mit_des_init_random_number_generator(key,p_seed)
  * Requires: key is a valid des key.  I.e., has correct parity and is not a
  *           weak des key.
  */
-void INTERFACE
+void
 mit_des_set_random_generator_seed(key, p_seed)
     mit_des_cblock key;
     mit_des_random_key_seed    *p_seed;
@@ -179,7 +179,7 @@ mit_des_set_random_generator_seed(key, p_seed)
  *
  * Note that mit_des_set_random_generator_seed resets the sequence number to 0.
  */
-void INTERFACE
+void
 mit_des_set_sequence_number(new_sequence_number, p_seed)
     mit_des_cblock new_sequence_number;
     mit_des_random_key_seed    *p_seed;
@@ -196,7 +196,7 @@ mit_des_set_sequence_number(new_sequence_number, p_seed)
  * Requires: mit_des_set_random_generator_seed must have been called at least once
  *           before this routine is called.
  */
-void INTERFACE
+void
 mit_des_generate_random_block(block, p_seed)
     mit_des_cblock block;
     mit_des_random_key_seed    *p_seed;
index d21bd93bee6a703f0f0c81aaf62709efe46bc78c..201f0745a31fa7e011df2a9c08b7eb328a861c19 100644 (file)
@@ -38,7 +38,7 @@
         returns: errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_process_key (eblock, keyblock)
     krb5_encrypt_block * eblock;
     const krb5_keyblock * keyblock;
index 055b0fa7568bcf95a45f70ee15feda170d4c89c3..bf5f60a6d86add6ea513f772fd4f458f421b0e06 100644 (file)
@@ -29,7 +29,7 @@
         filling in the keyblock address in *keyblock
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_random_key (eblock, seed, keyblock)
     const krb5_encrypt_block * eblock;
     krb5_pointer seed;
index b9dd7115d22b0ab9156091794862064029fa4a04..7eb58affb0cddaedd97c9ff791b10f5f4ec32eef 100644 (file)
@@ -40,7 +40,7 @@
        returns: errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_string_to_key (eblock, keytype, keyblock, data, salt)
 const krb5_encrypt_block FAR * eblock;
 const krb5_keytype keytype;
@@ -61,7 +61,9 @@ const krb5_data FAR * salt;
     char k_char[64];
     mit_des_key_schedule key_sked;
 
+#ifndef min
 #define min(A, B) ((A) < (B) ? (A): (B))
+#endif
 
     if ( keytype != KEYTYPE_DES )
        return (KRB5_PROG_KEYTYPE_NOSUPP);
index 50f21354dcb3820cbb1be9cb52fe04be0ff9d7c0..bc6b20264b1ce91756271c8521f15cb0e235f879 100644 (file)
@@ -67,7 +67,7 @@ static mit_des_cblock weak[16] = {
  *
  * Requires: key has correct odd parity.
  */
-int INTERFACE
+int
 mit_des_is_weak_key(key)
      mit_des_cblock key;
 {
index 90bbe87ed9f1a22aa0d5196f39391d47e8df1fa1..b0f3f1ff4146289b7a6bfbe80b2ce3947a615c1d 100644 (file)
 #include "crc-32.h"
 #include "des_int.h"
 
-krb5_error_code INTERFACE mit_des_crc_encrypt_func
+krb5_error_code mit_des_crc_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
-krb5_error_code INTERFACE mit_des_crc_decrypt_func
+krb5_error_code mit_des_crc_decrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
@@ -58,7 +58,7 @@ krb5_cs_table_entry krb5_des_crc_cst_entry = {
     };
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_crc_encrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
@@ -123,7 +123,7 @@ mit_des_crc_encrypt_func(in, out, size, key, ivec)
     
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_crc_decrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
index 35ef6e5144e996dd3e75227c27dc22b9f8ead375..e0c80a746cfada148f73715de71c19f025475848 100644 (file)
 #include "rsa-md5.h"
 #include "des_int.h"
 
-krb5_error_code INTERFACE mit_des_md5_encrypt_func
+krb5_error_code mit_des_md5_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
-krb5_error_code INTERFACE mit_des_md5_decrypt_func
+krb5_error_code mit_des_md5_decrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
@@ -59,7 +59,7 @@ krb5_cs_table_entry krb5_des_md5_cst_entry = {
     };
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_md5_encrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
@@ -124,7 +124,7 @@ mit_des_md5_encrypt_func(in, out, size, key, ivec)
     
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_md5_decrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
index cddab1d7bf213d3ba491fc4b0b8830930386a0c2..e63e681216b5107876738eb031f9750c3bf3e74b 100644 (file)
@@ -1,3 +1,9 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+        * rsa-md4.h: __STDC__ condition also checks _WINDOWS
+
 Thu Mar 16 21:19:55 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (CFLAGS):  Tweak for Unix->MPW converter.
index 16f6a2b4bedaae6bb5ff4b197c2cba5f1202186f..a07c8611a16b66f0297f2cde8b0027ea3ae92677 100644 (file)
 #include "k5-int.h"
 #include "rsa-md4.h"
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 #define UL(x) x##UL
 #else
 #define UL(x) ((krb5_ui_4) x)
 #endif    
 
 /* forward declaration */
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 static void Transform (krb5_ui_4 FAR *, krb5_ui_4 FAR *);
 #else
 static void Transform ();
@@ -82,7 +82,7 @@ static unsigned char PADDING[64] = {
   {(a) += H ((b), (c), (d)) + (x) + UL(015666365641); \
    (a) = ROTATE_LEFT ((a), (s));}
 
-void INTERFACE
+void
 MD4Init (mdContext)
 MD4_CTX FAR *mdContext;
 {
@@ -96,7 +96,7 @@ MD4_CTX FAR *mdContext;
   mdContext->buf[3] = UL(0x10325476);
 }
 
-void INTERFACE
+void
 MD4Update (mdContext, inBuf, inLen)
 MD4_CTX FAR *mdContext;
 unsigned char FAR *inBuf;
@@ -132,7 +132,7 @@ unsigned int inLen;
   }
 }
 
-void INTERFACE
+void
 MD4Final (mdContext)
 MD4_CTX FAR *mdContext;
 {
index 38a3a4a3b41157539875c84e5a2db4c7ba72248b..58301f2bf6c77e6d8e182c177fe2c78ff90bd8f0 100644 (file)
 #include "rsa-md4.h"
 #include "des_int.h"   /* we cheat a bit and call it directly... */
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_crypto_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
index deebff54a5adf1faa402c1a2b5092927d6d08c73..3a3d2e7da3c1d3bb9cdf9e7a0bbaf3e9148a521e 100644 (file)
 #include "k5-int.h"
 #include "rsa-md4.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
index 0fdf17f15d831686bfd07a104f1ee49eceef7b0c..c03b6cb476233b48501a08e200fcdd35424603f0 100644 (file)
@@ -84,14 +84,14 @@ typedef struct {
   unsigned char digest[16];            /* actual digest after MD4Final call */
 } MD4_CTX;
 
-#ifdef __STDC__
-extern void INTERFACE MD4Init(MD4_CTX FAR *);
-extern void INTERFACE MD4Update(MD4_CTX FAR *, unsigned char FAR *, unsigned int);
-extern void INTERFACE MD4Final(MD4_CTX FAR *);
+#if defined(__STDC__) || defined(_WINDOWS)
+extern void MD4Init(MD4_CTX FAR *);
+extern void MD4Update(MD4_CTX FAR *, unsigned char FAR *, unsigned int);
+extern void MD4Final(MD4_CTX FAR *);
 #else
-void INTERFACE MD4Init ();
-void INTERFACE MD4Update ();
-void INTERFACE MD4Final ();
+void MD4Init ();
+void MD4Update ();
+void MD4Final ();
 #endif
 
 /*
index 4d791624e6cac19aa083ded03cd938bd3e3c5fb4..dd52074f849aa4a559f1e98cef0d2556d6dab4ad 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Thu Mar 16 21:23:03 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (LDFLAGS):  Remove, conflicts with pre.in.
index 885bdb4265b6f7c218db8c008793b6eb0623e022..beff1a2de5cb829167095dfdb58489eb5dd23b8f 100644 (file)
@@ -38,7 +38,7 @@
 #include "k5-int.h"
 #include "rsa-md5.h"
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 #define UL(x) x##UL
 #else
 #define UL(x) ((krb5_ui_4) x)
@@ -104,7 +104,7 @@ static unsigned char PADDING[64] = {
 /* The routine MD5Init initializes the message-digest context
    mdContext. All fields are set to zero.
  */
-void INTERFACE 
+void 
 MD5Init (mdContext)
 MD5_CTX FAR *mdContext;
 {
@@ -122,7 +122,7 @@ MD5_CTX FAR *mdContext;
    account for the presence of each of the characters inBuf[0..inLen-1]
    in the message whose digest is being computed.
  */
-void INTERFACE
+void
 MD5Update (mdContext, inBuf, inLen)
 MD5_CTX FAR *mdContext;
 unsigned char FAR *inBuf;
@@ -161,7 +161,7 @@ unsigned int inLen;
 /* The routine MD5Final terminates the message-digest computation and
    ends with the desired message digest in mdContext->digest[0...15].
  */
-void INTERFACE
+void
 MD5Final (mdContext)
 MD5_CTX FAR *mdContext;
 {
index bb2fba504015827b10d090987547ecbc722361d3..bacbb97d776bb736ea91d9e222b56f175b98fa71 100644 (file)
@@ -2,11 +2,11 @@
 #include "rsa-md5.h"
 #include "des_int.h"   /* we cheat a bit and call it directly... */
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_crypto_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
index 4514c895f76c5958f580c959df1709670170dee6..01282ffafbbb151834438fe14ef30c7d065e35e3 100644 (file)
@@ -1,11 +1,11 @@
 #include "k5-int.h"
 #include "rsa-md5.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
index c6d2bdeb34bbc2b86ab0606e88fa69be873d6181..465ec902b35c465544181fc26999162c5fce3c72 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Sat Mar 25 15:38:23 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (memmove.c): memmove.c is in krb5/posix, not krb5/os.
index 7021ec7d5190d529fccd319f123d04b23ce654f0..8db32d15630baa516f5cfaa1389c2d856251454e 100644 (file)
@@ -60,7 +60,7 @@ You need a random number generator!
 /*
  * Generate a random confounder
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_random_confounder(size, fillin)
 int size;
 krb5_pointer fillin;
index e1a956f777dfcc21ad1810ac84cee494fbab206a..8bb889abc9c67aeaa544170272f04574b632af36 100644 (file)
 #include "k5-int.h"
 #include "des_int.h"
 
-krb5_error_code INTERFACE mit_raw_des_encrypt_func
+krb5_error_code mit_raw_des_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
-krb5_error_code INTERFACE mit_raw_des_decrypt_func
+krb5_error_code mit_raw_des_decrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
@@ -55,7 +55,7 @@ krb5_cs_table_entry krb5_raw_des_cst_entry = {
     0
     };
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_raw_des_decrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
@@ -71,7 +71,7 @@ mit_raw_des_decrypt_func(in, out, size, key, ivec)
                                 MIT_DES_DECRYPT));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_raw_des_encrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
index 3782fc85021aeb2b65bca0e2d314f446319e7fb6..bb08ed3259ed2faf04f513ec071db6318f009fa9 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Wed Mar 22 11:21:38 1995 Keith Vetter (keithv@fusion.com)
 
        * read_passwd.c: changed return value to krb5_error_code
index 568e706af0b75b4c6d66713b12d084992f1e4ebc..abd48c3a2bd838841a6acd02728f408979252443 100644 (file)
@@ -52,7 +52,7 @@
  * multiple of eight bytes.
  */
 
-void INTERFACE
+void
 des_cbc_cksum(in,out,length,key,iv)
     krb5_octet  *in;           /* >= length bytes of inputtext */
     krb5_octet  *out;          /* >= length bytes of outputtext */
index 289061ae6f65bc1cf6dc0439419f427c66d0d906..b044acc41508df1fd6a14d48bc8aa2d26ce4599f 100644 (file)
@@ -51,7 +51,7 @@
 
 #include "des.h"
 
-int INTERFACE
+int
 des_ecb_encrypt(clear, cipher, schedule, encrypt)
     unsigned long *clear;
     unsigned long *cipher;
index df5f0f31d1d73ecdba1c72bba67e96339106b3cc..9ec87ddc3939e01b382d8ed69135aeadbad17f13 100644 (file)
@@ -66,22 +66,22 @@ typedef struct des_ks_struct bit_64;
 /*
  * Windows needs everything prototyped because we're exporting all the fuctions.
  */
-void INTERFACE des_cbc_cksum();
-int INTERFACE des_ecb_encrypt();
-int INTERFACE des_cbc_encrypt();
-void INTERFACE des_fixup_key_parity();
-int INTERFACE des_check_key_parity();
-int INTERFACE des_key_sched();
-int INTERFACE des_new_random_key();
-void INTERFACE des_init_random_number_generator();
-void INTERFACE des_set_random_generator_seed();
-void INTERFACE des_set_sequence_number();
-void INTERFACE des_generate_random_block();
-int INTERFACE des_pcbc_encrypt();
-unsigned long INTERFACE des_quad_cksum();
-int INTERFACE des_random_key();
-krb5_error_code INTERFACE des_read_password();
-int INTERFACE des_string_to_key();
-int INTERFACE des_is_weak_key();
+void des_cbc_cksum();
+int des_ecb_encrypt();
+int des_cbc_encrypt();
+void des_fixup_key_parity();
+int des_check_key_parity();
+int des_key_sched();
+int des_new_random_key();
+void des_init_random_number_generator();
+void des_set_random_generator_seed();
+void des_set_sequence_number();
+void des_generate_random_block();
+int des_pcbc_encrypt();
+unsigned long des_quad_cksum();
+int des_random_key();
+krb5_error_code des_read_password();
+int des_string_to_key();
+int des_is_weak_key();
 
 #endif /* DES_DEFS */
index cf6bfc8a01def88859430bd4e18b8b3818728428..f0225cbf246a585adf2807a7a889386b6177c123 100644 (file)
@@ -57,7 +57,7 @@
  * cleartext.
  */
 
-int INTERFACE
+int
 des_cbc_encrypt(in,out,length,key,iv,encrypt)
     krb5_octet   *in;          /* >= length bytes of input text */
     krb5_octet  *out;          /* >= length bytes of output text */
index 910c099d3d3535689a434e0811d3ba580c3528c3..4bb5934258db780cec43f981b0c2d3b2aee90c53 100644 (file)
@@ -39,7 +39,7 @@
  *                       8,16,...64 in des order, implies 0, 8, 16, ...
  *                       vax order.
  */
-void INTERFACE
+void
 des_fixup_key_parity(key)
      register mit_des_cblock key;
 {
@@ -51,7 +51,7 @@ des_fixup_key_parity(key)
  *                       See des_fix_key_parity for the definition of
  *                       correct des parity.
  */
-int INTERFACE
+int
 des_check_key_parity(key)
      register mit_des_cblock key;
 {
index 96c7d4984e6e56edd87199a2074d16612abe518f..d96ef6fe026c7bb822fbf3a53f61ac146bb67162 100644 (file)
@@ -48,7 +48,7 @@
 #include <stdio.h>
 #include "des.h"
 
-int INTERFACE
+int
 des_key_sched(k,schedule)
     register mit_des_cblock k; /* r11 */
     mit_des_key_schedule schedule;
index 5e4d5aa3bcbb7b676fd54c22b7bfab2cfe5b45a0..99c92db46d1aeba4fcf4af8729154f60d8cbf2f4 100644 (file)
@@ -42,7 +42,7 @@ static mit_des_random_key_seed random_sequence_state;
  *        to be a weak des key.  Des_generate_random_block is used to
  *        provide the random bits.
  */
-int INTERFACE
+int
 des_new_random_key(key)
     mit_des_cblock key;
 {
@@ -63,7 +63,7 @@ des_new_random_key(key)
  *
  * Note: this routine calls des_set_random_generator_seed.
  */
-void INTERFACE
+void
 des_init_random_number_generator(key)
      mit_des_cblock key;
 {
@@ -87,7 +87,7 @@ des_init_random_number_generator(key)
  * Requires: key is a valid des key.  I.e., has correct parity and is not a
  *           weak des key.
  */
-void INTERFACE
+void
 des_set_random_generator_seed(key)
      mit_des_cblock key;
 {
@@ -103,7 +103,7 @@ des_set_random_generator_seed(key)
  *
  * Note that des_set_random_generator_seed resets the sequence number to 0.
  */
-void INTERFACE
+void
 des_set_sequence_number(new_sequence_number)
      mit_des_cblock new_sequence_number;
 {
@@ -118,7 +118,7 @@ des_set_sequence_number(new_sequence_number)
  * Requires: des_set_random_generator_seed must have been called at least once
  *           before this routine is called.
  */
-void INTERFACE
+void
 des_generate_random_block(block)
      mit_des_cblock block;
 {
index 39744b6c96ea18c97036d314b6fcffacbc5434b8..c934926bf83d463e440fe3218e5b7c48ea1317b7 100644 (file)
@@ -71,7 +71,7 @@ typedef struct des_ks_struct bit_64;
 /*
  * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode
  */
-int INTERFACE
+int
 des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
        des_cblock *in;
        des_cblock *out;
index 4654a10376274a11fe607ec84921d87268f0170b..0e803ad75067d8e48e1da771c805eeda87e936a1 100644 (file)
@@ -106,7 +106,7 @@ extern int des_debug;
 
 /*** Routines ***************************************************** */
 
-unsigned long INTERFACE
+unsigned long
 des_quad_cksum(in,out,length,out_count,c_seed)
     mit_des_cblock *c_seed;            /* secret seed, 8 bytes */
     unsigned char *in;         /* input block */
index 945e20f40d1afc1d7e958b2110ef60f4d330ab55..9994302a9e317531e8cfb45cbc14964f37bb9d7a 100644 (file)
@@ -27,7 +27,7 @@
 #include "des.h"
 
 /* random_key */
-int INTERFACE
+int
 des_random_key(key)
     mit_des_cblock *key;
 {
index 61207c69a54d6b08e492df2277da95ca14df737a..2043b4f62ce07f51ff57fc42b9f1cd7ec5ac4464 100644 (file)
@@ -32,7 +32,7 @@
 static krb5_context krb4_global_context = 0;
 
 /*** Routines ****************************************************** */
-krb5_error_code INTERFACE
+krb5_error_code
 des_read_password/*_v4_compat_crock*/(k,prompt,verify)
     mit_des_cblock *k;
     char *prompt;
index 2222897e577be5b041546031399ef19a21218275..cfd9914d2017fa06586be06fd363178fec8a983c 100644 (file)
@@ -48,7 +48,7 @@ extern int mit_des_debug;
 /*
  * convert an arbitrary length string to a DES key
  */
-int INTERFACE
+int
 des_string_to_key(str,key)
     char *str;
     register mit_des_cblock *key;
@@ -62,7 +62,7 @@ des_string_to_key(str,key)
     register char *p_char;
     static char k_char[64];
     static mit_des_key_schedule key_sked;
-    extern void INTERFACE des_cbc_cksum();
+    extern void des_cbc_cksum();
 
     in_str = str;
     forward = 1;
index 786d135757c3d27389fe4cfc8ccb710fd046c62d..ed1110007ad94a483f9ebeb14ba5fc169a8680e9 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef _MSDOS
 #include <sys/time.h>
 
-krb5_ui_4 INTERFACE
+krb5_ui_4
 unix_time_gmt_unixsec (usecptr)
      krb5_ui_4 *usecptr;
 {
@@ -45,7 +45,7 @@ unix_time_gmt_unixsec (usecptr)
  */
 static long win_time_get_epoch(void);
 
-krb5_ui_4 INTERFACE
+krb5_ui_4
 unix_time_gmt_unixsec (usecptr)
      krb5_ui_4 *usecptr;
 {
index cab80d40077c417d7964eb766830357cab0b2d99..49f31bd141818304378478c6c2b460878cd558c5 100644 (file)
@@ -37,7 +37,7 @@
  *
  * Requires: key has correct odd parity.
  */
-int INTERFACE
+int
 des_is_weak_key(key)
      mit_des_cblock key;
 {
diff --git a/src/lib/gssapi.def b/src/lib/gssapi.def
new file mode 100644 (file)
index 0000000..3ee304d
--- /dev/null
@@ -0,0 +1,35 @@
+;----------------------------------------------------
+;   GSSAPI.DEF - GSSAPI.DLL module definition file
+;----------------------------------------------------
+
+LIBRARY                GSSAPI
+DESCRIPTION    'Base Generic Security Service API'
+EXETYPE                WINDOWS
+CODE           PRELOAD MOVEABLE DISCARDABLE
+DATA           PRELOAD MOVEABLE SINGLE
+HEAPSIZE       8192
+
+EXPORTS
+       WEP                                     @1001 RESIDENTNAME
+       LIBMAIN                                 @1002
+       GSS_ACQUIRE_CRED                        @1
+       GSS_RELEASE_CRED                        @2
+       GSS_INIT_SEC_CONTEXT                    @3
+       GSS_ACCEPT_SEC_CONTEXT                  @4
+       GSS_PROCESS_CONTEXT_TOKEN               @5
+       GSS_DELETE_SEC_CONTEXT                  @6
+       GSS_CONTEXT_TIME                        @7
+       GSS_SIGN                                @8
+       GSS_VERIFY                              @9
+       GSS_SEAL                                @10
+       GSS_UNSEAL                              @11
+       GSS_DISPLAY_STATUS                      @12
+       GSS_INDICATE_MECHS                      @13
+       GSS_COMPARE_NAME                        @14
+       GSS_DISPLAY_NAME                        @15
+       GSS_IMPORT_NAME                         @16
+       GSS_RELEASE_NAME                        @17
+       GSS_RELEASE_BUFFER                      @18
+       GSS_RELEASE_OID_SET                     @19
+       GSS_INQUIRE_CRED                        @20
+
index 5e3c5a3f382fa0c316324c49beceec87abef9d56..e28a50767588ae70bc1f5cc803f3463d84dacc79 100644 (file)
@@ -1,3 +1,9 @@
+Thu Apr 13 16:27:56 1995 Keith Vetter (keithv@fusion.com)
+
+       * gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define.
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Tue Mar 28 18:28:03 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (unixmac):  Add to build header files.
index 369c962f5b13edc3fd4bf1dd7ee07696a73ff760..79b5fbbe2eec03b3a02b5f811468ed9adcb87746 100644 (file)
@@ -40,7 +40,7 @@ static const char * const no_error = "No error";
    if status_type == GSS_C_MECH_CODE, return the output from error_message()
    */
 
-OM_uint32 INTERFACE
+OM_uint32
 g_display_com_err_status(minor_status, status_value, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
index 7dadd3e10fb222de98781cc019ca2fd197d3f51a..c6f82789dc73de34a4d81f3ced13b1bde2cbaaca 100644 (file)
@@ -202,7 +202,7 @@ static OM_uint32 display_bit(minor_status, code, status_string)
      message_context > 2  : print supplementary info bit (message_context-2)
      */
 
-OM_uint32 INTERFACE g_display_major_status(minor_status, status_value, 
+OM_uint32 g_display_major_status(minor_status, status_value, 
                                 message_context, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
index b8bf1fa1a17f46ff41f7a689889e9abe5769f2e7..61d01de0d7a49238c7d8eaf8e53c5ac79b53b385 100644 (file)
@@ -37,9 +37,9 @@
  * First, define the platform-dependent types.
  */
 typedef krb5_ui_4 OM_uint32;
-typedef void * gss_name_t;
-typedef void * gss_cred_id_t;
-typedef void * gss_ctx_id_t;
+typedef void FAR * gss_name_t;
+typedef void FAR * gss_cred_id_t;
+typedef void FAR * gss_ctx_id_t;
 
 /*
  * Note that a platform supporting the xom.h X/Open header file
@@ -49,20 +49,20 @@ typedef void * gss_ctx_id_t;
 
 typedef struct gss_OID_desc_struct {
       OM_uint32 length;
-      void      *elements;
-} gss_OID_desc, *gss_OID;
+      void      FAR *elements;
+} gss_OID_desc, FAR *gss_OID;
 
-typedef const gss_OID_desc * const const_gss_OID;
+typedef const gss_OID_desc FAR * const const_gss_OID;
 
 typedef struct gss_OID_set_desc_struct  {
       int     count;
       gss_OID elements;
-} gss_OID_set_desc, *gss_OID_set;
+} gss_OID_set_desc, FAR *gss_OID_set;
 
 typedef struct gss_buffer_desc_struct {
       size_t length;
-      void *value;
-} gss_buffer_desc, *gss_buffer_t;
+      void FAR *value;
+} gss_buffer_desc, FAR *gss_buffer_t;
 
 typedef struct gss_channel_bindings_struct {
       OM_uint32 initiator_addrtype;
@@ -70,7 +70,7 @@ typedef struct gss_channel_bindings_struct {
       OM_uint32 acceptor_addrtype;
       gss_buffer_desc acceptor_address;
       gss_buffer_desc application_data;
-} *gss_channel_bindings_t;
+} FAR *gss_channel_bindings_t;
 
 
 /*
@@ -233,174 +233,174 @@ typedef struct gss_channel_bindings_struct {
  */
 
 OM_uint32 INTERFACE gss_acquire_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_name_t,       /* desired_name */
-            OM_uint32,        /* time_req */
-            gss_OID_set,      /* desired_mechs */
-            int,              /* cred_usage */
-            gss_cred_id_t*,   /* output_cred_handle */
-            gss_OID_set*,     /* actual_mechs */
-            OM_uint32*        /* time_rec */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t,         /* desired_name */
+            OM_uint32,         /* time_req */
+            gss_OID_set,       /* desired_mechs */
+            int,               /* cred_usage */
+            gss_cred_id_t FAR *,/* output_cred_handle */
+            gss_OID_set FAR *,  /* actual_mechs */
+            OM_uint32 FAR *     /* time_rec */
            ));
 
 OM_uint32 INTERFACE gss_release_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_cred_id_t*    /* cred_handle */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_cred_id_t FAR * /* cred_handle */
            ));
 
 OM_uint32 INTERFACE gss_init_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_cred_id_t,    /* claimant_cred_handle */
-            gss_ctx_id_t*,    /* context_handle */
-            gss_name_t,       /* target_name */
-            const_gss_OID,    /* mech_type */
-            int,              /* req_flags */
-            OM_uint32,        /* time_req */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_cred_id_t,     /* claimant_cred_handle */
+            gss_ctx_id_t FAR *, /* context_handle */
+            gss_name_t,        /* target_name */
+            const_gss_OID,     /* mech_type */
+            int,               /* req_flags */
+            OM_uint32,         /* time_req */
             gss_channel_bindings_t,
-                              /* input_chan_bindings */
-            gss_buffer_t,     /* input_token */
-            gss_OID*,         /* actual_mech_type */
-            gss_buffer_t,     /* output_token */
-            int*,             /* ret_flags */
-            OM_uint32*        /* time_rec */
+                               /* input_chan_bindings */
+            gss_buffer_t,      /* input_token */
+            gss_OID FAR *,      /* actual_mech_type */
+            gss_buffer_t,      /* output_token */
+            int FAR *,          /* ret_flags */
+            OM_uint32 FAR *     /* time_rec */
            ));
 
 OM_uint32 INTERFACE gss_accept_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t*,    /* context_handle */
-            gss_cred_id_t,    /* verifier_cred_handle */
-            gss_buffer_t,     /* input_token_buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t FAR *, /* context_handle */
+            gss_cred_id_t,     /* verifier_cred_handle */
+            gss_buffer_t,      /* input_token_buffer */
             gss_channel_bindings_t,
-                              /* input_chan_bindings */
-            gss_name_t*,      /* src_name */
-            gss_OID*,         /* mech_type */
-            gss_buffer_t,     /* output_token */
-            int*,             /* ret_flags */
-            OM_uint32*,       /* time_rec */
-            gss_cred_id_t*    /* delegated_cred_handle */
+                               /* input_chan_bindings */
+            gss_name_t FAR *,   /* src_name */
+            gss_OID FAR *,      /* mech_type */
+            gss_buffer_t,      /* output_token */
+            int FAR *,          /* ret_flags */
+            OM_uint32 FAR *,    /* time_rec */
+            gss_cred_id_t FAR * /* delegated_cred_handle */
            ));
 
 OM_uint32 INTERFACE gss_process_context_token
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            gss_buffer_t      /* token_buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,      /* context_handle */
+            gss_buffer_t       /* token_buffer */
            ));
 
 OM_uint32 INTERFACE gss_delete_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t*,    /* context_handle */
-            gss_buffer_t      /* output_token */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t FAR *, /* context_handle */
+            gss_buffer_t       /* output_token */
            ));
 
 OM_uint32 INTERFACE gss_context_time
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            OM_uint32*        /* time_rec */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,      /* context_handle */
+            OM_uint32 FAR *     /* time_rec */
            ));
 
 OM_uint32 INTERFACE gss_sign
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            int,              /* qop_req */
-            gss_buffer_t,     /* message_buffer */
-            gss_buffer_t      /* message_token */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,      /* context_handle */
+            int,               /* qop_req */
+            gss_buffer_t,      /* message_buffer */
+            gss_buffer_t       /* message_token */
            ));
 
-OM_uint32 INTERFACE INTERFACE gss_verify
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            gss_buffer_t,     /* message_buffer */
-            gss_buffer_t,     /* token_buffer */
-            int*              /* qop_state */
+OM_uint32 INTERFACE gss_verify
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,      /* context_handle */
+            gss_buffer_t,      /* message_buffer */
+            gss_buffer_t,      /* token_buffer */
+            int FAR *           /* qop_state */
            ));
 
 OM_uint32 INTERFACE gss_seal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            int,              /* conf_req_flag */
-            int,              /* qop_req */
-            gss_buffer_t,     /* input_message_buffer */
-            int*,             /* conf_state */
-            gss_buffer_t      /* output_message_buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,      /* context_handle */
+            int,               /* conf_req_flag */
+            int,               /* qop_req */
+            gss_buffer_t,      /* input_message_buffer */
+            int FAR *,          /* conf_state */
+            gss_buffer_t       /* output_message_buffer */
            ));
 
 OM_uint32 INTERFACE gss_unseal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_ctx_id_t,     /* context_handle */
-            gss_buffer_t,     /* input_message_buffer */
-            gss_buffer_t,     /* output_message_buffer */
-            int*,             /* conf_state */
-            int*              /* qop_state */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_ctx_id_t,      /* context_handle */
+            gss_buffer_t,      /* input_message_buffer */
+            gss_buffer_t,      /* output_message_buffer */
+            int FAR *,          /* conf_state */
+            int FAR *           /* qop_state */
            ));
 
 OM_uint32 INTERFACE gss_display_status
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            OM_uint32,        /* status_value */
-            int,              /* status_type */
-            const_gss_OID,    /* mech_type */
-            int*,             /* message_context */
-            gss_buffer_t      /* status_string */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            OM_uint32,         /* status_value */
+            int,               /* status_type */
+            const_gss_OID,     /* mech_type */
+            int FAR *,          /* message_context */
+            gss_buffer_t       /* status_string */
            ));
 
 OM_uint32 INTERFACE gss_indicate_mechs
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_OID_set*      /* mech_set */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_OID_set FAR *   /* mech_set */
            ));
 
 OM_uint32 INTERFACE gss_compare_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_name_t,       /* name1 */
-            gss_name_t,       /* name2 */
-            int*              /* name_equal */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t,        /* name1 */
+            gss_name_t,        /* name2 */
+            int FAR *           /* name_equal */
            ));
 
 OM_uint32 INTERFACE gss_display_name
-PROTOTYPE( (OM_uint32*,      /* minor_status */
-            gss_name_t,      /* input_name */
-            gss_buffer_t,     /* output_name_buffer */
-            gss_OID*         /* output_name_type */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t,        /* input_name */
+            gss_buffer_t,      /* output_name_buffer */
+            gss_OID FAR *       /* output_name_type */
            ));
 
 OM_uint32 INTERFACE gss_import_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_buffer_t,     /* input_name_buffer */
-            const_gss_OID,    /* input_name_type */
-            gss_name_t*       /* output_name */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_buffer_t,      /* input_name_buffer */
+            const_gss_OID,     /* input_name_type */
+            gss_name_t FAR *    /* output_name */
            ));
 
 OM_uint32 INTERFACE gss_release_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_name_t*       /* input_name */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_name_t FAR *    /* input_name */
            ));
 
 OM_uint32 INTERFACE gss_release_buffer
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_buffer_t      /* buffer */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_buffer_t       /* buffer */
            ));
 
 OM_uint32 INTERFACE gss_release_oid_set
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-            gss_OID_set*      /* set */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_OID_set FAR *   /* set */
            ));
 
 OM_uint32 INTERFACE gss_inquire_cred
-PROTOTYPE( (OM_uint32 *,      /* minor_status */
-            gss_cred_id_t,    /* cred_handle */
-            gss_name_t *,     /* name */
-            OM_uint32 *,      /* lifetime */
-            int *,            /* cred_usage */
-            gss_OID_set *     /* mechanisms */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+            gss_cred_id_t,     /* cred_handle */
+            gss_name_t FAR *,   /* name */
+            OM_uint32 FAR *,    /* lifetime */
+            int FAR *,          /* cred_usage */
+            gss_OID_set FAR *   /* mechanisms */
            ));
 
 OM_uint32 INTERFACE gss_inquire_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
-           gss_ctx_id_t,     /* context_handle */
-           gss_name_t*,      /* initiator_name */
-           gss_name_t*,      /* acceptor_name */
-           OM_uint32*,       /* lifetime_rec */
-           gss_OID*,         /* mech_type */
-           int*,             /* ret_flags */
-           int*              /* locally_initiated */
+PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
+           gss_ctx_id_t,       /* context_handle */
+           gss_name_t FAR *,   /* initiator_name */
+           gss_name_t FAR *,   /* acceptor_name */
+           OM_uint32 FAR *,    /* lifetime_rec */
+           gss_OID FAR *,      /* mech_type */
+           int FAR *,          /* ret_flags */
+           int FAR *           /* locally_initiated */
           ));
 
 
index d8d86bb6a746fb0457930fcdb8a8a76f7c8001f4..49a876bf9f250ef6e6d9d7ea412576269ced4c36 100644 (file)
 
 /** helper functions **/
 
-int INTERFACE g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
-int INTERFACE g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int INTERFACE g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
+int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int INTERFACE g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
-int INTERFACE g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int INTERFACE g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
+int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int INTERFACE g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
-int INTERFACE g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int INTERFACE g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
+int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int INTERFACE g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
+int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
 
-int INTERFACE g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
+int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
 
-int INTERFACE g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
+int g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
 
-void INTERFACE g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
+void g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
                          unsigned char **buf, int tok_type));
 
-int INTERFACE g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
+int g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
                          unsigned char **buf, int tok_type, int toksize));
 
-OM_uint32 INTERFACE g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
                                 OM_uint32 status_value,
                                 int *message_context,
                                 gss_buffer_t status_string));
 
-OM_uint32 INTERFACE INTERFACE g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
                                   OM_uint32 status_value,
                                   gss_buffer_t status_string));
 
-char * INTERFACE g_canonicalize_host PROTOTYPE((char *hostname));
+char * g_canonicalize_host PROTOTYPE((char *hostname));
 
-char * INTERFACE g_strdup PROTOTYPE((char *str));
+char * g_strdup PROTOTYPE((char *str));
 
 /** declarations of internal name mechanism functions **/
 
-OM_uint32 INTERFACE generic_gss_release_buffer
+OM_uint32 generic_gss_release_buffer
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
            ));
 
-OM_uint32 INTERFACE generic_gss_release_oid_set
+OM_uint32 generic_gss_release_oid_set
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
            ));
index f8f89e3c46f008f87079656cbab6004b3f838f4e..9073840dea784e72cb8a4b99655268d43284ca48 100644 (file)
@@ -25,9 +25,9 @@
 
 #include <gssapi/gssapi.h>
 
-extern const gss_OID_desc * const gss_nt_user_name;
-extern const gss_OID_desc * const gss_nt_machine_uid_name;
-extern const gss_OID_desc * const gss_nt_string_uid_name;
-extern const gss_OID_desc * const gss_nt_service_name;
+extern const gss_OID_desc FAR * const gss_nt_user_name;
+extern const gss_OID_desc FAR * const gss_nt_machine_uid_name;
+extern const gss_OID_desc FAR * const gss_nt_string_uid_name;
+extern const gss_OID_desc FAR * const gss_nt_service_name;
 
 #endif /* _GSSAPI_GENERIC_H_ */
index 2345fc4b0dd64f33c550484487ea271aa939789b..b764a5b5f2cc75a09dc637ff43f7fa39cca0e970 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 INTERFACE generic_gss_release_buffer(minor_status, buffer)
+OM_uint32 generic_gss_release_buffer(minor_status, buffer)
      OM_uint32 *minor_status;
      gss_buffer_t buffer;
 {
index 073664a1927eab3947102f692504bb996b0d2c98..2edfe9a39a4734855265d63bfb1cfd143999e4d2 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 INTERFACE generic_gss_release_oid_set(minor_status, set)
+OM_uint32 generic_gss_release_oid_set(minor_status, set)
      OM_uint32 *minor_status;
      gss_OID_set *set;
 {
index 5fd06721c2f4a0ad30f6dcb5b6f2876a77b033dc..cf144495f85cf2db7bf4a17b227b0f17778c8ebc 100644 (file)
@@ -27,7 +27,7 @@
    make sure that buffer is consistent (release'able) when this
    function exits, no matter what the exit value */
 
-int INTERFACE g_make_string_buffer(str, buffer)
+int g_make_string_buffer(str, buffer)
      const char *str;
      gss_buffer_t buffer;
 {
index 409435f029f131e9cc30ba9b3a90fb1e79375a68..712d0ee0776a8bf3de3eadb433e09b1bca2c7a3a 100644 (file)
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <string.h>
 
-char * INTERFACE
+char *
 g_canonicalize_host(hostname)
      char *hostname;
 {
index d6ce11824a17dc344020563aa9ebe4513278fd9d..6b19092db85a1295a7afec245c631ba4125c77f2 100644 (file)
@@ -23,7 +23,7 @@
 #include "gssapiP_generic.h"
 #include <string.h>
 
-char * INTERFACE g_strdup(str)
+char * g_strdup(str)
      char *str;
 {
    char *ret;
index 8f3d434eb657efacc38ba58c2985fcab323bfd66..c415aad76fb5710ba8aad5bbbc5b9dab3f26ec2a 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-int INTERFACE
+int
 g_copy_OID_set(in, out)
      const gss_OID_set_desc * const in;
      gss_OID_set *out;
index c5067fde95d25bab41d763907938015a43fb8d6e..c3781989436b375f702eae067c0ad1d9c73863b2 100644 (file)
@@ -111,7 +111,7 @@ static int der_read_length(buf, bufsize)
 
 /* returns the length of a token, given the mech oid and the body size */
 
-int INTERFACE g_token_size(mech, body_size)
+int g_token_size(mech, body_size)
      const_gss_OID mech;
      unsigned int body_size;
 {
@@ -123,7 +123,7 @@ int INTERFACE g_token_size(mech, body_size)
 /* fills in a buffer with the token header.  The buffer is assumed to
    be the right size.  buf is advanced past the token header */
 
-void INTERFACE g_make_token_header(mech, body_size, buf, tok_type)
+void g_make_token_header(mech, body_size, buf, tok_type)
      const_gss_OID mech;
      int body_size;
      unsigned char **buf;
@@ -142,7 +142,7 @@ void INTERFACE g_make_token_header(mech, body_size, buf, tok_type)
    leaving buf advanced past the token header, and setting body_size
    to the number of remaining bytes */
 
-int INTERFACE g_verify_token_header(mech, body_size, buf, tok_type, toksize)
+int g_verify_token_header(mech, body_size, buf, tok_type, toksize)
      const_gss_OID mech;
      int *body_size;
      unsigned char **buf;
index e60ed427b0494c907625ebe686976bddd862b53b..72631341ba2f9c33e5a6e25d7e77f8a7309bc7ac 100644 (file)
@@ -105,45 +105,45 @@ static int g_delete(DB **vdb, int type, void *ptr)
 
 /* save */
 
-int INTERFACE g_save_name(void **vdb, gss_name_t *name)
+int g_save_name(void **vdb, gss_name_t *name)
 {
    return(g_save((DB **) vdb, V_NAME, (void *) name));
 }
-int INTERFACE g_save_cred_id(void **vdb, gss_cred_id_t *cred)
+int g_save_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_save((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int INTERFACE g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_save((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* validate */
 
-int INTERFACE g_validate_name(void **vdb, gss_name_t *name)
+int g_validate_name(void **vdb, gss_name_t *name)
 {
    return(g_validate((DB **) vdb, V_NAME, (void *) name));
 }
-int INTERFACE g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
+int g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_validate((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int INTERFACE g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_validate((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* delete */
 
-int INTERFACE g_delete_name(void **vdb, gss_name_t *name)
+int g_delete_name(void **vdb, gss_name_t *name)
 {
    return(g_delete((DB **) vdb, V_NAME, (void *) name));
 }
-int INTERFACE g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
+int g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_delete((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int INTERFACE g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_delete((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
index 88ad5937cd3577dafe05e39b236b558761ce7fd6..eaa83d34dd802b5aa473206989be6c5750bfbd33 100644 (file)
 
 /* save */
 
-int INTERFACE g_save_name(vdb, name)
+int g_save_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
        return 1;
 }
-int INTERFACE g_save_cred_id(vdb, cred)
+int g_save_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
        return 1;
 }
-int INTERFACE g_save_ctx_id(vdb, ctx)
+int g_save_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -54,19 +54,19 @@ int INTERFACE g_save_ctx_id(vdb, ctx)
 
 /* validate */
 
-int INTERFACE g_validate_name(vdb, name)
+int g_validate_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
        return 1;
 }
-int INTERFACE g_validate_cred_id(vdb, cred)
+int g_validate_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
        return 1;
 }
-int INTERFACE g_validate_ctx_id(vdb, ctx)
+int g_validate_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -75,19 +75,19 @@ int INTERFACE g_validate_ctx_id(vdb, ctx)
 
 /* delete */
 
-int INTERFACE g_delete_name(vdb, name)
+int g_delete_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
        return 1;
 }
-int INTERFACE g_delete_cred_id(vdb, cred)
+int g_delete_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
        return 1;
 }
-int INTERFACE g_delete_ctx_id(vdb, ctx)
+int g_delete_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
index d34555da7212cd0bd7abdc3feb019940152df4c8..870f13f75f768ef3ec5c24fa53a2cfff70080a42 100644 (file)
@@ -1,3 +1,9 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+        * gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define.
+
 Thu Mar 30 16:00:30 1995 Keith Vetter (keithv@fusion.com)
 
        * accept_sec_context.c: fixed wrong level of indirection on a 
index 3f35197e57a0a8600a9433269a283c980b90baaa..78f18390800470e8387e5163942531dde8b9fbdb 100644 (file)
@@ -24,7 +24,7 @@
 #include <krb5/rsa-md5.h>
 #include <memory.h>
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_accept_sec_context(context, minor_status, context_handle, 
                            verifier_cred_handle, input_token,
                            input_chan_bindings, src_name, mech_type,
index 419643b90cf14def01ef9d6ea068e6ea0d00df81..10563d69449629c948d0f8073337e88d56f25626 100644 (file)
@@ -237,7 +237,7 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred)
 }
    
 /*ARGSUSED*/
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_acquire_cred(context, minor_status, desired_name, time_req,
                      desired_mechs, cred_usage, output_cred_handle,
                      actual_mechs, time_rec)
index e73797a62e910c19b24655afbbd38c5d97da87e6..c18eace1ba269f475779e11ffcb2a5364064ce35 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_compare_name(context, minor_status, name1, name2, name_equal)
      krb5_context context;
      OM_uint32 *minor_status;
index 05276c305f955735417f00d3099939f165916e21..8b849ea5a8b7309a3dd80bb74ee989cf41a37ac6 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_context_time(context, minor_status, context_handle, time_rec)
      krb5_context context;
      OM_uint32 *minor_status;
index e7ccdfa332b5304e73842ba3d5735b2aa0a55e23..8127ea61e27de4665e1f38e2ecf6129cc6f4d43b 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_delete_sec_context(context, minor_status, context_handle, output_token)
      krb5_context context;
      OM_uint32 *minor_status;
index f59d7aef8a67b7ee9bb34608793812dc7444278c..3ce5ac25b3ac6e06e811384f74a58dbe65bf023a 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_display_name(context, minor_status, input_name, output_name_buffer, 
                      output_name_type)
      krb5_context context;
index e1df99803f3cd1fc14acdb06ccab2262133027e4..4e04d9b6b877294d1a0387a4b2e2e4243582ca49 100644 (file)
@@ -31,7 +31,7 @@ static int init_et = 0;
 
 /**/
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_display_status(context, minor_status, status_value, status_type,
                        mech_type, message_context, status_string)
      krb5_context context;
index 1708e564e0b33063995eac172826ceae44845f91..2e73cacfeeca44c311c7e83479a19541a0cad075 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 gss_krb5_get_tkt_flags(minor_status, context_handle, ticket_flags)
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
index ee7ec9ab538a7ca5ecdb272995bf9bc4937b87be..8d846f73ba5d5f7b9efb054bc00e552971c357d4 100644 (file)
@@ -115,38 +115,38 @@ extern krb5_context kg_context;
 
 /** helper functions **/
 
-OM_uint32 INTERFACE kg_get_defcred 
+OM_uint32 kg_get_defcred 
        PROTOTYPE((OM_uint32 *minor_status, 
                   gss_cred_id_t *cred));
 
-OM_uint32 INTERFACE kg_release_defcred PROTOTYPE((OM_uint32 *minor_status));
+OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status));
 
-krb5_error_code INTERFACE kg_checksum_channel_bindings
+krb5_error_code kg_checksum_channel_bindings
          PROTOTYPE((gss_channel_bindings_t cb,
                                             krb5_checksum *cksum,
                                             int bigend));
 
-krb5_error_code INTERFACE kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed,
+krb5_error_code kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed,
             int direction, krb5_int32 seqnum, unsigned char *cksum,
                                unsigned char *buf));
 
-krb5_error_code INTERFACE kg_make_seed PROTOTYPE((krb5_keyblock *key,
+krb5_error_code kg_make_seed PROTOTYPE((krb5_keyblock *key,
             unsigned char *seed));
 
-int INTERFACE kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed));
+int kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed));
 
-krb5_error_code INTERFACE kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed,
+krb5_error_code kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed,
             unsigned char *buf));
 
-int INTERFACE kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n));
+int kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n));
 
-krb5_error_code INTERFACE kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed,
+krb5_error_code kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed,
             krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length));
 
-krb5_error_code INTERFACE kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, 
+krb5_error_code kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, 
                           krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length));
 
-OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 kg_seal PROTOTYPE((OM_uint32 *minor_status,
                  gss_ctx_id_t context_handle,
                  int conf_req_flag,
                  int qop_req,
@@ -155,7 +155,7 @@ OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status,
                  gss_buffer_t output_message_buffer,
                  int toktype));
 
-OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 kg_unseal PROTOTYPE((OM_uint32 *minor_status,
                    gss_ctx_id_t context_handle,
                    gss_buffer_t input_token_buffer,
                    gss_buffer_t message_buffer,
@@ -165,7 +165,7 @@ OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status,
 
 /** declarations of internal name mechanism functions **/
 
-OM_uint32 INTERFACE krb5_gss_acquire_cred
+OM_uint32 krb5_gss_acquire_cred
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_name_t,       /* desired_name */
@@ -177,13 +177,13 @@ PROTOTYPE( (krb5_context,
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 INTERFACE krb5_gss_release_cred
+OM_uint32 krb5_gss_release_cred
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* cred_handle */
            ));
 
-OM_uint32 INTERFACE krb5_gss_init_sec_context
+OM_uint32 krb5_gss_init_sec_context
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_cred_id_t,    /* claimant_cred_handle */
@@ -201,7 +201,7 @@ PROTOTYPE( (krb5_context,
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 INTERFACE krb5_gss_accept_sec_context
+OM_uint32 krb5_gss_accept_sec_context
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
@@ -217,28 +217,28 @@ PROTOTYPE( (krb5_context,
             gss_cred_id_t*    /* delegated_cred_handle */
            ));
 
-OM_uint32 INTERFACE krb5_gss_process_context_token
+OM_uint32 krb5_gss_process_context_token
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t      /* token_buffer */
            ));
 
-OM_uint32 INTERFACE krb5_gss_delete_sec_context
+OM_uint32 krb5_gss_delete_sec_context
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_buffer_t      /* output_token */
            ));
 
-OM_uint32 INTERFACE krb5_gss_context_time
+OM_uint32 krb5_gss_context_time
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 INTERFACE krb5_gss_sign
+OM_uint32 krb5_gss_sign
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -247,7 +247,7 @@ PROTOTYPE( (krb5_context,
             gss_buffer_t      /* message_token */
            ));
 
-OM_uint32 INTERFACE krb5_gss_verify
+OM_uint32 krb5_gss_verify
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -256,7 +256,7 @@ PROTOTYPE( (krb5_context,
             int*              /* qop_state */
            ));
 
-OM_uint32 INTERFACE krb5_gss_seal
+OM_uint32 krb5_gss_seal
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -267,7 +267,7 @@ PROTOTYPE( (krb5_context,
             gss_buffer_t      /* output_message_buffer */
            ));
 
-OM_uint32 INTERFACE krb5_gss_unseal
+OM_uint32 krb5_gss_unseal
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -277,7 +277,7 @@ PROTOTYPE( (krb5_context,
             int*              /* qop_state */
            ));
 
-OM_uint32 INTERFACE krb5_gss_display_status
+OM_uint32 krb5_gss_display_status
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             OM_uint32,        /* status_value */
@@ -287,13 +287,13 @@ PROTOTYPE( (krb5_context,
             gss_buffer_t      /* status_string */
            ));
 
-OM_uint32 INTERFACE krb5_gss_indicate_mechs
+OM_uint32 krb5_gss_indicate_mechs
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_OID_set*      /* mech_set */
            ));
 
-OM_uint32 INTERFACE krb5_gss_compare_name
+OM_uint32 krb5_gss_compare_name
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_name_t,       /* name1 */
@@ -301,7 +301,7 @@ PROTOTYPE( (krb5_context,
             int*              /* name_equal */
            ));
 
-OM_uint32 INTERFACE krb5_gss_display_name
+OM_uint32 krb5_gss_display_name
 PROTOTYPE( (krb5_context,
            OM_uint32*,      /* minor_status */
             gss_name_t,      /* input_name */
@@ -309,7 +309,7 @@ PROTOTYPE( (krb5_context,
             gss_OID*         /* output_name_type */
            ));
 
-OM_uint32 INTERFACE krb5_gss_import_name
+OM_uint32 krb5_gss_import_name
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* input_name_buffer */
@@ -317,13 +317,13 @@ PROTOTYPE( (krb5_context,
             gss_name_t*       /* output_name */
            ));
 
-OM_uint32 INTERFACE krb5_gss_release_name
+OM_uint32 krb5_gss_release_name
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
             gss_name_t*       /* input_name */
            ));
 
-OM_uint32 INTERFACE krb5_gss_inquire_cred
+OM_uint32 krb5_gss_inquire_cred
 PROTOTYPE( (krb5_context,
            OM_uint32 *,      /* minor_status */
             gss_cred_id_t,    /* cred_handle */
@@ -333,7 +333,7 @@ PROTOTYPE( (krb5_context,
             gss_OID_set *     /* mechanisms */
            ));
 
-OM_uint32 INTERFACE krb5_gss_inquire_context
+OM_uint32 krb5_gss_inquire_context
 PROTOTYPE( (krb5_context,
            OM_uint32*,       /* minor_status */
            gss_ctx_id_t,     /* context_handle */
@@ -345,6 +345,6 @@ PROTOTYPE( (krb5_context,
            int*              /* locally_initiated */
           ));
 
-OM_uint32 INTERFACE kg_get_context();
+OM_uint32 kg_get_context();
        
 #endif /* _GSSAPIP_KRB5_H_ */
index 9b318587f5f95fbc29c797c8dd4525f559e4a81e..4b23217fa575d8a733d9a53556835c21299f462b 100644 (file)
@@ -73,7 +73,7 @@ static gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL;
 
 /* XXX what happens when the default credentials expire or are invalidated? */
 
-OM_uint32 INTERFACE
+OM_uint32
 kg_get_defcred(minor_status, cred)
      OM_uint32 *minor_status;
      gss_cred_id_t *cred;
@@ -99,7 +99,7 @@ kg_get_defcred(minor_status, cred)
    return(GSS_S_COMPLETE);
 }
 
-OM_uint32 INTERFACE
+OM_uint32
 kg_release_defcred(minor_status)
      OM_uint32 *minor_status;
 {
@@ -114,7 +114,7 @@ kg_release_defcred(minor_status)
    return(krb5_gss_release_cred(kg_context, minor_status, &defcred));
 }
 
-OM_uint32 INTERFACE
+OM_uint32
 kg_get_context()
 {
        if (kg_context)
index 1f189773f44f04764daaf6b7d731c55e59bf0704..ef84772912571c31af25f3c51d7f4f353953319d 100644 (file)
@@ -39,7 +39,7 @@ extern const gss_OID_desc * const gss_nt_krb5_principal;
 #define gss_krb5_nt_machine_uid_name   gss_nt_machine_uid_name
 #define gss_krb5_nt_string_uid_name    gss_nt_string_uid_name
 
-OM_uint32 INTERFACE gss_krb5_get_tkt_flags 
+OM_uint32 gss_krb5_get_tkt_flags 
        PROTOTYPE((OM_uint32 *minor_status,
                   gss_ctx_id_t context_handle,
                   krb5_flags *ticket_flags));
index 0510a0b8e628af8d1d47a522949b25d0dddf0637..d5dcd20f9d1bcc099a2388d5423fcad4946fec3a 100644 (file)
@@ -38,7 +38,7 @@
  * GSS_S_FAILURE       if memory allocation fails
  */
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_import_name(context, minor_status, input_name_buffer, 
                     input_name_type, output_name)
      krb5_context context;
index 11d94131bb3b98f1ecaef3bf3d0eebda1f7891fd..f100873450deab8ada3783c15ac0872df3c13481 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_indicate_mechs(context, minor_status, mech_set)
      krb5_context context;
      OM_uint32 *minor_status;
index 924d0c94db6dbd58483d851a8eaa49b030632d04..0e8bd86c43a7ac23474cd3309400412713f7c7bd 100644 (file)
@@ -147,7 +147,7 @@ make_ap_req(context, auth_context, cred, server, endtime, chan_bindings,
    return(0);
 }
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
                        context_handle, target_name, mech_type,
                        req_flags, time_req, input_chan_bindings,
@@ -175,7 +175,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
     gss_buffer_desc token;
     int i;
 /* Remove this when server is fixed and this function goes away */
-krb5_error_code INTERFACE krb5_auth_con_setkey (); 
+krb5_error_code krb5_auth_con_setkey (); 
 
    /* set up return values so they can be "freed" successfully */
 
index 927483396a4e3c9e5b7e78ba72f4d4dcd109c51c..371f3cbe7e34186306fc6fedf3c9dd6bc1262f09 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_inquire_context(context, minor_status, context_handle, initiator_name, 
                         acceptor_name, lifetime_rec, mech_type, ret_flags,
                         locally_initiated)
index fb5346281de31c1efd01f7485a2e0467d7ea96f5..d040018ae2284f4ac120b3c3df546689c904d0bf 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_inquire_cred(context, minor_status, cred_handle, name, lifetime_ret,
                      cred_usage, mechanisms)
      krb5_context context;
index 0958a8736c1de74f8981669485ab0047f2e8ad8a..acb37196e873027e489a1a485b543ca7a4eab556 100644 (file)
@@ -179,7 +179,7 @@ make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token,
 /* if signonly is true, ignore conf_req, conf_state, 
    and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */
 
-OM_uint32 INTERFACE
+OM_uint32
 kg_seal(minor_status, context_handle, conf_req_flag, qop_req, 
        input_message_buffer, conf_state, output_message_buffer, toktype)
      OM_uint32 *minor_status;
index 1e9e2580a9b0df85541355e8697883689b00a1b8..054b5eac7708b0531c7f760d888145dff27440ae 100644 (file)
@@ -28,7 +28,7 @@
    conf_state is only valid if SEAL.
    */
 
-OM_uint32 INTERFACE
+OM_uint32
 kg_unseal(minor_status, context_handle, input_token_buffer, message_buffer,
          conf_state, qop_state, toktype)
      OM_uint32 *minor_status;
index 1bea1a5f7307a168d72acc98fd7c4f757f1003fc..0de7e090ff9befbc8a0e8ac880f1ad1c385916d4 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_process_context_token(context, minor_status, context_handle, 
                               token_buffer)
      krb5_context context;
index e976d0a22e87f189516e80ea6ce3688a6fee4d3c..cb5ac0bb4b5eb65f86abd317e77bac0ce7eaa083 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE 
+OM_uint32 
 krb5_gss_release_cred(context, minor_status, cred_handle)
      krb5_context context;
      OM_uint32 *minor_status;
index 872746304e7c756154ae264dcdacaec3cf572d2f..3e41bf43ec8566c32ab3603cd182a66760b49015 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_release_name(context, minor_status, input_name)
      krb5_context context;
      OM_uint32 *minor_status;
index 645b3d63856dc77d476f0b2421ed83e750e947d0..a0e06ebdee179976820351c1f31957b7124fa19b 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_seal(context, minor_status, context_handle, conf_req_flag,
              qop_req, input_message_buffer, conf_state,
              output_message_buffer)
index 368d7f81dce8b1b19da81f71e601a7ed7167f8d8..bafc0837d2f0e4c2f3a6f37c91220a4c8fa07f86 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_sign(context, minor_status, context_handle,
              qop_req, message_buffer, 
              message_token)
index f7aa994b116dd9f7a2036e29968f083d419fca52..3449951af32a8ca1a702808e17bb4a18ab040483 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_unseal(context, minor_status, context_handle,
                input_message_buffer, output_message_buffer,
                conf_state, qop_state)
index d5c12aab2cbd2582348075fbe43ec8f60d01616c..99f8c3bef8d03ac38777dee21127da318e6ce3cf 100644 (file)
@@ -23,7 +23,7 @@
 #include "gssapiP_krb5.h"
 #include <memory.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 kg_checksum_channel_bindings(cb, cksum, bigend)
      gss_channel_bindings_t cb;
      krb5_checksum *cksum;
index a53b7c2ce996acf3ca1cef9d7ee37a5c3578ce39..89028270e3daf8f9dc5f85ebffc3d437d18b8566 100644 (file)
@@ -25,7 +25,7 @@
 
 static unsigned char zeros[8] = {0,0,0,0,0,0,0,0};
 
-int INTERFACE
+int
 kg_confounder_size(ed)
      krb5_gss_enc_desc *ed;
 {
@@ -34,7 +34,7 @@ kg_confounder_size(ed)
    return(ed->eblock.crypto_entry->block_length);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 kg_make_confounder(ed, buf)
      krb5_gss_enc_desc *ed;
      unsigned char *buf;
@@ -42,7 +42,7 @@ kg_make_confounder(ed, buf)
    return(krb5_random_confounder( ed->eblock.crypto_entry->block_length, buf));
 }
 
-int INTERFACE
+int
 kg_encrypt_size(ed, n)
      krb5_gss_enc_desc *ed;
      int n;
@@ -50,7 +50,7 @@ kg_encrypt_size(ed, n)
    return(krb5_encrypt_size(n, ed->eblock.crypto_entry));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 kg_encrypt(ed, iv, in, out, length)
      krb5_gss_enc_desc *ed;
      krb5_pointer iv;
@@ -78,7 +78,7 @@ kg_encrypt(ed, iv, in, out, length)
 
 /* length is the length of the cleartext. */
 
-krb5_error_code INTERFACE
+krb5_error_code
 kg_decrypt(ed, iv, in, out, length)
      krb5_gss_enc_desc *ed;
      krb5_pointer iv;
index 318a49b8c7dea01b8926bff1836edf6535f976cc..8792b8bd94000fa26484a5ffef87eec55db64b68 100644 (file)
@@ -25,7 +25,7 @@
 
 static unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
 
-krb5_error_code INTERFACE
+krb5_error_code
 kg_make_seed(key, seed)
      krb5_keyblock *key;
      unsigned char *seed;
index 7a9d31b5a9a265f4a85c7e70e8e28f0b4d4b2424..67bcda6db1bafc35c803b09408e089036c951702 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 kg_make_seq_num(ed, direction, seqnum, cksum, buf)
      krb5_gss_enc_desc *ed;
      int direction;
index df0316aa8557ff9cd3106ed746b8531e25d29f8d..398b1d771728297968aae169fcf7cda00c3d8834 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+OM_uint32
 krb5_gss_verify(context, minor_status, context_handle,
                message_buffer, token_buffer,
                qop_state)
index 8daaad5fc7203b487f041f85d72067163fc1bbf1..4a0494be4bf01bd266b9ece3ec1e14e7a5d046bc 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Wed Mar 22 09:39:55 1995    <tytso@rsx-11.mit.edu>
 
        * asn1_k_decode.c (setup, next_tag, apptag, get_field_body,
index c12e3a5cd3b313c5d757a1c6db35820f8856e2b9..54a14df374c64d8144af8d8dbb30438e5fb87f8b 100644 (file)
@@ -52,7 +52,7 @@ return 0
 
 time_t gmt_mktime PROTOTYPE((struct tm *));
 
-asn1_error_code INTERFACE asn1_decode_integer(buf, val)
+asn1_error_code asn1_decode_integer(buf, val)
      asn1buf * buf;
      long * val;
 {
@@ -71,7 +71,7 @@ asn1_error_code INTERFACE asn1_decode_integer(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_unsigned_integer(buf, val)
+asn1_error_code asn1_decode_unsigned_integer(buf, val)
      asn1buf * buf;
      unsigned long * val;
 {
@@ -90,7 +90,7 @@ asn1_error_code INTERFACE asn1_decode_unsigned_integer(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_octetstring(buf, retlen, val)
+asn1_error_code asn1_decode_octetstring(buf, retlen, val)
      asn1buf * buf;
      int * retlen;
      asn1_octet ** val;
@@ -103,7 +103,7 @@ asn1_error_code INTERFACE asn1_decode_octetstring(buf, retlen, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_charstring(buf, retlen, val)
+asn1_error_code asn1_decode_charstring(buf, retlen, val)
      asn1buf * buf;
      int * retlen;
      char ** val;
@@ -117,7 +117,7 @@ asn1_error_code INTERFACE asn1_decode_charstring(buf, retlen, val)
 }
 
 
-asn1_error_code INTERFACE asn1_decode_generalstring(buf, retlen, val)
+asn1_error_code asn1_decode_generalstring(buf, retlen, val)
      asn1buf * buf;
      int * retlen;
      char ** val;
@@ -131,7 +131,7 @@ asn1_error_code INTERFACE asn1_decode_generalstring(buf, retlen, val)
 }
 
 
-asn1_error_code INTERFACE asn1_decode_null(buf)
+asn1_error_code asn1_decode_null(buf)
      asn1buf * buf;
 {
   setup();
@@ -140,7 +140,7 @@ asn1_error_code INTERFACE asn1_decode_null(buf)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_printablestring(buf, retlen, val)
+asn1_error_code asn1_decode_printablestring(buf, retlen, val)
      asn1buf * buf;
      int * retlen;
      char ** val;
@@ -153,7 +153,7 @@ asn1_error_code INTERFACE asn1_decode_printablestring(buf, retlen, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_ia5string(buf, retlen, val)
+asn1_error_code asn1_decode_ia5string(buf, retlen, val)
      asn1buf * buf;
      int * retlen;
      char ** val;
@@ -166,7 +166,7 @@ asn1_error_code INTERFACE asn1_decode_ia5string(buf, retlen, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_generaltime(buf, val)
+asn1_error_code asn1_decode_generaltime(buf, val)
      asn1buf * buf;
      time_t * val;
 {
index 2d8f0749539c5ff7b0b725202a45bacd7c7777b3..39bc6badb1690c0f2541c9767509601c06e2e09e 100644 (file)
              Returns ENOMEM if memory is exhausted.
             Returns asn1 errors. */
 
-asn1_error_code INTERFACE asn1_decode_integer
+asn1_error_code asn1_decode_integer
        PROTOTYPE((asn1buf *buf, long *val));
-asn1_error_code INTERFACE asn1_decode_unsigned_integer
+asn1_error_code asn1_decode_unsigned_integer
        PROTOTYPE((asn1buf *buf, unsigned long *val));
-asn1_error_code INTERFACE asn1_decode_null
+asn1_error_code asn1_decode_null
        PROTOTYPE((asn1buf *buf));
 
-asn1_error_code INTERFACE asn1_decode_octetstring
+asn1_error_code asn1_decode_octetstring
        PROTOTYPE((asn1buf *buf, int *retlen, asn1_octet **val));
-asn1_error_code INTERFACE asn1_decode_generalstring
+asn1_error_code asn1_decode_generalstring
        PROTOTYPE((asn1buf *buf, int *retlen, char **val));
-asn1_error_code INTERFACE asn1_decode_charstring
+asn1_error_code asn1_decode_charstring
        PROTOTYPE((asn1buf *buf, int *retlen, char **val));
 /* Note: A charstring is a special hack to account for the fact that
          krb5 structures store some OCTET STRING values in krb5_octet
@@ -74,12 +74,12 @@ asn1_error_code INTERFACE asn1_decode_charstring
        PROTOTYPE((which use char arrays).
         From the ASN.1 point of view, the two string types are the same,
         only the receptacles differ. */
-asn1_error_code INTERFACE asn1_decode_printablestring
+asn1_error_code asn1_decode_printablestring
        PROTOTYPE((asn1buf *buf, int *retlen, char **val));
-asn1_error_code INTERFACE asn1_decode_ia5string
+asn1_error_code asn1_decode_ia5string
        PROTOTYPE((asn1buf *buf, int *retlen, char **val));
 
-asn1_error_code INTERFACE asn1_decode_generaltime
+asn1_error_code asn1_decode_generaltime
        PROTOTYPE((asn1buf *buf, time_t *val));
 
 #endif
index a91520b041b56c1f23bc844455e73bc877c109c7..d26d95de887fbe56aeffa5fd5281592cf36cc2f6 100644 (file)
@@ -26,7 +26,7 @@
 #include "asn1_encode.h"
 #include "asn1_make.h"
 
-asn1_error_code INTERFACE asn1_encode_integer(buf, val, retlen)
+asn1_error_code asn1_encode_integer(buf, val, retlen)
      asn1buf * buf;
      const long val;
      int * retlen;
@@ -63,7 +63,7 @@ asn1_error_code INTERFACE asn1_encode_integer(buf, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_unsigned_integer(buf, val, retlen)
+asn1_error_code asn1_encode_unsigned_integer(buf, val, retlen)
      asn1buf * buf;
      const unsigned long val;
      int * retlen;
@@ -96,7 +96,7 @@ asn1_error_code INTERFACE asn1_encode_unsigned_integer(buf, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_octetstring(buf, len, val, retlen)
+asn1_error_code asn1_encode_octetstring(buf, len, val, retlen)
      asn1buf * buf;
      const int len;
      const asn1_octet * val;
@@ -114,7 +114,7 @@ asn1_error_code INTERFACE asn1_encode_octetstring(buf, len, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_charstring(buf, len, val, retlen)
+asn1_error_code asn1_encode_charstring(buf, len, val, retlen)
      asn1buf * buf;
      const int len;
      const char * val;
@@ -132,7 +132,7 @@ asn1_error_code INTERFACE asn1_encode_charstring(buf, len, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_null(buf, retlen)
+asn1_error_code asn1_encode_null(buf, retlen)
      asn1buf * buf;
      int * retlen;
 {
@@ -147,7 +147,7 @@ asn1_error_code INTERFACE asn1_encode_null(buf, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_printablestring(buf, len, val, retlen)
+asn1_error_code asn1_encode_printablestring(buf, len, val, retlen)
      asn1buf * buf;
      const int len;
      const char * val;
@@ -165,7 +165,7 @@ asn1_error_code INTERFACE asn1_encode_printablestring(buf, len, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_ia5string(buf, len, val, retlen)
+asn1_error_code asn1_encode_ia5string(buf, len, val, retlen)
      asn1buf * buf;
      const int len;
      const char * val;
@@ -183,7 +183,7 @@ asn1_error_code INTERFACE asn1_encode_ia5string(buf, len, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_generaltime(buf, val, retlen)
+asn1_error_code asn1_encode_generaltime(buf, val, retlen)
      asn1buf * buf;
      const time_t val;
      int * retlen;
@@ -210,7 +210,7 @@ asn1_error_code INTERFACE asn1_encode_generaltime(buf, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_generalstring(buf, len, val, retlen)
+asn1_error_code asn1_encode_generalstring(buf, len, val, retlen)
      asn1buf * buf;
      const int len;
      const char * val;
index f5d8036554c87f91e0d5e954c61d4c398dcb1da5..c8995b54904d41bdb1112cef83f9bc7275b0dbac 100644 (file)
@@ -46,7 +46,7 @@
      asn1_encode_generalstring
 */
 
-asn1_error_code INTERFACE asn1_encode_integer
+asn1_error_code asn1_encode_integer
        PROTOTYPE((asn1buf *buf, const long val, int *retlen));
 /* requires  *buf is allocated
    modifies  *buf, *retlen
@@ -55,7 +55,7 @@ asn1_error_code INTERFACE asn1_encode_integer
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_unsigned_integer
+asn1_error_code asn1_encode_unsigned_integer
        PROTOTYPE((asn1buf *buf, const unsigned long val, int *retlen));
 /* requires  *buf is allocated
    modifies  *buf, *retlen
@@ -64,7 +64,7 @@ asn1_error_code INTERFACE asn1_encode_unsigned_integer
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_octetstring
+asn1_error_code asn1_encode_octetstring
        PROTOTYPE((asn1buf *buf,
                   const int len, const asn1_octet *val,
                   int *retlen));
@@ -75,7 +75,7 @@ asn1_error_code INTERFACE asn1_encode_octetstring
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_charstring
+asn1_error_code asn1_encode_charstring
        PROTOTYPE((asn1buf *buf,
                   const int len, const char *val,
                   int *retlen));
@@ -86,7 +86,7 @@ asn1_error_code INTERFACE asn1_encode_charstring
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_null
+asn1_error_code asn1_encode_null
        PROTOTYPE((asn1buf *buf, int *retlen));
 /* requires  *buf is allocated
    modifies  *buf, *retlen
@@ -95,7 +95,7 @@ asn1_error_code INTERFACE asn1_encode_null
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_printablestring
+asn1_error_code asn1_encode_printablestring
        PROTOTYPE((asn1buf *buf,
                   const int len, const char *val,
                   int *retlen));
@@ -106,7 +106,7 @@ asn1_error_code INTERFACE asn1_encode_printablestring
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_ia5string
+asn1_error_code asn1_encode_ia5string
        PROTOTYPE((asn1buf *buf,
                   const int len, const char *val,
                   int *retlen));
@@ -117,7 +117,7 @@ asn1_error_code INTERFACE asn1_encode_ia5string
              Returns ENOMEM to signal an unsuccesful attempt
               to expand the buffer. */
 
-asn1_error_code INTERFACE asn1_encode_generaltime
+asn1_error_code asn1_encode_generaltime
        PROTOTYPE((asn1buf *buf, const time_t val, int *retlen));
 /* requires  *buf is allocated
    modifies  *buf, *retlen
@@ -127,7 +127,7 @@ asn1_error_code INTERFACE asn1_encode_generaltime
               to expand the buffer.
    Note: The encoding of GeneralizedTime is YYYYMMDDhhmmZ */
 
-asn1_error_code INTERFACE asn1_encode_generalstring
+asn1_error_code asn1_encode_generalstring
        PROTOTYPE((asn1buf *buf,
                   const int len, const char *val,
                   int *retlen));
index 3a7e33d756fd2baa7fc4a72c35562f2f6db07121..602a25e8c3e76dde4b51c5ea42b3c94c4bc2cb0c 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "asn1_get.h"
 
-asn1_error_code INTERFACE asn1_get_tag(buf, class, construction, tagnum, retlen)
+asn1_error_code asn1_get_tag(buf, class, construction, tagnum, retlen)
      asn1buf * buf;
      asn1_class * class;
      asn1_construction * construction;
@@ -44,7 +44,7 @@ asn1_error_code INTERFACE asn1_get_tag(buf, class, construction, tagnum, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_get_sequence(buf, retlen)
+asn1_error_code asn1_get_sequence(buf, retlen)
      asn1buf * buf;
      int * retlen;
 {
@@ -64,7 +64,7 @@ asn1_error_code INTERFACE asn1_get_sequence(buf, retlen)
 /****************************************************************/
 /* Private Procedures */
 
-asn1_error_code INTERFACE asn1_get_id(buf, class, construction, tagnum)
+asn1_error_code asn1_get_id(buf, class, construction, tagnum)
      asn1buf * buf;
      asn1_class * class;
      asn1_construction * construction;
@@ -100,7 +100,7 @@ asn1_error_code INTERFACE asn1_get_id(buf, class, construction, tagnum)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_get_length(buf, retlen)
+asn1_error_code asn1_get_length(buf, retlen)
      asn1buf * buf;
      int * retlen;
 {
index ac7103d6ea573b83034210fd36b17e3d52b505cd..67bc7195224da0961ca2b7df58a47d3ebe1d4cc6 100644 (file)
@@ -30,7 +30,7 @@
 #include "krbasn1.h"
 #include "asn1buf.h"
 
-asn1_error_code INTERFACE asn1_get_tag
+asn1_error_code asn1_get_tag
        PROTOTYPE((asn1buf *buf,
                   asn1_class *class,
                   asn1_construction *construction,
@@ -45,7 +45,7 @@ asn1_error_code INTERFACE asn1_get_tag
              *tagnum is set to ASN1_TAGNUM_CEILING.
             Returns ASN1_OVERRUN if *buf is exhausted during the parse. */
 
-asn1_error_code INTERFACE asn1_get_sequence
+asn1_error_code asn1_get_sequence
        PROTOTYPE((asn1buf *buf, int *retlen));
 /* requires  *buf is allocated
    effects   Decodes a tag from *buf and returns ASN1_BAD_ID if it
@@ -55,7 +55,7 @@ asn1_error_code INTERFACE asn1_get_sequence
 /****************************************************************/
 /* Private Procedures */
 
-asn1_error_code INTERFACE asn1_get_id
+asn1_error_code asn1_get_id
        PROTOTYPE((asn1buf *buf,
                   asn1_class *class,
                   asn1_construction *construction,
@@ -67,7 +67,7 @@ asn1_error_code INTERFACE asn1_get_id
               are returned in *construction and *tagnum, respectively.
             Returns ASN1_OVERRUN if *buf is exhausted. */
 
-asn1_error_code INTERFACE asn1_get_length
+asn1_error_code asn1_get_length
        PROTOTYPE((asn1buf *buf, int *retlen));
 /* requires  *buf is allocated
    effects   Decodes the group of length octets at *buf's
index 0d2566e2d8c38cdaf0f88db4ba914abb8c7df3b0..2d5703e646fb73b12e439bcfed506be49280457c 100644 (file)
@@ -112,7 +112,7 @@ return 0
 
 
 /* scalars */
-asn1_error_code INTERFACE asn1_decode_kerberos_time(buf, val)
+asn1_error_code asn1_decode_kerberos_time(buf, val)
      asn1buf * buf;
      krb5_timestamp * val;
 {
@@ -128,7 +128,7 @@ asn1_error_code INTERFACE asn1_decode_kerberos_time(buf, val)
 }
 
 #define integer_convert(fname,ktype)\
-asn1_error_code INTERFACE fname(buf, val)\
+asn1_error_code fname(buf, val)\
      asn1buf * buf;\
      ktype * val;\
 {\
@@ -140,7 +140,7 @@ asn1_error_code INTERFACE fname(buf, val)\
   return 0;\
 }
 #define unsigned_integer_convert(fname,ktype)\
-asn1_error_code INTERFACE fname(buf, val)\
+asn1_error_code fname(buf, val)\
      asn1buf * buf;\
      ktype * val;\
 {\
@@ -163,7 +163,7 @@ integer_convert(asn1_decode_authdatatype,krb5_authdatatype)
 unsigned_integer_convert(asn1_decode_ui_2,krb5_ui_2)
 unsigned_integer_convert(asn1_decode_ui_4,krb5_ui_4)
 
-asn1_error_code INTERFACE asn1_decode_msgtype(buf, val)
+asn1_error_code asn1_decode_msgtype(buf, val)
      asn1buf * buf;
      krb5_msgtype * val;
 {
@@ -179,7 +179,7 @@ asn1_error_code INTERFACE asn1_decode_msgtype(buf, val)
 
 
 /* structures */
-asn1_error_code INTERFACE asn1_decode_realm(buf, val)
+asn1_error_code asn1_decode_realm(buf, val)
      asn1buf * buf;
      krb5_principal * val;
 {
@@ -188,7 +188,7 @@ asn1_error_code INTERFACE asn1_decode_realm(buf, val)
                                   &((*val)->realm.data));
 }
 
-asn1_error_code INTERFACE asn1_decode_principal_name(buf, val)
+asn1_error_code asn1_decode_principal_name(buf, val)
      asn1buf * buf;
      krb5_principal * val;
 {
@@ -219,7 +219,7 @@ asn1_error_code INTERFACE asn1_decode_principal_name(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_checksum(buf, val)
+asn1_error_code asn1_decode_checksum(buf, val)
      asn1buf * buf;
      krb5_checksum * val;
 {
@@ -233,7 +233,7 @@ asn1_error_code INTERFACE asn1_decode_checksum(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_encryption_key(buf, val)
+asn1_error_code asn1_decode_encryption_key(buf, val)
      asn1buf * buf;
      krb5_keyblock * val;
 {
@@ -248,7 +248,7 @@ asn1_error_code INTERFACE asn1_decode_encryption_key(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_encrypted_data(buf, val)
+asn1_error_code asn1_decode_encrypted_data(buf, val)
      asn1buf * buf;
      krb5_enc_data * val;
 {
@@ -263,7 +263,7 @@ asn1_error_code INTERFACE asn1_decode_encrypted_data(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_krb5_flags(buf, val)
+asn1_error_code asn1_decode_krb5_flags(buf, val)
      asn1buf * buf;
      krb5_flags * val;
 {
@@ -291,22 +291,22 @@ asn1_error_code INTERFACE asn1_decode_krb5_flags(buf, val)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_decode_ticket_flags(buf, val)
+asn1_error_code asn1_decode_ticket_flags(buf, val)
      asn1buf * buf;
      krb5_flags * val;
 { return asn1_decode_krb5_flags(buf,val); }
 
-asn1_error_code INTERFACE asn1_decode_ap_options(buf, val)
+asn1_error_code asn1_decode_ap_options(buf, val)
      asn1buf * buf;
      krb5_flags * val;
 { return asn1_decode_krb5_flags(buf,val); }
 
-asn1_error_code INTERFACE asn1_decode_kdc_options(buf, val)
+asn1_error_code asn1_decode_kdc_options(buf, val)
      asn1buf * buf;
      krb5_flags * val;
 { return asn1_decode_krb5_flags(buf,val); }
 
-asn1_error_code INTERFACE asn1_decode_transited_encoding(buf, val)
+asn1_error_code asn1_decode_transited_encoding(buf, val)
      asn1buf * buf;
      krb5_transited * val;
 {
@@ -320,7 +320,7 @@ asn1_error_code INTERFACE asn1_decode_transited_encoding(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part(buf, val)
+asn1_error_code asn1_decode_enc_kdc_rep_part(buf, val)
      asn1buf * buf;
      krb5_enc_kdc_rep_part * val;
 {
@@ -346,7 +346,7 @@ asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_ticket(buf, val)
+asn1_error_code asn1_decode_ticket(buf, val)
      asn1buf * buf;
      krb5_ticket * val;
 {
@@ -370,7 +370,7 @@ asn1_error_code INTERFACE asn1_decode_ticket(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_kdc_req(buf, val)
+asn1_error_code asn1_decode_kdc_req(buf, val)
      asn1buf * buf;
      krb5_kdc_req * val;
 {
@@ -388,7 +388,7 @@ asn1_error_code INTERFACE asn1_decode_kdc_req(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_kdc_req_body(buf, val)
+asn1_error_code asn1_decode_kdc_req_body(buf, val)
      asn1buf * buf;
      krb5_kdc_req * val;
 {
@@ -425,7 +425,7 @@ asn1_error_code INTERFACE asn1_decode_kdc_req_body(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_krb_safe_body(buf, val)
+asn1_error_code asn1_decode_krb_safe_body(buf, val)
      asn1buf * buf;
      krb5_safe * val;
 {
@@ -447,7 +447,7 @@ asn1_error_code INTERFACE asn1_decode_krb_safe_body(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_host_address(buf, val)
+asn1_error_code asn1_decode_host_address(buf, val)
      asn1buf * buf;
      krb5_address * val;
 {
@@ -461,7 +461,7 @@ asn1_error_code INTERFACE asn1_decode_host_address(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_kdc_rep(buf, val)
+asn1_error_code asn1_decode_kdc_rep(buf, val)
      asn1buf * buf;
      krb5_kdc_rep * val;
 {
@@ -516,14 +516,14 @@ if(*(array) == NULL) return ENOMEM;\
   cleanup()
 
 
-asn1_error_code INTERFACE asn1_decode_authorization_data(buf, val)
+asn1_error_code asn1_decode_authorization_data(buf, val)
      asn1buf * buf;
      krb5_authdata *** val;
 {
   decode_array_body(krb5_authdata,asn1_decode_authdata_elt);
 }
 
-asn1_error_code INTERFACE asn1_decode_authdata_elt(buf, val)
+asn1_error_code asn1_decode_authdata_elt(buf, val)
      asn1buf * buf;
      krb5_authdata * val;
 {
@@ -537,28 +537,28 @@ asn1_error_code INTERFACE asn1_decode_authdata_elt(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_host_addresses(buf, val)
+asn1_error_code asn1_decode_host_addresses(buf, val)
      asn1buf * buf;
      krb5_address *** val;
 {
   decode_array_body(krb5_address,asn1_decode_host_address);
 }
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_ticket(buf, val)
+asn1_error_code asn1_decode_sequence_of_ticket(buf, val)
      asn1buf * buf;
      krb5_ticket *** val;
 {
   decode_array_body(krb5_ticket,asn1_decode_ticket);
 }
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_krb_cred_info(buf, val)
+asn1_error_code asn1_decode_sequence_of_krb_cred_info(buf, val)
      asn1buf * buf;
      krb5_cred_info *** val;
 {
   decode_array_body(krb5_cred_info,asn1_decode_krb_cred_info);
 }
 
-asn1_error_code INTERFACE asn1_decode_krb_cred_info(buf, val)
+asn1_error_code asn1_decode_krb_cred_info(buf, val)
      asn1buf * buf;
      krb5_cred_info * val;
 {
@@ -586,14 +586,14 @@ asn1_error_code INTERFACE asn1_decode_krb_cred_info(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_pa_data(buf, val)
+asn1_error_code asn1_decode_sequence_of_pa_data(buf, val)
      asn1buf * buf;
      krb5_pa_data *** val;
 {
   decode_array_body(krb5_pa_data,asn1_decode_pa_data);
 }
 
-asn1_error_code INTERFACE asn1_decode_pa_data(buf, val)
+asn1_error_code asn1_decode_pa_data(buf, val)
      asn1buf * buf;
      krb5_pa_data * val;
 {
@@ -607,14 +607,14 @@ asn1_error_code INTERFACE asn1_decode_pa_data(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_last_req(buf, val)
+asn1_error_code asn1_decode_last_req(buf, val)
      asn1buf * buf;
      krb5_last_req_entry *** val;
 {
   decode_array_body(krb5_last_req_entry,asn1_decode_last_req_entry);
 }
 
-asn1_error_code INTERFACE asn1_decode_last_req_entry(buf, val)
+asn1_error_code asn1_decode_last_req_entry(buf, val)
      asn1buf * buf;
      krb5_last_req_entry * val;
 {
@@ -628,7 +628,7 @@ asn1_error_code INTERFACE asn1_decode_last_req_entry(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_enctype(buf, num, val)
+asn1_error_code asn1_decode_sequence_of_enctype(buf, num, val)
      asn1buf * buf;
      int * num;
      krb5_enctype ** val;
@@ -651,7 +651,7 @@ asn1_error_code INTERFACE asn1_decode_sequence_of_enctype(buf, num, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_passwdsequence(buf, val)
+asn1_error_code asn1_decode_passwdsequence(buf, val)
      asn1buf * buf;
      passwd_phrase_element * val;
 {
@@ -668,7 +668,7 @@ asn1_error_code INTERFACE asn1_decode_passwdsequence(buf, val)
   cleanup();
 }
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_passwdsequence(buf, val)
+asn1_error_code asn1_decode_sequence_of_passwdsequence(buf, val)
      asn1buf * buf;
      passwd_phrase_element *** val;
 {
index b2ccd20ccc5b5a24b9f75b5a68e79d5efe5d848f..f58f1845fcb35224e1d889c0d3ccce556c9e6f4c 100644 (file)
              the bounds of *buf */
 
 /* scalars */
-asn1_error_code INTERFACE asn1_decode_int
+asn1_error_code asn1_decode_int
        PROTOTYPE((asn1buf *buf, int *val));
-asn1_error_code INTERFACE asn1_decode_int32
+asn1_error_code asn1_decode_int32
        PROTOTYPE((asn1buf *buf, krb5_int32 *val));
-asn1_error_code INTERFACE asn1_decode_kvno
+asn1_error_code asn1_decode_kvno
        PROTOTYPE((asn1buf *buf, krb5_kvno *val));
-asn1_error_code INTERFACE asn1_decode_keytype
+asn1_error_code asn1_decode_keytype
        PROTOTYPE((asn1buf *buf, krb5_keytype *val));
-asn1_error_code INTERFACE asn1_decode_msgtype
+asn1_error_code asn1_decode_msgtype
        PROTOTYPE((asn1buf *buf, krb5_msgtype *val));
-asn1_error_code INTERFACE asn1_decode_cksumtype
+asn1_error_code asn1_decode_cksumtype
        PROTOTYPE((asn1buf *buf, krb5_cksumtype *val));
-asn1_error_code INTERFACE asn1_decode_enctype
+asn1_error_code asn1_decode_enctype
        PROTOTYPE((asn1buf *buf, krb5_enctype *val));
-asn1_error_code INTERFACE asn1_decode_octet
+asn1_error_code asn1_decode_octet
        PROTOTYPE((asn1buf *buf, krb5_octet *val));
-asn1_error_code INTERFACE asn1_decode_addrtype
+asn1_error_code asn1_decode_addrtype
        PROTOTYPE((asn1buf *buf, krb5_addrtype *val));
-asn1_error_code INTERFACE asn1_decode_authdatatype
+asn1_error_code asn1_decode_authdatatype
        PROTOTYPE((asn1buf *buf, krb5_authdatatype *val));
-asn1_error_code INTERFACE asn1_decode_ui_2
+asn1_error_code asn1_decode_ui_2
        PROTOTYPE((asn1buf *buf, krb5_ui_2 *val));
-asn1_error_code INTERFACE asn1_decode_ui_4
+asn1_error_code asn1_decode_ui_4
        PROTOTYPE((asn1buf *buf, krb5_ui_4 *val));
-asn1_error_code INTERFACE asn1_decode_kerberos_time
+asn1_error_code asn1_decode_kerberos_time
        PROTOTYPE((asn1buf *buf, krb5_timestamp *val));
 
 /* structures */
-asn1_error_code INTERFACE asn1_decode_realm
+asn1_error_code asn1_decode_realm
        PROTOTYPE((asn1buf *buf, krb5_principal *val));
-asn1_error_code INTERFACE asn1_decode_principal_name
+asn1_error_code asn1_decode_principal_name
        PROTOTYPE((asn1buf *buf, krb5_principal *val));
-asn1_error_code INTERFACE asn1_decode_checksum
+asn1_error_code asn1_decode_checksum
        PROTOTYPE((asn1buf *buf, krb5_checksum *val));
-asn1_error_code INTERFACE asn1_decode_encryption_key
+asn1_error_code asn1_decode_encryption_key
        PROTOTYPE((asn1buf *buf, krb5_keyblock *val));
-asn1_error_code INTERFACE asn1_decode_encrypted_data
+asn1_error_code asn1_decode_encrypted_data
        PROTOTYPE((asn1buf *buf, krb5_enc_data *val));
-asn1_error_code INTERFACE asn1_decode_ticket_flags
+asn1_error_code asn1_decode_ticket_flags
        PROTOTYPE((asn1buf *buf, krb5_flags *val));
-asn1_error_code INTERFACE asn1_decode_transited_encoding
+asn1_error_code asn1_decode_transited_encoding
        PROTOTYPE((asn1buf *buf, krb5_transited *val));
-asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part
+asn1_error_code asn1_decode_enc_kdc_rep_part
        PROTOTYPE((asn1buf *buf, krb5_enc_kdc_rep_part *val));
-asn1_error_code INTERFACE asn1_decode_krb5_flags
+asn1_error_code asn1_decode_krb5_flags
        PROTOTYPE((asn1buf *buf, krb5_flags *val));
-asn1_error_code INTERFACE asn1_decode_ap_options
+asn1_error_code asn1_decode_ap_options
        PROTOTYPE((asn1buf *buf, krb5_flags *val));
-asn1_error_code INTERFACE asn1_decode_kdc_options
+asn1_error_code asn1_decode_kdc_options
        PROTOTYPE((asn1buf *buf, krb5_flags *val));
-asn1_error_code INTERFACE asn1_decode_ticket
+asn1_error_code asn1_decode_ticket
        PROTOTYPE((asn1buf *buf, krb5_ticket *val));
-asn1_error_code INTERFACE asn1_decode_kdc_req
+asn1_error_code asn1_decode_kdc_req
        PROTOTYPE((asn1buf *buf, krb5_kdc_req *val));
-asn1_error_code INTERFACE asn1_decode_kdc_req_body
+asn1_error_code asn1_decode_kdc_req_body
        PROTOTYPE((asn1buf *buf, krb5_kdc_req *val));
-asn1_error_code INTERFACE asn1_decode_krb_safe_body
+asn1_error_code asn1_decode_krb_safe_body
        PROTOTYPE((asn1buf *buf, krb5_safe *val));
-asn1_error_code INTERFACE asn1_decode_host_address
+asn1_error_code asn1_decode_host_address
        PROTOTYPE((asn1buf *buf, krb5_address *val));
-asn1_error_code INTERFACE asn1_decode_kdc_rep
+asn1_error_code asn1_decode_kdc_rep
        PROTOTYPE((asn1buf *buf, krb5_kdc_rep *val));
-asn1_error_code INTERFACE asn1_decode_last_req_entry
+asn1_error_code asn1_decode_last_req_entry
        PROTOTYPE((asn1buf *buf, krb5_last_req_entry *val));
-asn1_error_code INTERFACE asn1_decode_authdata_elt
+asn1_error_code asn1_decode_authdata_elt
        PROTOTYPE((asn1buf *buf, krb5_authdata *val));
-asn1_error_code INTERFACE asn1_decode_krb_cred_info
+asn1_error_code asn1_decode_krb_cred_info
        PROTOTYPE((asn1buf *buf, krb5_cred_info *val));
-asn1_error_code INTERFACE asn1_decode_pa_data
+asn1_error_code asn1_decode_pa_data
        PROTOTYPE((asn1buf *buf, krb5_pa_data *val));
 
-asn1_error_code INTERFACE asn1_decode_passwdsequence
+asn1_error_code asn1_decode_passwdsequence
        PROTOTYPE((asn1buf *buf, passwd_phrase_element *val));
 
 /* arrays */
-asn1_error_code INTERFACE asn1_decode_authorization_data
+asn1_error_code asn1_decode_authorization_data
        PROTOTYPE((asn1buf *buf, krb5_authdata ***val));
-asn1_error_code INTERFACE asn1_decode_host_addresses
+asn1_error_code asn1_decode_host_addresses
        PROTOTYPE((asn1buf *buf, krb5_address ***val));
-asn1_error_code INTERFACE asn1_decode_sequence_of_ticket
+asn1_error_code asn1_decode_sequence_of_ticket
        PROTOTYPE((asn1buf *buf, krb5_ticket ***val));
-asn1_error_code INTERFACE asn1_decode_sequence_of_krb_cred_info
+asn1_error_code asn1_decode_sequence_of_krb_cred_info
        PROTOTYPE((asn1buf *buf, krb5_cred_info ***val));
-asn1_error_code INTERFACE asn1_decode_sequence_of_pa_data
+asn1_error_code asn1_decode_sequence_of_pa_data
        PROTOTYPE((asn1buf *buf, krb5_pa_data ***val));
-asn1_error_code INTERFACE asn1_decode_last_req
+asn1_error_code asn1_decode_last_req
        PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val));
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_enctype
+asn1_error_code asn1_decode_sequence_of_enctype
        PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val));
 
-asn1_error_code INTERFACE asn1_decode_sequence_of_passwdsequence
+asn1_error_code asn1_decode_sequence_of_passwdsequence
        PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val));
 
 
index 77858f62555a37331f3771ed34312fc0a663260a..731083a99125466afd2992a71ea95937a27fa0c8 100644 (file)
   *retlen = sum;\
   return 0
 
-asn1_error_code INTERFACE asn1_encode_ui_4(buf, val, retlen)
+asn1_error_code asn1_encode_ui_4(buf, val, retlen)
      asn1buf * buf;
      const krb5_ui_4 val;
      int *retlen;
@@ -129,7 +129,7 @@ asn1_error_code INTERFACE asn1_encode_ui_4(buf, val, retlen)
 }
 
 
-asn1_error_code INTERFACE asn1_encode_realm(buf, val, retlen)
+asn1_error_code asn1_encode_realm(buf, val, retlen)
      asn1buf * buf;
      const krb5_principal val;
      int * retlen;
@@ -139,7 +139,7 @@ asn1_error_code INTERFACE asn1_encode_realm(buf, val, retlen)
                                   retlen);
 }
 
-asn1_error_code INTERFACE asn1_encode_principal_name(buf, val, retlen)
+asn1_error_code asn1_encode_principal_name(buf, val, retlen)
      asn1buf * buf;
      const krb5_principal val;
      int * retlen;
@@ -170,7 +170,7 @@ asn1_error_code INTERFACE asn1_encode_principal_name(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_kerberos_time(buf, val, retlen)
+asn1_error_code asn1_encode_kerberos_time(buf, val, retlen)
      asn1buf * buf;
      const krb5_timestamp val;
      int * retlen;
@@ -179,7 +179,7 @@ asn1_error_code INTERFACE asn1_encode_kerberos_time(buf, val, retlen)
   return asn1_encode_generaltime(buf,val,retlen);
 }
 
-asn1_error_code INTERFACE asn1_encode_host_address(buf, val, retlen)
+asn1_error_code asn1_encode_host_address(buf, val, retlen)
      asn1buf * buf;
      const krb5_address * val;
      int * retlen;
@@ -195,7 +195,7 @@ asn1_error_code INTERFACE asn1_encode_host_address(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_host_addresses(buf, val, retlen)
+asn1_error_code asn1_encode_host_addresses(buf, val, retlen)
      asn1buf * buf;
      const krb5_address ** val;
      int * retlen;
@@ -216,7 +216,7 @@ asn1_error_code INTERFACE asn1_encode_host_addresses(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_encrypted_data(buf, val, retlen)
+asn1_error_code asn1_encode_encrypted_data(buf, val, retlen)
      asn1buf * buf;
      const krb5_enc_data * val;
      int * retlen;
@@ -235,7 +235,7 @@ asn1_error_code INTERFACE asn1_encode_encrypted_data(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_krb5_flags(buf, val, retlen)
+asn1_error_code asn1_encode_krb5_flags(buf, val, retlen)
      asn1buf * buf;
      const krb5_flags val;
      int * retlen;
@@ -262,7 +262,7 @@ asn1_error_code INTERFACE asn1_encode_krb5_flags(buf, val, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_encode_ap_options(buf, val, retlen)
+asn1_error_code asn1_encode_ap_options(buf, val, retlen)
      asn1buf * buf;
      const krb5_flags val;
      int * retlen;
@@ -270,7 +270,7 @@ asn1_error_code INTERFACE asn1_encode_ap_options(buf, val, retlen)
   return asn1_encode_krb5_flags(buf,val,retlen);
 }
 
-asn1_error_code INTERFACE asn1_encode_ticket_flags(buf, val, retlen)
+asn1_error_code asn1_encode_ticket_flags(buf, val, retlen)
      asn1buf * buf;
      const krb5_flags val;
      int * retlen;
@@ -278,7 +278,7 @@ asn1_error_code INTERFACE asn1_encode_ticket_flags(buf, val, retlen)
   return asn1_encode_krb5_flags(buf,val,retlen);
 }
 
-asn1_error_code INTERFACE asn1_encode_kdc_options(buf, val, retlen)
+asn1_error_code asn1_encode_kdc_options(buf, val, retlen)
      asn1buf * buf;
      const krb5_flags val;
      int * retlen;
@@ -286,7 +286,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_options(buf, val, retlen)
   return asn1_encode_krb5_flags(buf,val,retlen);
 }
 
-asn1_error_code INTERFACE asn1_encode_authorization_data(buf, val, retlen)
+asn1_error_code asn1_encode_authorization_data(buf, val, retlen)
      asn1buf * buf;
      const krb5_authdata ** val;
      int * retlen;
@@ -307,7 +307,7 @@ asn1_error_code INTERFACE asn1_encode_authorization_data(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt(buf, val, retlen)
+asn1_error_code asn1_encode_krb5_authdata_elt(buf, val, retlen)
      asn1buf * buf;
      const krb5_authdata * val;
      int * retlen;
@@ -326,7 +326,7 @@ asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_kdc_rep(msg_type, buf, val, retlen)
+asn1_error_code asn1_encode_kdc_rep(msg_type, buf, val, retlen)
      int msg_type;
      asn1buf * buf;
      const krb5_kdc_rep * val;
@@ -351,7 +351,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_rep(msg_type, buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part(buf, val, retlen)
+asn1_error_code asn1_encode_enc_kdc_rep_part(buf, val, retlen)
      asn1buf * buf;
      const krb5_enc_kdc_rep_part * val;
      int * retlen;
@@ -406,7 +406,7 @@ asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_kdc_req_body(buf, rep, retlen)
+asn1_error_code asn1_encode_kdc_req_body(buf, rep, retlen)
      asn1buf * buf;
      const krb5_kdc_req * rep;
      int * retlen;
@@ -475,7 +475,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_req_body(buf, rep, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_encryption_key(buf, val, retlen)
+asn1_error_code asn1_encode_encryption_key(buf, val, retlen)
      asn1buf * buf;
      const krb5_keyblock * val;
      int * retlen;
@@ -491,7 +491,7 @@ asn1_error_code INTERFACE asn1_encode_encryption_key(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_checksum(buf, val, retlen)
+asn1_error_code asn1_encode_checksum(buf, val, retlen)
      asn1buf * buf;
      const krb5_checksum * val;
      int * retlen;
@@ -507,7 +507,7 @@ asn1_error_code INTERFACE asn1_encode_checksum(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_transited_encoding(buf, val, retlen)
+asn1_error_code asn1_encode_transited_encoding(buf, val, retlen)
      asn1buf * buf;
      const krb5_transited * val;
      int * retlen;
@@ -526,7 +526,7 @@ asn1_error_code INTERFACE asn1_encode_transited_encoding(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_last_req(buf, val, retlen)
+asn1_error_code asn1_encode_last_req(buf, val, retlen)
      asn1buf * buf;
      const krb5_last_req_entry ** val;
      int * retlen;
@@ -547,7 +547,7 @@ asn1_error_code INTERFACE asn1_encode_last_req(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_last_req_entry(buf, val, retlen)
+asn1_error_code asn1_encode_last_req_entry(buf, val, retlen)
      asn1buf * buf;
      const krb5_last_req_entry * val;
      int * retlen;
@@ -563,7 +563,7 @@ asn1_error_code INTERFACE asn1_encode_last_req_entry(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data(buf, val, retlen)
+asn1_error_code asn1_encode_sequence_of_pa_data(buf, val, retlen)
      asn1buf * buf;
      const krb5_pa_data ** val;
      int * retlen;
@@ -584,7 +584,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_pa_data(buf, val, retlen)
+asn1_error_code asn1_encode_pa_data(buf, val, retlen)
      asn1buf * buf;
      const krb5_pa_data * val;
      int * retlen;
@@ -601,7 +601,7 @@ asn1_error_code INTERFACE asn1_encode_pa_data(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_ticket(buf, val, retlen)
+asn1_error_code asn1_encode_sequence_of_ticket(buf, val, retlen)
      asn1buf * buf;
      const krb5_ticket ** val;
      int * retlen;
@@ -622,7 +622,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_ticket(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_ticket(buf, val, retlen)
+asn1_error_code asn1_encode_ticket(buf, val, retlen)
      asn1buf * buf;
      const krb5_ticket * val;
      int * retlen;
@@ -641,7 +641,7 @@ asn1_error_code INTERFACE asn1_encode_ticket(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_enctype(buf, len, val, retlen)
+asn1_error_code asn1_encode_sequence_of_enctype(buf, len, val, retlen)
      asn1buf * buf;
      const int len;
      const krb5_enctype * val;
@@ -662,7 +662,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_enctype(buf, len, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_kdc_req(msg_type, buf, val, retlen)
+asn1_error_code asn1_encode_kdc_req(msg_type, buf, val, retlen)
      int msg_type;
      asn1buf * buf;
      const krb5_kdc_req * val;
@@ -684,7 +684,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_req(msg_type, buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_krb_safe_body(buf, val, retlen)
+asn1_error_code asn1_encode_krb_safe_body(buf, val, retlen)
      asn1buf * buf;
      const krb5_safe * val;
      int * retlen;
@@ -710,7 +710,7 @@ asn1_error_code INTERFACE asn1_encode_krb_safe_body(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info(buf, val, retlen)
+asn1_error_code asn1_encode_sequence_of_krb_cred_info(buf, val, retlen)
      asn1buf * buf;
      const krb5_cred_info ** val;
      int * retlen;
@@ -731,7 +731,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info(buf, val, retlen
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_krb_cred_info(buf, val, retlen)
+asn1_error_code asn1_encode_krb_cred_info(buf, val, retlen)
      asn1buf * buf;
      const krb5_cred_info * val;
      int * retlen;
@@ -767,7 +767,7 @@ asn1_error_code INTERFACE asn1_encode_krb_cred_info(buf, val, retlen)
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence(buf, val, retlen)
+asn1_error_code asn1_encode_sequence_of_passwdsequence(buf, val, retlen)
      asn1buf * buf;
      const passwd_phrase_element ** val;
      int * retlen;
@@ -787,7 +787,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence(buf, val, retle
   asn1_cleanup();
 }
 
-asn1_error_code INTERFACE asn1_encode_passwdsequence(buf, val, retlen)
+asn1_error_code asn1_encode_passwdsequence(buf, val, retlen)
      asn1buf * buf;
      const passwd_phrase_element * val;
      int * retlen;
index 93be05da3dc228b0ae7eb9c1562d2bdc4ad70273..a4adb5fc4b43f49c605d277097c43d8bd04d58a4 100644 (file)
@@ -102,114 +102,114 @@ asn1_error_code asn1_encode_asn1_type(asn1buf *buf,
             Returns ENOMEM if memory runs out.
 */
 
-asn1_error_code INTERFACE asn1_encode_ui_4 PROTOTYPE((asn1buf *buf,
+asn1_error_code asn1_encode_ui_4 PROTOTYPE((asn1buf *buf,
                                            const krb5_ui_4 val,
                                            int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_msgtype PROTOTYPE((asn1buf *buf,
+asn1_error_code asn1_encode_msgtype PROTOTYPE((asn1buf *buf,
                                               const /*krb5_msgtype*/int val,
                                               int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_realm
+asn1_error_code asn1_encode_realm
        PROTOTYPE((asn1buf *buf, const krb5_principal val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_principal_name
+asn1_error_code asn1_encode_principal_name
        PROTOTYPE((asn1buf *buf, const krb5_principal val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_encrypted_data
+asn1_error_code asn1_encode_encrypted_data
        PROTOTYPE((asn1buf *buf, const krb5_enc_data *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_krb5_flags
+asn1_error_code asn1_encode_krb5_flags
        PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_ap_options
+asn1_error_code asn1_encode_ap_options
        PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_ticket_flags
+asn1_error_code asn1_encode_ticket_flags
        PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_kdc_options
+asn1_error_code asn1_encode_kdc_options
        PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_authorization_data
+asn1_error_code asn1_encode_authorization_data
        PROTOTYPE((asn1buf *buf, const krb5_authdata **val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt
+asn1_error_code asn1_encode_krb5_authdata_elt
        PROTOTYPE((asn1buf *buf, const krb5_authdata *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_kdc_rep
+asn1_error_code asn1_encode_kdc_rep
        PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_rep *val,
                   int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part
+asn1_error_code asn1_encode_enc_kdc_rep_part
        PROTOTYPE((asn1buf *buf, const krb5_enc_kdc_rep_part *val,
                   int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_ticket
+asn1_error_code asn1_encode_ticket
        PROTOTYPE((asn1buf *buf, const krb5_ticket *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_encryption_key
+asn1_error_code asn1_encode_encryption_key
        PROTOTYPE((asn1buf *buf, const krb5_keyblock *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_kerberos_time
+asn1_error_code asn1_encode_kerberos_time
        PROTOTYPE((asn1buf *buf, const krb5_timestamp val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_checksum
+asn1_error_code asn1_encode_checksum
        PROTOTYPE((asn1buf *buf, const krb5_checksum *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_host_address
+asn1_error_code asn1_encode_host_address
        PROTOTYPE((asn1buf *buf, const krb5_address *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_host_addresses
+asn1_error_code asn1_encode_host_addresses
        PROTOTYPE((asn1buf *buf, const krb5_address **val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_transited_encoding
+asn1_error_code asn1_encode_transited_encoding
        PROTOTYPE((asn1buf *buf, const krb5_transited *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_last_req
+asn1_error_code asn1_encode_last_req
        PROTOTYPE((asn1buf *buf, const krb5_last_req_entry **val,
                   int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data
+asn1_error_code asn1_encode_sequence_of_pa_data
        PROTOTYPE((asn1buf *buf, const krb5_pa_data **val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_ticket
+asn1_error_code asn1_encode_sequence_of_ticket
        PROTOTYPE((asn1buf *buf, const krb5_ticket **val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_enctype
+asn1_error_code asn1_encode_sequence_of_enctype
        PROTOTYPE((asn1buf *buf,
                   const int len, const krb5_enctype *val,
                   int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_kdc_req
+asn1_error_code asn1_encode_kdc_req
        PROTOTYPE((int msg_type,
                   asn1buf *buf,
                   const krb5_kdc_req *val,
                   int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_kdc_req_body
+asn1_error_code asn1_encode_kdc_req_body
        PROTOTYPE((asn1buf *buf, const krb5_kdc_req *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_krb_safe_body
+asn1_error_code asn1_encode_krb_safe_body
        PROTOTYPE((asn1buf *buf, const krb5_safe *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info
+asn1_error_code asn1_encode_sequence_of_krb_cred_info
        PROTOTYPE((asn1buf *buf, const krb5_cred_info **val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_krb_cred_info
+asn1_error_code asn1_encode_krb_cred_info
        PROTOTYPE((asn1buf *buf, const krb5_cred_info *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_last_req_entry
+asn1_error_code asn1_encode_last_req_entry
        PROTOTYPE((asn1buf *buf, const krb5_last_req_entry *val,
                   int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_pa_data
+asn1_error_code asn1_encode_pa_data
        PROTOTYPE((asn1buf *buf, const krb5_pa_data *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_passwdsequence
+asn1_error_code asn1_encode_passwdsequence
        PROTOTYPE((asn1buf *buf, const passwd_phrase_element *val, int *retlen));
 
-asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence
+asn1_error_code asn1_encode_sequence_of_passwdsequence
        PROTOTYPE((asn1buf *buf, const passwd_phrase_element **val, int *retlen));
 
 #endif
index 84d9f4e43f44dbefd353e0e50c7bf220c0408ece..ab147f85d9e9a6418c1aef690ebe957fb395d508 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "asn1_make.h"
 
-asn1_error_code INTERFACE asn1_make_etag(buf, class, tagnum, in_len, retlen)
+asn1_error_code asn1_make_etag(buf, class, tagnum, in_len, retlen)
      asn1buf * buf;
      const asn1_class class;
      const asn1_tagnum tagnum;
@@ -33,7 +33,7 @@ asn1_error_code INTERFACE asn1_make_etag(buf, class, tagnum, in_len, retlen)
   return asn1_make_tag(buf,class,CONSTRUCTED,tagnum,in_len,retlen);
 }
 
-asn1_error_code INTERFACE asn1_make_tag(buf, class, construction, tagnum, in_len, retlen)
+asn1_error_code asn1_make_tag(buf, class, construction, tagnum, in_len, retlen)
      asn1buf * buf;
      const asn1_class class;
      const asn1_construction construction;
@@ -57,7 +57,7 @@ asn1_error_code INTERFACE asn1_make_tag(buf, class, construction, tagnum, in_len
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_make_length(buf, in_len, retlen)
+asn1_error_code asn1_make_length(buf, in_len, retlen)
      asn1buf * buf;
      const int in_len;
      int * retlen;
@@ -86,7 +86,7 @@ asn1_error_code INTERFACE asn1_make_length(buf, in_len, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_make_id(buf, class, construction, tagnum, retlen)
+asn1_error_code asn1_make_id(buf, class, construction, tagnum, retlen)
      asn1buf * buf;
      const asn1_class class;
      const asn1_construction construction;
@@ -124,7 +124,7 @@ asn1_error_code INTERFACE asn1_make_id(buf, class, construction, tagnum, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_make_sequence(buf, seq_len, retlen)
+asn1_error_code asn1_make_sequence(buf, seq_len, retlen)
      asn1buf * buf;
      const int seq_len;
      int * retlen;
@@ -143,7 +143,7 @@ asn1_error_code INTERFACE asn1_make_sequence(buf, seq_len, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_make_set(buf, set_len, retlen)
+asn1_error_code asn1_make_set(buf, set_len, retlen)
      asn1buf * buf;
      const int set_len;
      int * retlen;
@@ -162,7 +162,7 @@ asn1_error_code INTERFACE asn1_make_set(buf, set_len, retlen)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1_make_string(buf, length, string, retlen)
+asn1_error_code asn1_make_string(buf, length, string, retlen)
      asn1buf * buf;
      const int length;
      const char * string;
index 6fcf891a893aa20c2536dbed89919220a2e445bc..89ece9bcfb77d5ead6e98ed994d6f261d5595f86 100644 (file)
@@ -43,7 +43,7 @@
       asn1_make_string
 */
 
-asn1_error_code INTERFACE asn1_make_etag
+asn1_error_code asn1_make_etag
        PROTOTYPE((asn1buf *buf,
                   const asn1_class class,
                   const asn1_tagnum tagnum,
@@ -57,7 +57,7 @@ asn1_error_code INTERFACE asn1_make_etag
             Returns the length of this encoding in *retlen.
             Returns ENOMEM if memory runs out. */
 
-asn1_error_code INTERFACE asn1_make_tag
+asn1_error_code asn1_make_tag
        PROTOTYPE((asn1buf *buf, const asn1_class class,
                   const asn1_construction construction,
                   const asn1_tagnum tagnum,
@@ -74,7 +74,7 @@ asn1_error_code INTERFACE asn1_make_tag
             Returns ASN1_OVERFLOW if tagnum exceeds the limits of
              the implementation. */
 
-asn1_error_code INTERFACE asn1_make_sequence
+asn1_error_code asn1_make_sequence
        PROTOTYPE((asn1buf *buf, const int seq_len, int *len));
 /* requires  *buf is allocated, seq_len is the length of a series of
              sequence components which have just been inserted in *buf
@@ -83,7 +83,7 @@ asn1_error_code INTERFACE asn1_make_sequence
               in *buf.  Returns the length of this encoding in *retlen.
              Returns ENOMEM if memory runs out. */
 
-asn1_error_code INTERFACE asn1_make_set
+asn1_error_code asn1_make_set
        PROTOTYPE((asn1buf *buf, const int set_len, int *retlen));
 /* requires  *buf is allocated, seq_len is the length of a series of
              sequence components which have just been inserted in *buf
@@ -92,7 +92,7 @@ asn1_error_code INTERFACE asn1_make_set
              Returns the length of this encoding in *retlen.
              Returns ENOMEM if memory runs out. */
 
-asn1_error_code INTERFACE asn1_make_string
+asn1_error_code asn1_make_string
        PROTOTYPE((asn1buf *buf,
                   const int len, const char *string,
                   int *retlen));
@@ -107,7 +107,7 @@ asn1_error_code INTERFACE asn1_make_string
 /* Private procedures */
 
 /* "helper" procedure for asn1_make_tag */
-asn1_error_code INTERFACE asn1_make_length
+asn1_error_code asn1_make_length
        PROTOTYPE((asn1buf *buf, const int in_len, int *retlen));
 /* requires  *buf is allocated, in_len is the length of an ASN.1 encoding
              which has just been inserted in *buf
@@ -116,7 +116,7 @@ asn1_error_code INTERFACE asn1_make_length
        PROTOTYPE((s) for in_len into *buf */
 
 /* "helper" procedure for asn1_make_tag */
-asn1_error_code INTERFACE asn1_make_id
+asn1_error_code asn1_make_id
        PROTOTYPE((asn1buf *buf,
                   const asn1_class class,
                   const asn1_construction construction,
index eb6516a317e0003b354aacf55039f542dfb448d7..a687d062a32f32b2eac4a4f3651daf7cb35b3091 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "asn1_misc.h"
 
-asn1_error_code INTERFACE asn1_krb5_realm_copy(target, source)
+asn1_error_code asn1_krb5_realm_copy(target, source)
      krb5_principal target;
      krb5_principal source;
 {
index d1364e343b6efc8032b7b9460335fddd8540e228..9378b330e9295a03b1071b90b644f68c0b724542 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "krbasn1.h"
 
-asn1_error_code INTERFACE asn1_krb5_realm_copy
+asn1_error_code asn1_krb5_realm_copy
        PROTOTYPE((krb5_principal target, krb5_principal source));
 /* requires  target, source, and source->realm are allocated
    effects   Copies source->realm into target->realm.
index e04b0928d6695ad6d477cd0e187e3d098e76d1f2..327a9dfd5db9fe9acbeb3846d0bc9acf537ec80d 100644 (file)
@@ -51,7 +51,7 @@
 #include "asn1buf.h"
 #include <stdio.h>
 
-asn1_error_code INTERFACE asn1buf_create(buf)
+asn1_error_code asn1buf_create(buf)
      asn1buf ** buf;
 {
   *buf = (asn1buf*)calloc(1,sizeof(asn1buf));
@@ -62,7 +62,7 @@ asn1_error_code INTERFACE asn1buf_create(buf)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_wrap_data(buf, code)
+asn1_error_code asn1buf_wrap_data(buf, code)
      asn1buf * buf;
      const krb5_data * code;
 {
@@ -72,7 +72,7 @@ asn1_error_code INTERFACE asn1buf_wrap_data(buf, code)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_imbed(subbuf, buf, length)
+asn1_error_code asn1buf_imbed(subbuf, buf, length)
      asn1buf * subbuf;
      const asn1buf * buf;
      const int length;
@@ -87,14 +87,14 @@ asn1_error_code INTERFACE asn1buf_imbed(subbuf, buf, length)
   return 0;
 }
 
-void INTERFACE asn1buf_sync(buf, subbuf)
+void asn1buf_sync(buf, subbuf)
      asn1buf * buf;
      asn1buf * subbuf;
 {
   buf->next = subbuf->next;
 }
 
-asn1_error_code INTERFACE asn1buf_destroy(buf)
+asn1_error_code asn1buf_destroy(buf)
      asn1buf ** buf;
 {
   if (*buf != NULL) {
@@ -105,7 +105,7 @@ asn1_error_code INTERFACE asn1buf_destroy(buf)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_insert_octet(buf, o)
+asn1_error_code asn1buf_insert_octet(buf, o)
      asn1buf * buf;
      const int o;
 {
@@ -118,7 +118,7 @@ asn1_error_code INTERFACE asn1buf_insert_octet(buf, o)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_insert_octetstring(buf, len, s)
+asn1_error_code asn1buf_insert_octetstring(buf, len, s)
      asn1buf * buf;
      const int len;
      const krb5_octet * s;
@@ -133,7 +133,7 @@ asn1_error_code INTERFACE asn1buf_insert_octetstring(buf, len, s)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_insert_charstring(buf, len, s)
+asn1_error_code asn1buf_insert_charstring(buf, len, s)
      asn1buf * buf;
      const int len;
      const char * s;
@@ -148,7 +148,7 @@ asn1_error_code INTERFACE asn1buf_insert_charstring(buf, len, s)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_remove_octet(buf, o)
+asn1_error_code asn1buf_remove_octet(buf, o)
      asn1buf * buf;
      asn1_octet * o;
 {
@@ -157,7 +157,7 @@ asn1_error_code INTERFACE asn1buf_remove_octet(buf, o)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_remove_octetstring(buf, len, s)
+asn1_error_code asn1buf_remove_octetstring(buf, len, s)
      asn1buf * buf;
      const int len;
      asn1_octet ** s;
@@ -178,7 +178,7 @@ asn1_error_code INTERFACE asn1buf_remove_octetstring(buf, len, s)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_remove_charstring(buf, len, s)
+asn1_error_code asn1buf_remove_charstring(buf, len, s)
      asn1buf * buf;
      const int len;
      char ** s;
@@ -219,8 +219,7 @@ int asn1buf_remains(buf)
   else return remain;
 }
 
-
-asn1_error_code INTERFACE asn12krb5_buf(buf, code)
+asn1_error_code asn12krb5_buf(buf, code)
      const asn1buf * buf;
      krb5_data ** code;
 {
@@ -242,7 +241,7 @@ asn1_error_code INTERFACE asn12krb5_buf(buf, code)
 /* These parse and unparse procedures should be moved out. They're
    useful only for debugging and superfluous in the production version. */
 
-asn1_error_code INTERFACE asn1buf_unparse(buf, s)
+asn1_error_code asn1buf_unparse(buf, s)
      const asn1buf * buf;
      char ** s;
 {
@@ -268,7 +267,7 @@ asn1_error_code INTERFACE asn1buf_unparse(buf, s)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_hex_unparse(buf, s)
+asn1_error_code asn1buf_hex_unparse(buf, s)
      const asn1buf * buf;
      char ** s;
 {
@@ -305,21 +304,21 @@ asn1_error_code INTERFACE asn1buf_hex_unparse(buf, s)
 /****************************************************************/
 /* Private Procedures */
 
-int INTERFACE asn1buf_size(buf)
+int asn1buf_size(buf)
      const asn1buf * buf;
 {
   if(buf == NULL || buf->base == NULL) return 0;
   return buf->bound - buf->base + 1;
 }
 
-int INTERFACE asn1buf_free(buf)
+int asn1buf_free(buf)
      const asn1buf * buf;
 {
   if(buf == NULL || buf->base == NULL) return 0;
   else return buf->bound - buf->next + 1;
 }
 
-asn1_error_code INTERFACE asn1buf_ensure_space(buf, amount)
+asn1_error_code asn1buf_ensure_space(buf, amount)
      asn1buf * buf;
      const int amount;
 {
@@ -331,7 +330,7 @@ asn1_error_code INTERFACE asn1buf_ensure_space(buf, amount)
   return 0;
 }
 
-asn1_error_code INTERFACE asn1buf_expand(buf, inc)
+asn1_error_code asn1buf_expand(buf, inc)
      asn1buf * buf;
      const int inc;
 {
@@ -356,7 +355,7 @@ asn1_error_code INTERFACE asn1buf_expand(buf, inc)
   return 0;
 }
 
-int INTERFACE asn1buf_len(buf)
+int asn1buf_len(buf)
      const asn1buf * buf;
 {
   return buf->next - buf->base;
index 0d18f3b7ce84e57e573351ffc973a38ad5f1bca8..f3f4a3f2e06f4d31e214a4e18226c23bcf40ab4a 100644 (file)
@@ -46,12 +46,12 @@ typedef struct code_buffer_rep {
     (asn1buf_len)
 */
 
-asn1_error_code INTERFACE asn1buf_create
+asn1_error_code asn1buf_create
        PROTOTYPE((asn1buf **buf));
 /* effects   Creates a new encoding buffer pointed to by *buf.
              Returns ENOMEM if the buffer can't be created. */
 
-asn1_error_code INTERFACE asn1buf_wrap_data
+asn1_error_code asn1buf_wrap_data
        PROTOTYPE((asn1buf *buf, const krb5_data *code));
 /* requires  *buf has already been allocated
    effects   Turns *buf into a "wrapper" for *code.  i.e. *buf is set up
@@ -59,7 +59,7 @@ asn1_error_code INTERFACE asn1buf_wrap_data
              is the top of *code.
             Returns ASN1_MISSING_FIELD if code is empty. */
 
-asn1_error_code INTERFACE asn1buf_imbed
+asn1_error_code asn1buf_imbed
        PROTOTYPE((asn1buf *subbuf, const asn1buf *buf, const int length));
 /* requires  *subbuf and *buf are allocated
    effects   *subbuf becomes a sub-buffer of *buf.  *subbuf begins
@@ -68,22 +68,22 @@ asn1_error_code INTERFACE asn1buf_imbed
              that case, ASN1_OVERRUN is returned)  *subbuf's current
              position starts at the beginning of *subbuf. */
 
-void INTERFACE asn1buf_sync
+void asn1buf_sync
        PROTOTYPE((asn1buf *buf, asn1buf *subbuf));
 /* requires  *subbuf is a sub-buffer of *buf, as created by asn1buf_imbed.
    effects   Synchronizes *buf's current position to match that of *subbuf. */
 
-asn1_error_code INTERFACE asn1buf_destroy
+asn1_error_code asn1buf_destroy
        PROTOTYPE((asn1buf **buf));
 /* effects   Deallocates **buf, sets *buf to NULL. */
 
-asn1_error_code INTERFACE asn1buf_insert_octet
+asn1_error_code asn1buf_insert_octet
        PROTOTYPE((asn1buf *buf, const int o));
 /* requires  *buf is allocated
    effects   Inserts o into the buffer *buf, expanding the buffer if
              necessary.  Returns ENOMEM memory is exhausted. */
 
-asn1_error_code INTERFACE asn1buf_insert_octetstring
+asn1_error_code asn1buf_insert_octetstring
        PROTOTYPE((asn1buf *buf, const int len, const asn1_octet *s));
 /* requires  *buf is allocated
    modifies  *buf
@@ -91,7 +91,7 @@ asn1_error_code INTERFACE asn1buf_insert_octetstring
               into the buffer *buf, expanding the buffer if necessary.
             Returns ENOMEM if memory is exhausted. */
 
-asn1_error_code INTERFACE asn1buf_insert_charstring
+asn1_error_code asn1buf_insert_charstring
        PROTOTYPE((asn1buf *buf, const int len, const char *s));
 /* requires  *buf is allocated
    modifies  *buf
@@ -99,14 +99,14 @@ asn1_error_code INTERFACE asn1buf_insert_charstring
               into the buffer *buf, expanding the buffer if necessary.
             Returns ENOMEM if memory is exhuasted. */
 
-asn1_error_code INTERFACE asn1buf_remove_octet
+asn1_error_code asn1buf_remove_octet
        PROTOTYPE((asn1buf *buf, asn1_octet *o));
 /* requires  *buf is allocated
    effects   Returns *buf's current octet in *o and advances to
               the next octet.
             Returns ASN1_OVERRUN if *buf has already been exhuasted. */
 
-asn1_error_code INTERFACE asn1buf_remove_octetstring
+asn1_error_code asn1buf_remove_octetstring
        PROTOTYPE((asn1buf *buf, const int len, asn1_octet **s));
 /* requires  *buf is allocated
    effects   Removes the next len octets of *buf and returns them in **s.
@@ -114,7 +114,7 @@ asn1_error_code INTERFACE asn1buf_remove_octetstring
              left in *buf.
             Returns ENOMEM if *s could not be allocated. */
 
-asn1_error_code INTERFACE asn1buf_remove_charstring
+asn1_error_code asn1buf_remove_charstring
        PROTOTYPE((asn1buf *buf, const int len,
                                          char **s));
 /* requires  *buf is allocated
@@ -123,26 +123,26 @@ asn1_error_code INTERFACE asn1buf_remove_charstring
              left in *buf.
             Returns ENOMEM if *s could not be allocated. */
 
-asn1_error_code INTERFACE asn1buf_unparse
+asn1_error_code asn1buf_unparse
        PROTOTYPE((const asn1buf *buf, char **s));
 /* modifies  *s
    effects   Returns a human-readable representation of *buf in *s,
              where each octet in *buf is represented by a character in *s. */
 
-asn1_error_code INTERFACE asn1buf_hex_unparse
+asn1_error_code asn1buf_hex_unparse
        PROTOTYPE((const asn1buf *buf, char **s));
 /* modifies  *s
    effects   Returns a human-readable representation of *buf in *s,
              where each octet in *buf is represented by a 2-digit
             hexadecimal number in *s. */
 
-asn1_error_code INTERFACE asn12krb5_buf
+asn1_error_code asn12krb5_buf
        PROTOTYPE((const asn1buf *buf, krb5_data **code));
 /* modifies  *code
    effects   Instantiates **code with the krb5_data representation of **buf. */
 
 
-int INTERFACE asn1buf_remains
+int asn1buf_remains
        PROTOTYPE((asn1buf *buf));
 /* requires  *buf is a buffer containing an asn.1 structure or array
    modifies  *buf
@@ -150,18 +150,18 @@ int INTERFACE asn1buf_remains
 
 /**************** Private Procedures ****************/
 
-int INTERFACE asn1buf_size
+int asn1buf_size
        PROTOTYPE((const asn1buf *buf));
 /* requires  *buf has been created and not destroyed
    effects   Returns the total size 
        PROTOTYPE((in octets) of buf's octet buffer. */
 
-int INTERFACE asn1buf_free
+int asn1buf_free
        PROTOTYPE((const asn1buf *buf));
 /* requires  *buf is allocated
    effects   Returns the number of unused, allocated octets in *buf. */
 
-asn1_error_code INTERFACE asn1buf_ensure_space
+asn1_error_code asn1buf_ensure_space
        PROTOTYPE((asn1buf *buf, const int amount));
 /* requires  *buf is allocated
    modifies  *buf
@@ -169,14 +169,14 @@ asn1_error_code INTERFACE asn1buf_ensure_space
             expanded to have at least amount octets of free space.
             Returns ENOMEM memory is exhausted. */
 
-asn1_error_code INTERFACE asn1buf_expand
+asn1_error_code asn1buf_expand
        PROTOTYPE((asn1buf *buf, const int inc));
 /* requires  *buf is allocated
    modifies  *buf
    effects   Expands *buf by allocating space for inc more octets.
              Returns ENOMEM if memory is exhausted. */
 
-int INTERFACE asn1buf_len
+int asn1buf_len
        PROTOTYPE((const asn1buf *buf));
 /* requires  *buf is allocated
    effects   Returns the length of the encoding in *buf. */
index 2c1cf4d1ad01ff45f1c64e635a38feb3f2308d17..fd716f4b414d71d95ab56242eebd5c62f5f17adb 100644 (file)
@@ -147,7 +147,7 @@ if(tagnum == (tagexpect)){\
 #define cleanup()\
 return 0
 
-krb5_error_code INTERFACE decode_krb5_authenticator(code, rep)
+krb5_error_code decode_krb5_authenticator(code, rep)
      const krb5_data * code;
      krb5_authenticator ** rep;
 {
@@ -176,7 +176,7 @@ krb5_error_code INTERFACE decode_krb5_authenticator(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_ticket(code, rep)
+krb5_error_code decode_krb5_ticket(code, rep)
      const krb5_data * code;
      krb5_ticket ** rep;
 {
@@ -198,7 +198,7 @@ krb5_error_code INTERFACE decode_krb5_ticket(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_encryption_key(code, rep)
+krb5_error_code decode_krb5_encryption_key(code, rep)
      const krb5_data * code;
      krb5_keyblock ** rep;
 {
@@ -215,7 +215,7 @@ krb5_error_code INTERFACE decode_krb5_encryption_key(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_enc_tkt_part(code, rep)
+krb5_error_code decode_krb5_enc_tkt_part(code, rep)
      const krb5_data * code;
      krb5_enc_tkt_part ** rep;
 {
@@ -242,7 +242,7 @@ krb5_error_code INTERFACE decode_krb5_enc_tkt_part(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part(code, rep)
+krb5_error_code decode_krb5_enc_kdc_rep_part(code, rep)
      const krb5_data * code;
      krb5_enc_kdc_rep_part ** rep;
 {
@@ -262,7 +262,7 @@ krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_as_rep(code, rep)
+krb5_error_code decode_krb5_as_rep(code, rep)
      const krb5_data * code;
      krb5_kdc_rep ** rep;
 {
@@ -280,7 +280,7 @@ krb5_error_code INTERFACE decode_krb5_as_rep(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_tgs_rep(code, rep)
+krb5_error_code decode_krb5_tgs_rep(code, rep)
      const krb5_data * code;
      krb5_kdc_rep ** rep;
 {
@@ -297,7 +297,7 @@ krb5_error_code INTERFACE decode_krb5_tgs_rep(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_ap_req(code, rep)
+krb5_error_code decode_krb5_ap_req(code, rep)
      const krb5_data * code;
      krb5_ap_req ** rep;
 {
@@ -324,7 +324,7 @@ krb5_error_code INTERFACE decode_krb5_ap_req(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_ap_rep(code, rep)
+krb5_error_code decode_krb5_ap_rep(code, rep)
      const krb5_data * code;
      krb5_ap_rep ** rep;
 {
@@ -348,7 +348,7 @@ krb5_error_code INTERFACE decode_krb5_ap_rep(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part(code, rep)
+krb5_error_code decode_krb5_ap_rep_enc_part(code, rep)
      const krb5_data * code;
      krb5_ap_rep_enc_part ** rep;
 {
@@ -367,7 +367,7 @@ krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_as_req(code, rep)
+krb5_error_code decode_krb5_as_req(code, rep)
      const krb5_data * code;
      krb5_kdc_req ** rep;
 {
@@ -384,7 +384,7 @@ krb5_error_code INTERFACE decode_krb5_as_req(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_tgs_req(code, rep)
+krb5_error_code decode_krb5_tgs_req(code, rep)
      const krb5_data * code;
      krb5_kdc_req ** rep;
 {
@@ -401,7 +401,7 @@ krb5_error_code INTERFACE decode_krb5_tgs_req(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_kdc_req_body(code, rep)
+krb5_error_code decode_krb5_kdc_req_body(code, rep)
      const krb5_data * code;
      krb5_kdc_req ** rep;
 {
@@ -414,7 +414,7 @@ krb5_error_code INTERFACE decode_krb5_kdc_req_body(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_safe(code, rep)
+krb5_error_code decode_krb5_safe(code, rep)
      const krb5_data * code;
      krb5_safe ** rep;
 {
@@ -440,7 +440,7 @@ krb5_error_code INTERFACE decode_krb5_safe(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_priv(code, rep)
+krb5_error_code decode_krb5_priv(code, rep)
      const krb5_data * code;
      krb5_priv ** rep;
 {
@@ -464,7 +464,7 @@ krb5_error_code INTERFACE decode_krb5_priv(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_enc_priv_part(code, rep)
+krb5_error_code decode_krb5_enc_priv_part(code, rep)
      const krb5_data * code;
      krb5_priv_enc_part ** rep;
 {
@@ -486,7 +486,7 @@ krb5_error_code INTERFACE decode_krb5_enc_priv_part(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_cred(code, rep)
+krb5_error_code decode_krb5_cred(code, rep)
      const krb5_data * code;
      krb5_cred ** rep;
 {
@@ -511,7 +511,7 @@ krb5_error_code INTERFACE decode_krb5_cred(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_enc_cred_part(code, rep)
+krb5_error_code decode_krb5_enc_cred_part(code, rep)
      const krb5_data * code;
      krb5_cred_enc_part ** rep;
 {
@@ -533,7 +533,7 @@ krb5_error_code INTERFACE decode_krb5_enc_cred_part(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_error(code, rep)
+krb5_error_code decode_krb5_error(code, rep)
      const krb5_data * code;
      krb5_error ** rep;
 {
@@ -569,7 +569,7 @@ krb5_error_code INTERFACE decode_krb5_error(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_authdata(code, rep)
+krb5_error_code decode_krb5_authdata(code, rep)
      const krb5_data * code;
      krb5_authdata *** rep;
 {
@@ -580,7 +580,7 @@ krb5_error_code INTERFACE decode_krb5_authdata(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_pwd_sequence(code, rep)
+krb5_error_code decode_krb5_pwd_sequence(code, rep)
      const krb5_data * code;
      passwd_phrase_element ** rep;
 {
@@ -591,7 +591,7 @@ krb5_error_code INTERFACE decode_krb5_pwd_sequence(code, rep)
   cleanup();
 }
 
-krb5_error_code INTERFACE decode_krb5_pwd_data(code, rep)
+krb5_error_code decode_krb5_pwd_data(code, rep)
      const krb5_data * code;
      krb5_pwd_data ** rep;
 {
index dc85fdf27696dd8333adc0a271322e90794d42b5..aa7ad61d169f7506c0cfbab904ff165c37da1207 100644 (file)
 \
   return 0
 
-krb5_error_code INTERFACE encode_krb5_authenticator(rep, code)
+krb5_error_code encode_krb5_authenticator(rep, code)
      const krb5_authenticator * rep;
      krb5_data ** code;
 {
@@ -198,7 +198,7 @@ krb5_error_code INTERFACE encode_krb5_authenticator(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_ticket(rep, code)
+krb5_error_code encode_krb5_ticket(rep, code)
      const krb5_ticket * rep;
      krb5_data ** code;
 {
@@ -223,7 +223,7 @@ krb5_error_code INTERFACE encode_krb5_ticket(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_encryption_key(rep, code)
+krb5_error_code encode_krb5_encryption_key(rep, code)
      const krb5_keyblock * rep;
      krb5_data ** code;
 {
@@ -241,7 +241,7 @@ krb5_error_code INTERFACE encode_krb5_encryption_key(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_enc_tkt_part(rep, code)
+krb5_error_code encode_krb5_enc_tkt_part(rep, code)
      const krb5_enc_tkt_part * rep;
      krb5_data ** code;
 {
@@ -293,7 +293,7 @@ krb5_error_code INTERFACE encode_krb5_enc_tkt_part(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part(rep, code)
+krb5_error_code encode_krb5_enc_kdc_rep_part(rep, code)
      const krb5_enc_kdc_rep_part * rep;
      krb5_data ** code;
 {
@@ -321,7 +321,7 @@ krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part(rep, code)
 }
 
 /* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code INTERFACE encode_krb5_as_rep(rep, code)
+krb5_error_code encode_krb5_as_rep(rep, code)
      const krb5_kdc_rep * rep;
      krb5_data ** code;
 {
@@ -338,7 +338,7 @@ krb5_error_code INTERFACE encode_krb5_as_rep(rep, code)
 }
 
 /* yes, the translation is identical to that used for KDC__REP */ 
-krb5_error_code INTERFACE encode_krb5_tgs_rep( rep, code)
+krb5_error_code encode_krb5_tgs_rep( rep, code)
      const krb5_kdc_rep * rep;
      krb5_data ** code;
 {
@@ -354,7 +354,7 @@ krb5_error_code INTERFACE encode_krb5_tgs_rep( rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_ap_req(rep, code)
+krb5_error_code encode_krb5_ap_req(rep, code)
      const krb5_ap_req * rep;
      krb5_data ** code;
 {
@@ -382,7 +382,7 @@ krb5_error_code INTERFACE encode_krb5_ap_req(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_ap_rep(rep, code)
+krb5_error_code encode_krb5_ap_rep(rep, code)
      const krb5_ap_rep * rep;
      krb5_data ** code;
 {
@@ -405,7 +405,7 @@ krb5_error_code INTERFACE encode_krb5_ap_rep(rep, code)
 }
 
 
-krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part(rep, code)
+krb5_error_code encode_krb5_ap_rep_enc_part(rep, code)
      const krb5_ap_rep_enc_part * rep;
      krb5_data ** code;
 {
@@ -432,7 +432,7 @@ krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_as_req(rep, code)
+krb5_error_code encode_krb5_as_req(rep, code)
      const krb5_kdc_req * rep;
      krb5_data ** code;
 {
@@ -448,7 +448,7 @@ krb5_error_code INTERFACE encode_krb5_as_req(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_tgs_req(rep, code)
+krb5_error_code encode_krb5_tgs_req(rep, code)
      const krb5_kdc_req * rep;
      krb5_data ** code;
 {
@@ -464,7 +464,7 @@ krb5_error_code INTERFACE encode_krb5_tgs_req(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_kdc_req_body(rep, code)
+krb5_error_code encode_krb5_kdc_req_body(rep, code)
      const krb5_kdc_req * rep;
      krb5_data ** code;
 {
@@ -478,7 +478,7 @@ krb5_error_code INTERFACE encode_krb5_kdc_req_body(rep, code)
 }
 
 
-krb5_error_code INTERFACE encode_krb5_safe(rep, code)
+krb5_error_code encode_krb5_safe(rep, code)
      const krb5_safe * rep;
      krb5_data ** code;
 {
@@ -503,7 +503,7 @@ krb5_error_code INTERFACE encode_krb5_safe(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_priv(rep, code)
+krb5_error_code encode_krb5_priv(rep, code)
      const krb5_priv * rep;
      krb5_data ** code;
 {
@@ -525,7 +525,7 @@ krb5_error_code INTERFACE encode_krb5_priv(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_enc_priv_part(rep, code)
+krb5_error_code encode_krb5_enc_priv_part(rep, code)
      const krb5_priv_enc_part * rep;
      krb5_data ** code;
 {
@@ -559,7 +559,7 @@ krb5_error_code INTERFACE encode_krb5_enc_priv_part(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_cred(rep, code)
+krb5_error_code encode_krb5_cred(rep, code)
      const krb5_cred * rep;
      krb5_data ** code;
 {
@@ -584,7 +584,7 @@ krb5_error_code INTERFACE encode_krb5_cred(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_enc_cred_part(rep, code)
+krb5_error_code encode_krb5_enc_cred_part(rep, code)
      const krb5_cred_enc_part * rep;
      krb5_data ** code;
 {
@@ -620,7 +620,7 @@ krb5_error_code INTERFACE encode_krb5_enc_cred_part(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_error(rep, code)
+krb5_error_code encode_krb5_error(rep, code)
      const krb5_error * rep;
      krb5_data ** code;
 {
@@ -677,7 +677,7 @@ krb5_error_code INTERFACE encode_krb5_error(rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_authdata(rep, code)
+krb5_error_code encode_krb5_authdata(rep, code)
      const krb5_authdata ** rep;
      krb5_data ** code;
 {
@@ -698,7 +698,7 @@ krb5_error_code INTERFACE encode_krb5_authdata(rep, code)
 }
 
 /* Sandia Additions */
-krb5_error_code INTERFACE encode_krb5_pwd_sequence( rep, code)
+krb5_error_code encode_krb5_pwd_sequence( rep, code)
      const passwd_phrase_element * rep;
      krb5_data ** code;
 {
@@ -709,7 +709,7 @@ krb5_error_code INTERFACE encode_krb5_pwd_sequence( rep, code)
   krb5_cleanup();
 }
 
-krb5_error_code INTERFACE encode_krb5_pwd_data(rep, code)
+krb5_error_code encode_krb5_pwd_data(rep, code)
      const krb5_pwd_data * rep;
      krb5_data ** code;
 {
index 6974ed5e08fb9b6a5d73cf2312fd8a2283b2528d..8319cfe7a64e25ff247c53635c44d512936bb8eb 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * ccbase.c: removed unneeded INTERFACE from non-api functions.
+
 Wed Mar 22 11:47:49 1995    <tytso@rsx-11.mit.edu>
 
        * Makefile.in (CFLAGS): Make -I options work when the build and
index c86212c321bbb22238aea085692c6de11223261d..05a18d0dfc4800fd9bd0944efe13a05a20a25e81 100644 (file)
@@ -39,7 +39,7 @@ static struct krb5_cc_typelist *cc_typehead = 0;
  * If override is set, replace any existing ccache with that type tag
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_cc_register(context, ops, override)
    krb5_context context;
    krb5_cc_ops *ops;
@@ -73,7 +73,7 @@ krb5_cc_register(context, ops, override)
  * particular cache type.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_cc_resolve (context, name, cache)
    krb5_context context;
    char *name;
index 22fc4bf2b7add7bebca002839e0e49df34a8950a..8df7297306a5ab6a259817aaf12184096af5f6b8 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Wed Mar 22 11:24:07 1995 Keith Vetter (keithv@fusion.com)
 
        * fcc-proto.h: added prototype for cache changing hook, 
index 9d6687577373029957e73223bf6e59d84e8c7261..d8f9db024242e4e4dffb6ec24e44dfaf518a7200 100644 (file)
@@ -33,7 +33,7 @@ krb5_error_code INTERFACE krb5_fcc_close
        PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* fcc_defnam.c */
-char * INTERFACE krb5_fcc_default_name 
+char * krb5_fcc_default_name 
        PROTOTYPE((krb5_context));
 
 /* fcc_destry.c */
@@ -68,27 +68,27 @@ krb5_error_code INTERFACE krb5_fcc_next_cred
                   krb5_creds *creds ));
 
 /* fcc_read.c */
-krb5_error_code INTERFACE krb5_fcc_read_principal 
+krb5_error_code krb5_fcc_read_principal 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
-krb5_error_code INTERFACE krb5_fcc_read_keyblock 
+krb5_error_code krb5_fcc_read_keyblock 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock ));
-krb5_error_code INTERFACE krb5_fcc_read_data 
+krb5_error_code krb5_fcc_read_data 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data ));
-krb5_error_code INTERFACE krb5_fcc_read_int32 
+krb5_error_code krb5_fcc_read_int32 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 *i ));
-krb5_error_code INTERFACE krb5_fcc_read_ui_2 
+krb5_error_code krb5_fcc_read_ui_2 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_2 *i ));
-krb5_error_code INTERFACE krb5_fcc_read_octet 
+krb5_error_code krb5_fcc_read_octet 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_octet *i ));
-krb5_error_code INTERFACE krb5_fcc_read_times 
+krb5_error_code krb5_fcc_read_times 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t ));
-krb5_error_code INTERFACE krb5_fcc_read_addrs 
+krb5_error_code krb5_fcc_read_addrs 
        PROTOTYPE((krb5_context, krb5_ccache, krb5_address ***));
-krb5_error_code INTERFACE krb5_fcc_read_addr 
+krb5_error_code krb5_fcc_read_addr 
        PROTOTYPE((krb5_context, krb5_ccache, krb5_address *));
-krb5_error_code INTERFACE krb5_fcc_read_authdata 
+krb5_error_code krb5_fcc_read_authdata 
        PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata ***));
-krb5_error_code INTERFACE krb5_fcc_read_authdatum 
+krb5_error_code krb5_fcc_read_authdatum 
        PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *));
 
 /* fcc_reslv.c */
@@ -112,7 +112,7 @@ krb5_error_code INTERFACE krb5_fcc_store
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
 
 /* fcc_skip.c */
-krb5_error_code INTERFACE krb5_fcc_skip_principal 
+krb5_error_code krb5_fcc_skip_principal 
        PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* fcc_sflags.c */
@@ -126,39 +126,39 @@ krb5_error_code krb5_change_cache
 
 
 /* fcc_write.c */
-krb5_error_code INTERFACE krb5_fcc_write 
+krb5_error_code krb5_fcc_write 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_pointer buf , int len ));
-krb5_error_code INTERFACE krb5_fcc_store_principal 
+krb5_error_code krb5_fcc_store_principal 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
-krb5_error_code INTERFACE krb5_fcc_store_keyblock 
+krb5_error_code krb5_fcc_store_keyblock 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock ));
-krb5_error_code INTERFACE krb5_fcc_store_data 
+krb5_error_code krb5_fcc_store_data 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data ));
-krb5_error_code INTERFACE krb5_fcc_store_int32 
+krb5_error_code krb5_fcc_store_int32 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i ));
-krb5_error_code INTERFACE krb5_fcc_store_ui_2 
+krb5_error_code krb5_fcc_store_ui_2 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i ));
-krb5_error_code INTERFACE krb5_fcc_store_octet 
+krb5_error_code krb5_fcc_store_octet 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i ));
-krb5_error_code INTERFACE krb5_fcc_store_times 
+krb5_error_code krb5_fcc_store_times 
        PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t ));
-krb5_error_code INTERFACE krb5_fcc_store_addrs 
+krb5_error_code krb5_fcc_store_addrs 
        PROTOTYPE((krb5_context, krb5_ccache , krb5_address ** ));
-krb5_error_code INTERFACE krb5_fcc_store_addr 
+krb5_error_code krb5_fcc_store_addr 
        PROTOTYPE((krb5_context, krb5_ccache , krb5_address * ));
-krb5_error_code INTERFACE krb5_fcc_store_authdata 
+krb5_error_code krb5_fcc_store_authdata 
        PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata **));
-krb5_error_code INTERFACE krb5_fcc_store_authdatum 
+krb5_error_code krb5_fcc_store_authdatum 
        PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *));
 
 /* fcc_errs.c */
-krb5_error_code INTERFACE krb5_fcc_interpret 
+krb5_error_code krb5_fcc_interpret 
        PROTOTYPE((krb5_context, int ));
 
 /* fcc_maybe.c */
-krb5_error_code INTERFACE krb5_fcc_close_file 
+krb5_error_code krb5_fcc_close_file 
        PROTOTYPE((krb5_context, krb5_ccache));
-krb5_error_code INTERFACE krb5_fcc_open_file 
+krb5_error_code krb5_fcc_open_file 
        PROTOTYPE((krb5_context, krb5_ccache, int));
 
 #endif /* KRB5_FCC_PROTO__ */
index 43d8525dc0777e211792404636a742d02ed65991..b93e162202472249165c4f79107d8736107b7750 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "fcc.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_interpret(context, errnum)
    krb5_context context;
 int errnum;
index 43579aafe3b4c81a74d3901c701dde58f6a05e1d..6378d68012c6dbbc6a7d8ac777fbd6c502310fb4 100644 (file)
@@ -183,7 +183,7 @@ int lockunlock;
 #endif
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_close_file (context, id)
    krb5_context context;
     krb5_ccache id;
@@ -204,7 +204,7 @@ krb5_fcc_close_file (context, id)
      return (ret == -1) ? krb5_fcc_interpret (context, errno) : 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_open_file (context, id, mode)
    krb5_context context;
     krb5_ccache id;
index ae8052c06c057903eb6761d2f2ec8aa9ea479427..e963d9eb71e3bff8388f461efc10255d61102c96 100644 (file)
@@ -40,7 +40,7 @@
  * KRB5_CC_END - there were not len bytes available
  * system errors (read)
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read(context, id, buf, len)
    krb5_context context;
    krb5_ccache id;
@@ -75,7 +75,7 @@ krb5_fcc_read(context, id, buf, len)
  * KRB5_CC_NOMEM
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_principal(context, id, princ)
    krb5_context context;
    krb5_ccache id;
@@ -146,7 +146,7 @@ krb5_fcc_read_principal(context, id, princ)
     return kret;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_addrs(context, id, addrs)
    krb5_context context;
    krb5_ccache id;
@@ -189,7 +189,7 @@ krb5_fcc_read_addrs(context, id, addrs)
      return kret;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_keyblock(context, id, keyblock)
    krb5_context context;
    krb5_ccache id;
@@ -238,7 +238,7 @@ krb5_fcc_read_keyblock(context, id, keyblock)
      return kret;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_data(context, id, data)
    krb5_context context;
    krb5_ccache id;
@@ -276,7 +276,7 @@ krb5_fcc_read_data(context, id, data)
      return kret;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_addr(context, id, addr)
    krb5_context context;
    krb5_ccache id;
@@ -316,7 +316,7 @@ krb5_fcc_read_addr(context, id, addr)
      return kret;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_int32(context, id, i)
    krb5_context context;
    krb5_ccache id;
@@ -343,7 +343,7 @@ krb5_fcc_read_int32(context, id, i)
     }
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_ui_2(context, id, i)
    krb5_context context;
    krb5_ccache id;
@@ -365,7 +365,7 @@ krb5_fcc_read_ui_2(context, id, i)
     }
 }    
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_octet(context, id, i)
    krb5_context context;
    krb5_ccache id;
@@ -375,7 +375,7 @@ krb5_fcc_read_octet(context, id, i)
 }    
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_times(context, id, t)
    krb5_context context;
    krb5_ccache id;
@@ -410,7 +410,7 @@ errout:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_authdata(context, id, a)
    krb5_context context;
     krb5_ccache id;
@@ -456,7 +456,7 @@ krb5_fcc_read_authdata(context, id, a)
      return kret;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_read_authdatum(context, id, a)
    krb5_context context;
     krb5_ccache id;
index f4db9b3f89b8f414caf54412f5e0db4699f9ea55..15aa43bd227c0576ea9b47146baa77115a62a08e 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "fcc.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_skip_principal(context, id)
    krb5_context context;
    krb5_ccache id;
index e433bff7a945cd68b533eacfa5e1e377d052c6ae..38067b5f50c1ea630ca9dd29934bb3b6bc213cad 100644 (file)
@@ -41,7 +41,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_write(context, id, buf, len)
    krb5_context context;
    krb5_ccache id;
@@ -72,7 +72,7 @@ krb5_fcc_write(context, id, buf, len)
  * system errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_principal(context, id, princ)
    krb5_context context;
    krb5_ccache id;
@@ -111,7 +111,7 @@ krb5_fcc_store_principal(context, id, princ)
     return KRB5_OK;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_addrs(context, id, addrs)
    krb5_context context;
    krb5_ccache id;
@@ -138,7 +138,7 @@ krb5_fcc_store_addrs(context, id, addrs)
      return KRB5_OK;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_keyblock(context, id, keyblock)
    krb5_context context;
    krb5_ccache id;
@@ -159,7 +159,7 @@ krb5_fcc_store_keyblock(context, id, keyblock)
      return krb5_fcc_write(context, id, (char *) keyblock->contents, keyblock->length);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_addr(context, id, addr)
    krb5_context context;
    krb5_ccache id;
@@ -175,7 +175,7 @@ krb5_fcc_store_addr(context, id, addr)
 }
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_data(context, id, data)
    krb5_context context;
    krb5_ccache id;
@@ -188,7 +188,7 @@ krb5_fcc_store_data(context, id, data)
      return krb5_fcc_write(context, id, data->data, data->length);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_int32(context, id, i)
    krb5_context context;
    krb5_ccache id;
@@ -213,7 +213,7 @@ krb5_fcc_store_int32(context, id, i)
     }
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_ui_2(context, id, i)
    krb5_context context;
     krb5_ccache id;
@@ -236,7 +236,7 @@ krb5_fcc_store_ui_2(context, id, i)
     }
 }
    
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_octet(context, id, i)
    krb5_context context;
     krb5_ccache id;
@@ -248,7 +248,7 @@ krb5_fcc_store_octet(context, id, i)
     return krb5_fcc_write(context, id, (char *) &ibuf, 1);
 }
    
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_times(context, id, t)
    krb5_context context;
    krb5_ccache id;
@@ -273,7 +273,7 @@ krb5_fcc_store_times(context, id, t)
     }
 }
    
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_authdata(context, id, a)
    krb5_context context;
     krb5_ccache id;
@@ -297,7 +297,7 @@ krb5_fcc_store_authdata(context, id, a)
     return KRB5_OK;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_fcc_store_authdatum (context, id, a)
    krb5_context context;
     krb5_ccache id;
index 5fda9a66de5fef928a6220f24a56c8de5fa730a2..f6f311ffcc7596d1c28780bda1a1439d571fbe74 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 16:32:12 1995 Keith Vetter (keithv@fusion.com)
+
+       * scc_genn.c: __STDC__ conditional also checks the _WINDOWS define.
+
 Sat Mar 25 14:42:37 1995  Tom Yu  (tlyu@dragons-lair)
 
        * scc_maybe.c (krb5_scc_open_file): fixed typo (extra & in
index 0172f4d1e3b3cac6005cb718c2212efd62eab29d..7e4e8dba7461e4804f912f5c06e15ae0adc15314 100644 (file)
@@ -86,7 +86,7 @@ krb5_scc_generate_new (context, id)
      strcpy(((krb5_scc_data *) lid->data)->filename, scratch);
 
      /* Make sure the file name is useable */
-#if defined(__STDC__)
+#if defined(__STDC__) || defined(_WINDOWS)
      f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+");
 #else
      f = fopen (((krb5_scc_data *) lid->data)->filename, "w+");
index 8938b0daa7efa1f5eaa5c92b5ce06490dcee7815..210218b33324a7938309448f96bef653f1923251 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 16:36:10 1995 Keith Vetter (keithv@fusion.com)
+
+       * Makefile.in: clean target was cleaning too much for the PC.
+
 Wed Apr 5 16:29:25 1995 Keith Vetter (keithv@fusion.com)
 
        * krb5_err.et: added KRB5_REALM_CANT_RESOLVE for more precise 
index cbcbed0682802ec2d6fb3336b3308194a9ab0161..a007cbed5130c931391e0032056e9f97ae6d516c 100644 (file)
@@ -70,9 +70,9 @@ kv5m_err.$(OBJEXT): kv5m_err.c
 
 clean:: clean-$(WHAT)
 
-clean-unix::
+clean-unix:: clean-hdrs
        $(RM) $(HDRS) $(ETSRCS)
-clean-mac:
+clean-mac:: clean-hdrs
        $(RM) $(HDRS) $(ETSRCS)
 clean-windows::
 
@@ -84,7 +84,7 @@ includes:: $(HDRS)
                (set -x; rm -f $(EHDRDIR)/$$x;  cp $$x $(EHDRDIR)/$$x) \
        fi; done
 
-clean::
+clean-hdrs::
        for x in $(HDRS); do \
                rm -f $(EHDRDIR)/$$x; \
        done
index ecc7923f98432b63bea8ac04f75a24e8963d06c3..6f444bb60fca0d391561bc56f00db078ac6bbba6 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Fri Mar 17 19:45:01 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (LDFLAGS):  Elim duplicate.
index 6da52acfe3e6921a47e8202cd00d6d0d4c98ad1a..d8f58b767e7ad206a627cb9b5ce6e3b907c2c1f7 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_address(context, val)
     krb5_context context;
     krb5_address *val;
index 5d608b64e1de5336e1ee5dc2db44a178d66c7d22..0301af16299b8642beaababd35713b4797a5dad3 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_ap_rep(context, val)
     krb5_context context;
     register krb5_ap_rep *val;
index 1990494424027187e60f159dd650c0113fcd8377..1b9a93a7eb9ac74d72cd9e4204fa97d083e076b8 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_ap_req(context, val)
     krb5_context context;
     register krb5_ap_req *val;
index be51d88a248fd7e703e6e6c3ff8db69f8053271a..d061f26f9d61d55c54c1d6fd66568fdaea272df6 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_authenticator_contents(context, val)
     krb5_context context;
     krb5_authenticator *val;
index ccaf918a8038e1891518dc8ed0aa91994468eda1..fba8dd319263aca76bb2b21c7b87312f404d3063 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_authdata(context, val)
     krb5_context context;
 krb5_authdata **val;
index 60ef9017fb2f894cc9c830acfb095bebafbb2e61..f4d1c065956e8f084c41035f2905c98f29e1bb92 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_authenticator(context, val)
     krb5_context context;
     krb5_authenticator *val;
index 9149ce22e7cc994cb26702a4b5873454e2be8f6b..beab7450be6e6e192ffe1f3e5a84843d318f913b 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_checksum(context, val)
     krb5_context context;
     register krb5_checksum *val;
index df6436c5b71bb4fdb342dd606ddea8e81fd55a9e..7cc2a9a97ba74ccaf17a8c039dee190986dbcc77 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_cred(context, val)
     krb5_context context;
     register krb5_cred *val;
index 60e0b1ee2de36eea29292b7eb1f309fd577beb00..d14b3d861b94227756d29910f2bb4a7f7c280955 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE 
+void 
 krb5_free_cred_enc_part(context, val)
     krb5_context context;
     register krb5_cred_enc_part *val;
index 20fa9a86e11a13e876955f44f42b745e1f1d09ff..102237674fdfcc2e1629b447c464b74161ea8b08 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_enc_kdc_rep_part(context, val)
     krb5_context context;
     register krb5_enc_kdc_rep_part *val;
index d2cddf0d3d399b03868b9db0d74ac5cba5aed569..3c2aa3ae4d8c1f44dd43c46170156d4da786d3d3 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_enc_tkt_part(context, val)
     krb5_context context;
     krb5_enc_tkt_part *val;
index 29a0541d6cd040a9f0611e994b2b91dcd15421ea..a24a6c40941a6678f3b71a735911d5729124fc89 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_error(context, val)
     krb5_context context;
     register krb5_error *val;
index 21fbb6c7b7a587562a1fec8a9950d5fbee089347..aba2fff316bc69157c9868f4c950be27d050a5bf 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_kdc_rep(context, val)
     krb5_context context;
 krb5_kdc_rep *val;
index d8f1716096c91b752ed3fa6b81553d48e0c5e2f3..0e0ca640e696ef47e714cfbcbd394f9db8763da6 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_kdc_req(context, val)
     krb5_context context;
     krb5_kdc_req *val;
index 6a513f18290b5658c5e789009cd1f4b5dc5a8130..6051657191deb65c20fa42a586fcc0d98201e75d 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_keyblock(context, val)
     krb5_context context;
     register krb5_keyblock *val;
index 3e01f9608cc5e9c70668f8c157082320a9f675e7..278b6f4b7a984d9bc3f909e581c40c3cec91f547 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_last_req(context, val)
     krb5_context context;
     krb5_last_req_entry **val;
index cd2af53571b553505c0a1c26ebd30a3c13374c41..9540014519ca701a6fb3a820b479c23922f3c203 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_pa_data(context, val)
     krb5_context context;
     krb5_pa_data **val;
index 5a47f3ec3a445a513c74a55020afe42729d294e6..06861421af5ebcdab2fcb000312f81e75b8af524 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_priv(context, val)
     krb5_context context;
 register krb5_priv *val;
index 95dcde5394ba34196e8f244692519891651718d7..8e25602bb2986d0c78ae3c24ee9ab96552093656 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_priv_enc_part(context, val)
     krb5_context context;
     register krb5_priv_enc_part *val;
index 54240d242031d0ec30d6c5951b5b61c4a57a32c4..2a92336b324deb90117869ce706395d899edbbc8 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_pwd_data(context, val)
     krb5_context context;
 krb5_pwd_data *val;
index 70da746f9b5b193106f186d02b8ebd523e389fa7..436fb68307a4e908e11f94e162b720b623a125cc 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_pwd_sequences(context, val)
     krb5_context context;
     passwd_phrase_element **val;
index 9ca750e214099fa12ddc1d85cef1fa1bbf0efd65..11a3159f4a9cfffa4b59db95f0b3ec84d268fbac 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_safe(context, val)
     krb5_context context;
     register krb5_safe *val;
index 94f26b3b1eb5a1b04fecef430dc4db84c88b5675..8344345eb904583608806aaae00ff2e1b77902ba 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_ticket(context, val)
     krb5_context context;
     krb5_ticket *val;
index 89a7d7cf2e888410819afa7cbd377b4671b64b99..1a1af1e18928278f1d7def70b50ed45d4f48bf68 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_tickets(context, val)
     krb5_context context;
     krb5_ticket **val;
index 0dbffd2c0832c0a032515c483aca9ddb07626188..ddf726826b8627c10f43b0cf2d6dc66cb6b1e452 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_tgt_creds(context, tgts)
     krb5_context context;
     krb5_creds **tgts;
index 7aaf723c94191e6ab459c4e73c4ff842f495ec29..2ef99f482761517ff1b014c5c201fc75fcd3c5fe 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_tkt_authent(context, val)
     krb5_context context;
     krb5_tkt_authent *val;
index d6b9d5f48cde006cc8de99577a2daa008023e8f3..97ee383e09234cdcdf5b3a3032327f13b463b047 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.c: removed unneeded INTERFACE from non-api functions.
+
 Fri Mar 17 19:46:07 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (LDFLAGS):  Zap duplicate defn.
index e224a9a922aba8d162bb383ac75d2f8913b99584..47da64df36f450b63675dfe7f1608a0fbcff41a1 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Fri Mar 17 19:46:49 1995  John Gilmore  (gnu at toad.com)
 
        * Makefile.in (LDFLAGS):  Zap duplicate.
index a1cad2a3f6fb6bfd7e47d78827b27489f6b32507..0de762918302cd7bf94a2f088d43abcd497ba187 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_add(context, id, entry)
    krb5_context context;
    krb5_keytab id;
index a59a796cc018a169000ad90e9728092f123b498a..93ee92e680edf162f08f5f1cf5b6fe786d89c591 100644 (file)
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_close(context, id)
     krb5_context context;
   krb5_keytab id;
index 714e4b7b71ee12e02d87e1b0c5276ae6966ec038..25ef4de7e0a7019d0843470b72b6f393461ea51c 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_end_get(context, id, cursor)
     krb5_context context;
 krb5_keytab id;
index 591a887abb664631007a5f1a8d4987b1cc33686d..a296720ce8e60b5045ab66cf585082795ea98008 100644 (file)
@@ -29,7 +29,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry)
    krb5_context context;
    krb5_keytab id;
index 86f6159e91f3b5eb2921118dbc58bb265e4354f6..a8f27c4746e9c52cdc6ba6d63ab02eaf2bce6460 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_get_name(context, id, name, len)
     krb5_context context;
   krb5_keytab id;
index eb3ecc35a9d733f9c38e6bab749877787d358a7e..da23bb93467cbe95a90022bb8eff3573213fb3f2 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_get_next(context, id, entry, cursor)
     krb5_context context;
 krb5_keytab id;
index b3ddd75b1fb8130d70123e7a1634d48b945896e5..93704300ac9d00ef53af607094ff7e11c00ea781 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_remove(context, id, entry)
     krb5_context context;
 krb5_keytab id;
index bd304d943e13ff7c904ce8c4d5442a3e37f3b87a..e9e3827a679051d9732eaeb4f4cc6c67f2bf8b5e 100644 (file)
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_resolve(context, name, id)
     krb5_context context;
   const char *name;
index b00a3f8c3990ce1d13e35e9b53afd17f2c1b3e3f..67e3bb6490f55fdb595feff0dda6f212be0b4f58 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_start_seq_get(context, id, cursorp)
     krb5_context context;
 krb5_keytab id;
index 84f3f0c20a5dad8895921e80542c7962cc616784..fa79ef0a06267cfbde5825b20db28d934c08b9d5 100644 (file)
@@ -160,7 +160,7 @@ int mode;
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_openr(context, id)
     krb5_context context;
 krb5_keytab id;
@@ -168,7 +168,7 @@ krb5_keytab id;
     return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_SHARED);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_openw(context, id)
     krb5_context context;
 krb5_keytab id;
@@ -176,7 +176,7 @@ krb5_keytab id;
     return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_EXCLUSIVE);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_close(context, id)
     krb5_context context;
 krb5_keytab id;
@@ -191,7 +191,7 @@ krb5_keytab id;
     return kerror;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_delete_entry(context, id, delete_point)
     krb5_context context;
 krb5_keytab id;
@@ -244,7 +244,7 @@ krb5_int32 delete_point;
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_internal_read_entry(context, id, ret_entry, delete_point)
     krb5_context context;
 krb5_keytab id;
@@ -452,7 +452,7 @@ fail:
     return error;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_read_entry(context, id, entryp)
     krb5_context context;
 krb5_keytab id;
@@ -463,7 +463,7 @@ krb5_keytab_entry *entryp;
     return krb5_ktfileint_internal_read_entry(context, id, entryp, &delete_point);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_write_entry(context, id, entry)
     krb5_context context;
 krb5_keytab id;
@@ -609,7 +609,7 @@ krb5_keytab_entry *entry;
  * Determine the size needed for a file entry for the given
  * keytab entry.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_size_entry(context, entry, size_needed)
     krb5_context context;
 krb5_keytab_entry *entry;
@@ -651,7 +651,7 @@ krb5_int32 *size_needed;
  * to commit the write, but that this field must indicate the size of the
  * block in the file rather than the size of the actual entry)  
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfileint_find_slot(context, id, size_needed, commit_point)
     krb5_context context;
 krb5_keytab id;
index 7845a6b58dd4137791485c578f8b62f142f2276c..684f8d55816a57d412cc7dbb054bbfddb0f550bc 100644 (file)
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktfile.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_ktfile_wresolve(context, name, id)
     krb5_context context;
   const char *name;
index 4bb7e1dc5f21f49b2e26258e330153a0b164bb82..c1c55dc88f7b279eaeec94fe56c9f4456705b45b 100644 (file)
@@ -61,27 +61,27 @@ typedef struct _krb5_ktfile_data {
 extern struct _krb5_kt_ops krb5_ktf_ops;
 extern struct _krb5_kt_ops krb5_ktf_writable_ops;
 
-krb5_error_code INTERFACE krb5_ktfile_resolve 
+krb5_error_code krb5_ktfile_resolve 
        PROTOTYPE((krb5_context,
                   const char *,
                   krb5_keytab *));
 
-krb5_error_code INTERFACE krb5_ktfile_wresolve 
+krb5_error_code krb5_ktfile_wresolve 
        PROTOTYPE((krb5_context,
                   const char *,
                   krb5_keytab *));
 
-krb5_error_code INTERFACE krb5_ktfile_get_name 
+krb5_error_code krb5_ktfile_get_name 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   char *,
                   int));
 
-krb5_error_code INTERFACE krb5_ktfile_close 
+krb5_error_code krb5_ktfile_close 
        PROTOTYPE((krb5_context,
                   krb5_keytab));
 
-krb5_error_code INTERFACE krb5_ktfile_get_entry 
+krb5_error_code krb5_ktfile_get_entry 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_principal,
@@ -89,72 +89,72 @@ krb5_error_code INTERFACE krb5_ktfile_get_entry
                   krb5_keytype,
                   krb5_keytab_entry *));
 
-krb5_error_code INTERFACE krb5_ktfile_start_seq_get 
+krb5_error_code krb5_ktfile_start_seq_get 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_kt_cursor *));
 
-krb5_error_code INTERFACE krb5_ktfile_get_next 
+krb5_error_code krb5_ktfile_get_next 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *,
                   krb5_kt_cursor *));
 
-krb5_error_code INTERFACE krb5_ktfile_end_get 
+krb5_error_code krb5_ktfile_end_get 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_kt_cursor *));
 
 /* routines to be included on extended version (write routines) */
-krb5_error_code INTERFACE krb5_ktfile_add 
+krb5_error_code krb5_ktfile_add 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *));
 
-krb5_error_code INTERFACE krb5_ktfile_remove 
+krb5_error_code krb5_ktfile_remove 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *));
 
-krb5_error_code INTERFACE krb5_ktfileint_openr 
+krb5_error_code krb5_ktfileint_openr 
        PROTOTYPE((krb5_context,
                   krb5_keytab));
 
-krb5_error_code INTERFACE krb5_ktfileint_openw 
+krb5_error_code krb5_ktfileint_openw 
        PROTOTYPE((krb5_context,
                   krb5_keytab));
 
-krb5_error_code INTERFACE krb5_ktfileint_close 
+krb5_error_code krb5_ktfileint_close 
        PROTOTYPE((krb5_context,
                   krb5_keytab));
 
-krb5_error_code INTERFACE krb5_ktfileint_read_entry 
+krb5_error_code krb5_ktfileint_read_entry 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *));
 
-krb5_error_code INTERFACE krb5_ktfileint_write_entry 
+krb5_error_code krb5_ktfileint_write_entry 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *));
 
-krb5_error_code INTERFACE krb5_ktfileint_delete_entry 
+krb5_error_code krb5_ktfileint_delete_entry 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                    krb5_int32));
 
-krb5_error_code INTERFACE krb5_ktfileint_internal_read_entry 
+krb5_error_code krb5_ktfileint_internal_read_entry 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *,
                    krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_ktfileint_size_entry 
+krb5_error_code krb5_ktfileint_size_entry 
        PROTOTYPE((krb5_context,
                   krb5_keytab_entry *,
                    krb5_int32 *));
 
-krb5_error_code INTERFACE krb5_ktfileint_find_slot 
+krb5_error_code krb5_ktfileint_find_slot 
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                    krb5_int32 *,
index 7656c7e95d6331edeef3c0a3922d9a0093176440..56d31028c2d24b49b34119cf6fc3d98baf67816d 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_add_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
index 97ea1a03eab1246f162fb9ff21d929ba6835ff82..4f9869d173a826e4d6df8deac81d70fd42bc78c1 100644 (file)
@@ -39,7 +39,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl;
  * don't replace if it already exists; return an error instead.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_register(context, ops)
     krb5_context context;
     krb5_kt_ops *ops;
@@ -68,7 +68,7 @@ krb5_kt_register(context, ops)
  * particular keytab type.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_resolve (context, name, ktid)
     krb5_context context;
     const char *name;
index 195d0ca031475f566e264cc8adeb4bd9fa2283c8..8681535533bc05549d136335952c4ebbeee2bc0d 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_default(context, id)
     krb5_context context;
     krb5_keytab *id;
index e573d4031480c3461665ae36153c4cf78e3cc295..5aaa7751292282a99f23cf9bac5f3740374fbfd3 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_free_entry (context, entry)
     krb5_context context;
     krb5_keytab_entry *entry;
index 928d6aa85d35ca8f5eac50579357b54a4ac05ee2..377c4a0a7d63670bdac62290c26e93b413635d34 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_remove_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
index 90315dda166865249dfd87709faf4ec865ed8e72..bd9331ece50358e5a10874bd8799bc3dd25d4700 100644 (file)
@@ -40,7 +40,7 @@
  * returns: Either KSUCCESS or error code.
  * errors: error code if not found or keyprocarg is invalid.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key)
     krb5_context context;
     krb5_pointer keyprocarg;
index c591d110ef81fe546d10a1e81e08a11d786ad2ec..7dd6e6a5a0e8b32b12ead561c36aa7451b44732f 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Fri Mar 31 16:45:47 1995 Keith Vetter (keithv@fusion.com)
 
        * krb5_get_in_tkt: changed error return value for when clocks
index f63ea0205e9ea629e8ef0e9263da2c1219e7ebb8..661f6960e2672dbf855866c41b1a0bc2f5244d4e 100644 (file)
@@ -29,7 +29,7 @@
 /*
  * If the two addresses are the same, return TRUE, else return FALSE
  */
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_address_compare(context, addr1, addr2)
     krb5_context context;
     const krb5_address *addr1;
index c872c52c68612cba0a324d3997104a62a8d111bd..757f7bf52e866e817bba96427a9e580c503d94c8 100644 (file)
@@ -34,7 +34,7 @@
  * Return an ordering on two addresses:  0 if the same,
  * < 0 if first is less than 2nd, > 0 if first is greater than 2nd.
  */
-int INTERFACE
+int
 krb5_address_order(context, addr1, addr2)
     krb5_context context;
     register const krb5_address *addr1;
index 2e112ea8c49a6235ec0e9623fc5a68bbeb8ebd1b..d30b68cd1e29049b0776d24c2825512905da133c 100644 (file)
@@ -30,7 +30,7 @@
  * if addr is listed in addrlist, or addrlist is null, return TRUE.
  * if not listed, return FALSE
  */
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_address_search(context, addr, addrlist)
     krb5_context context;
     const krb5_address *addr;
index ebf72a7904b9857fe251fb41d60d7d37066ea551..134e07ba5d906b9bd16724cfb948f03af818959b 100644 (file)
@@ -2,7 +2,7 @@
 #include "k5-int.h"
 #include "auth_con.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_init(context, auth_context)
     krb5_context         context;
     krb5_auth_context  ** auth_context;
@@ -21,7 +21,7 @@ krb5_auth_con_init(context, auth_context)
     return ENOMEM;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_free(context, auth_context)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -38,7 +38,7 @@ krb5_auth_con_free(context, auth_context)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -51,7 +51,7 @@ krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
 }
 
 /* XXX this call is a hack. Fixed when I do the servers. */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setkey(context, auth_context, keyblock)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -69,7 +69,7 @@ krb5_auth_con_setkey(context, auth_context, keyblock)
  * Once decrypted this key is no longer necessary and is then overwritten
  * with the session key sent by the client.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -80,7 +80,7 @@ krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     return(krb5_copy_keyblock(context, keyblock, &(auth_context->keyblock)));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getkey(context, auth_context, keyblock)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -92,7 +92,7 @@ krb5_auth_con_getkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -104,7 +104,7 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -116,7 +116,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setcksumtype(context, auth_context, cksumtype)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -126,7 +126,7 @@ krb5_auth_con_setcksumtype(context, auth_context, cksumtype)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -136,7 +136,7 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getauthenticator(context, auth_context, authenticator)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -146,7 +146,7 @@ krb5_auth_con_getauthenticator(context, auth_context, authenticator)
                                    authenticator));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -156,7 +156,7 @@ krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_initivector(context, auth_context)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -174,7 +174,7 @@ krb5_auth_con_initivector(context, auth_context)
     return EINVAL; /* XXX need an error for no keyblock */
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setivector(context, auth_context, ivector)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -184,7 +184,7 @@ krb5_auth_con_setivector(context, auth_context, ivector)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getivector(context, auth_context, ivector)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -194,7 +194,7 @@ krb5_auth_con_getivector(context, auth_context, ivector)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setflags(context, auth_context, flags)
     krb5_context         context;
     krb5_auth_context  * auth_context;
@@ -204,7 +204,7 @@ krb5_auth_con_setflags(context, auth_context, flags)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setrcache(context, auth_context, rcache)
     krb5_context         context;
     krb5_auth_context  * auth_context;
index 289a0bf3a4da23660a610cc266c87246235b05c6..d2dc46949e6d1b9abd277d1aa77c8b23c4feac26 100644 (file)
@@ -33,7 +33,7 @@
 #include <varargs.h>
 #endif
 
-krb5_error_code INTERFACE_C
+krb5_error_code
 krb5_build_principal_va(context, princ, rlen, realm, ap)
     krb5_context context;
     krb5_principal princ;
@@ -96,7 +96,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap)
     return 0;
 }
 
-krb5_error_code INTERFACE_C
+krb5_error_code
 #ifdef HAVE_STDARG_H
 krb5_build_principal(krb5_context context,  krb5_principal * princ, int rlen,
     const char * realm, ...)
index 215991560e69f01c125b228947c554e1f148c001..75794e81512f6169e5a7991326a939ffe09f91a3 100644 (file)
@@ -25,7 +25,7 @@
 
 #define MAX_REALM_LN 500
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_check_transited_list(context, trans, realm1, realm2)
     krb5_context context;
 krb5_data      *trans;
index e1b90c927b39fcf1c6f74e68d6ae2b8ae295e47d..e76bf9b88d750e625349f1ace6fef604b858fe75 100644 (file)
@@ -99,7 +99,7 @@ static char *strnchr(s, c, n)
 /* XXX This calls for a new error code */
 #define KRB5_INVALID_PRINCIPAL KRB5_LNAME_BADFORMAT
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_524_conv_principal(context, princ, name, inst, realm)
     krb5_context context;
     const krb5_principal princ;
@@ -167,7 +167,7 @@ krb5_524_conv_principal(context, princ, name, inst, realm)
      return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_425_conv_principal(context, name, instance, realm, princ)
    krb5_context context;
    const char  *name;
index 29c97cecd01356c5d69e3368bda16d017b5548d3..fa37731032269318cd84ecf6d2f6e949a3eb7ad5 100644 (file)
@@ -49,7 +49,7 @@ krb5_address **outad;
 /*
  * Copy an address array, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_addresses(context, inaddr, outaddr)
     krb5_context context;
     krb5_address * const * inaddr;
@@ -87,7 +87,7 @@ krb5_copy_addresses(context, inaddr, outaddr)
  * Note that this function may change the value of *outaddr even if it
  * returns failure, but it will not change the contents of the list.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_append_addresses(context, inaddr, outaddr)
     krb5_context context;
        krb5_address * const * inaddr;
index 826db0e6f7983cfffa16f0ae1a8ade45efac9107..5523f3134c1bc0ad8f938378ae52d6b2ea5652e4 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_authenticator(context, authfrom, authto)
     krb5_context context;
 const krb5_authenticator *authfrom;
index 993d084171aceadde7adecc2acb71a77ee6297af..23c91dc28ec0ef4d59dd4f330d589415d1bf689c 100644 (file)
@@ -49,7 +49,7 @@ krb5_authdata **outad;
 /*
  * Copy an authdata array, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_authdata(context, inauthdat, outauthdat)
     krb5_context context;
 krb5_authdata * const * inauthdat;
index c7ebb8cb7fa57d926c9de31925c579cd477721f2..4d8d3efc6d260a0a6e540f64c63ddcd6b428395d 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_checksum(context, ckfrom, ckto)
     krb5_context context;
     const krb5_checksum *ckfrom;
index 264ca5143e14f99bfc9cfd645589a4ef4b90dc35..1b58af91413d05820295e0e3f4ce1bab444a3920 100644 (file)
@@ -30,7 +30,7 @@
  * Copy credentials, allocating fresh storage where needed.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_creds(context, incred, outcred)
     krb5_context context;
     const krb5_creds *incred;
index fedf2dca71a68caaab3ca7e9e29b6511c6fd32fa..e9dd229a0e78e786af847c73dec764c7520aca4b 100644 (file)
@@ -29,7 +29,7 @@
 /*
  * Copy a data structure, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_data(context, indata, outdata)
     krb5_context context;
     const krb5_data *indata;
index 6e367d4de50fbe54a87bb7777db0f9c03293aa46..065b66ef828351fd30d9bc569117e31a45847a09 100644 (file)
@@ -29,7 +29,7 @@
 /*
  * Copy a keyblock, including alloc'ed storage.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_keyblock(context, from, to)
     krb5_context context;
     const krb5_keyblock *from;
index 4e7fb99980edb384c3765d37dcda0f7ca66bb2cf..d8e47de2f98fe42492cb8efcb1c685718c3d6045 100644 (file)
@@ -29,7 +29,7 @@
 /*
  * Copy a principal structure, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_principal(context, inprinc, outprinc)
     krb5_context context;
     krb5_const_principal inprinc;
index b1e05e83da7d4ef0c1b0602892199819a1b3f845..3d9b99a995328bc535ee916e03302c4135bc21a5 100644 (file)
@@ -91,7 +91,7 @@ krb5_copy_enc_tkt_part(context, partfrom, partto)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_ticket(context, from, pto)
     krb5_context context;
     const krb5_ticket *from;
index b4afc2ea1cd3d8094c4b1b307c88c107284137a0..fd32cae1548517ab4deb4a9540495222b6a9b7ef 100644 (file)
@@ -29,7 +29,7 @@
 /*
  * Copy a keyblock, including alloc'ed storage.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_keyblock_contents(context, from, to)
     krb5_context context;
     const krb5_keyblock *from;
index 007b2ab155cbedd0f01db2eacc53c87f0e632fab..642de5b0846dd82f638b3ede093e80797c1f0028 100644 (file)
@@ -39,7 +39,7 @@
  returns errors from encryption routines, system errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_decode_kdc_rep(context, enc_rep, key, etype, dec_rep)
     krb5_context context;
     krb5_data * enc_rep;
index 330712466ea1d779cdcc46b7626788ebe3a3857b..3777ffa6b4be7cf65cacd26cb682f9004e38b169 100644 (file)
@@ -35,7 +35,7 @@
 
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_decrypt_tkt_part(context, srv_key, ticket)
     krb5_context context;
     const krb5_keyblock *srv_key;
index 5b72dc4f10ae6ed06df9ae47d3b021fb02427bc3..a4d0edb325f56c2f5828ac9dc37ef7ba78aba76e 100644 (file)
@@ -40,7 +40,7 @@
 */
 /* due to argument promotion rules, we need to use the DECLARG/OLDDECLARG
    stuff... */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_encode_kdc_rep(context, type, encpart, eblock, client_key, dec_rep, enc_rep)
     krb5_context context;
     const krb5_msgtype type;
index 65cbd744d1dfac197f7e279324320fe0253655d9..101b6b7dc2b4dc82944a893e75c513c0b3b5af06 100644 (file)
@@ -38,7 +38,7 @@
  enc_part->ciphertext.data allocated & filled in with encrypted stuff
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_encrypt_tkt_part(context, eblock, srv_key, dec_ticket)
     krb5_context context;
     krb5_encrypt_block *eblock;
index 1afb65af53c11e27a00890a3288a98e67c155a28..629499366644ff19830adcf956c42a3ab390817d 100644 (file)
@@ -34,7 +34,7 @@
  * Return an ordering on the two full addresses:  0 if the same,
  * < 0 if first is less than 2nd, > 0 if first is greater than 2nd.
  */
-int INTERFACE
+int
 krb5_fulladdr_order(context, addr1, addr2)
     krb5_context context;
     register const krb5_fulladdr *addr1;
index b3b70e4807f429786d7f1f6d30e938130372d52e..58492710ec957e19fea3f3347db057f9dc89e3cf 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_realm_tree(context, realms)
     krb5_context context;
     krb5_principal *realms;
index 5689f1eaf2e1c7b4efb3255cd7b3209037a8334a..9f9106fc06d66f152d0a3ca2264e56a32be7412a 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "int-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_via_2tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred)
     krb5_context context;
     krb5_creds *tgt;
index daf14caf49c3412ba34fde9ff18e5920cd346a0f..30e278d38ca1baf89739929e74d76e28df1897b1 100644 (file)
@@ -63,7 +63,7 @@ extern krb5_cksumtype krb5_kdc_req_sumtype;
 #define TGT_ETYPE \
       krb5_keytype_array[tgt.keyblock.keytype]->system->proto_enctype;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_from_kdc(context, ccache, in_cred, out_cred, tgts)
     krb5_context context;
     krb5_ccache ccache;
index de9dae52b20ddcb8f5f1d846fe7eeb50b0855616..c0d31c25d0b660a6cd013d03ae9e1cf21f5c7fcf 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "int-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_via_tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred)
     krb5_context context;
     krb5_creds * tgt;
index 4befc40af235515353e8e98721df6236df52f7ca..ec6e032c6542c6d3786df1b5fe34a696bdf0d0b0 100644 (file)
@@ -32,7 +32,7 @@
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_generate_seq_number(context, key, seqno)
     krb5_context context;
     const krb5_keyblock *key;
index a326f2f43ed61492bc7b99df3d691fb6d93a91c1..bd8ae4bb458aa36f39ed097e50c5671de3b9fe09 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_generate_subkey(context, key, subkey)
     krb5_context context;
     const krb5_keyblock *key;
index e0a263049b1eabbf4b34182b31aa0f7e2962ab2e..7c080222c144c467dddaf80def4e4a3eac672046 100644 (file)
@@ -39,7 +39,7 @@
 #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK)
 
 /* Get a TGT for use at the remote host */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_for_creds(context, sumtype, rhost, client, enc_key, 
                   forwardable, outbuf)
     krb5_context context;
index 42dcdb4b82fe840d58c9bdf4d473be1ee24b6fac..ed340874842e69098d18bd409d6f285b752bf72d 100644 (file)
@@ -60,17 +60,17 @@ extern krb5_deltat krb5_clockskew;
 
 /* some typedef's for the function args to make things look a bit cleaner */
 
-typedef krb5_error_code (INTERFACE *git_key_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context,
                                                   const krb5_keytype,
                                                   krb5_data *,
                                                   krb5_const_pointer,
                                                   krb5_keyblock **));
 
-typedef krb5_error_code (INTERFACE *git_decrypt_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context,
                                                       const krb5_keyblock *,
                                                       krb5_const_pointer,
                                                       krb5_kdc_rep * ));
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_in_tkt(context, options, addrs, etypes, ptypes, key_proc, keyseed,
                decrypt_proc, decryptarg, creds, ccache, ret_as_reply)
     krb5_context context;
index 7b0858e444f58e852b705f629743807140ea818d..29701cc232e091a9a0e3b191eb04bd3f86724907 100644 (file)
@@ -37,14 +37,14 @@ struct keytab_keyproc_arg {
  * "keyseed" is actually a krb5_keytab, or NULL if we should fetch
  * from system area.
  */
-krb5_error_code INTERFACE keytab_keyproc
+krb5_error_code keytab_keyproc
     PROTOTYPE((krb5_context,
                const krb5_keytype,
                krb5_data *,
                krb5_const_pointer,
                krb5_keyblock **));
 
-krb5_error_code INTERFACE
+krb5_error_code
 keytab_keyproc(context, type, salt, keyseed, key)
     krb5_context context;
     const krb5_keytype type;
@@ -107,7 +107,7 @@ keytab_keyproc(context, type, salt, keyseed, key)
  returns system errors, encryption errors
 
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_in_tkt_with_keytab(context, options, addrs, etypes, pre_auth_types, 
                            keytab, ccache, creds, ret_as_reply)
     krb5_context context;
index c2880636297122a05d464c8c9a6fa85c4f773fc1..2c899bf6573e1cec4006fd84f591119173e688cd 100644 (file)
@@ -31,14 +31,14 @@ extern char *krb5_default_pwd_prompt1;
 /* 
  * key-producing procedure for use by krb5_get_in_tkt_with_password.
  */
-krb5_error_code INTERFACE pwd_keyproc
+krb5_error_code pwd_keyproc
     PROTOTYPE((krb5_context,
                const krb5_keytype,
                krb5_data *,
                krb5_const_pointer,
                krb5_keyblock **));
 
-krb5_error_code INTERFACE
+krb5_error_code
 pwd_keyproc(context, type, salt, keyseed, key)
     krb5_context context;
     const krb5_keytype type;
index b8378e1d006cf4d641fb30b8ba4f7ae6afa55a11..ab5d24ce767ec7dbc5fd68bd542b4684a7c8887a 100644 (file)
@@ -37,14 +37,14 @@ struct skey_keyproc_arg {
  * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch
  * from system area.
  */
-krb5_error_code INTERFACE skey_keyproc
+krb5_error_code skey_keyproc
     PROTOTYPE((krb5_context,
                const krb5_keytype,
                krb5_data *,
                krb5_const_pointer,
                krb5_keyblock **));
 
-krb5_error_code INTERFACE
+krb5_error_code
 skey_keyproc(context, type, salt, keyseed, key)
     krb5_context context;
     const krb5_keytype type;
@@ -94,7 +94,7 @@ skey_keyproc(context, type, salt, keyseed, key)
  returns system errors, encryption errors
 
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_in_tkt_with_skey(context, options, addrs, etypes, pre_auth_types, 
                          key, ccache, creds, ret_as_reply)
     krb5_context context;
index d137c29b4bfd2f1ee13d3fbf345e1b1293ade7ea..9daa66b85cddbca5b39437c2611c4560fe6fdf0e 100644 (file)
@@ -55,7 +55,7 @@ cleanup:
        return retval;
 }
 
-void INTERFACE
+void
 krb5_free_context(ctx)
        krb5_context    ctx;
 {
@@ -71,7 +71,7 @@ krb5_free_context(ctx)
 /*
  * Set the desired default etypes, making sure they are valid.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_set_default_in_tkt_etypes(context, etypes)
        krb5_context context;
        const krb5_enctype *etypes;
@@ -110,7 +110,7 @@ krb5_set_default_in_tkt_etypes(context, etypes)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_default_in_tkt_etypes(context, etypes)
     krb5_context context;
     krb5_enctype **etypes;
index e8dafaf00e5a1dd0b87739452da4257bef8a0adc..0a08e39cdc866fe48255db31741327a881a1106f 100644 (file)
 #ifndef KRB5_INT_FUNC_PROTO__
 #define KRB5_INT_FUNC_PROTO__
 
-krb5_error_code INTERFACE krb5_tgtname
+krb5_error_code krb5_tgtname
        PROTOTYPE((krb5_context context,
                   const krb5_data *,
                   const krb5_data *,
                   krb5_principal *));
-krb5_error_code INTERFACE krb5_get_cred_via_tgt
+krb5_error_code krb5_get_cred_via_tgt
        PROTOTYPE((krb5_context context,
                   krb5_creds *,
                   const krb5_flags,
                   const krb5_cksumtype,
                   krb5_creds *,
                   krb5_creds **));
-krb5_error_code INTERFACE krb5_get_cred_via_2tgt
+krb5_error_code krb5_get_cred_via_2tgt
        PROTOTYPE((krb5_context context,
                   krb5_creds *,
                   const krb5_flags,
index c2cdf12281228db1431a7458710c7851e7fc9c5b..881a5873d3e7f861cd9cbf03d964a1d4cf09f1f5 100644 (file)
@@ -33,7 +33,7 @@
  */
 
 /*ARGSUSED*/
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kdc_rep_decrypt_proc(context, key, decryptarg, dec_rep)
     krb5_context context;
     const krb5_keyblock * key;
index b43268056caf73042f78999af9c32cf3082140b0..12df2c88a37219f0c3cf8f4df73b516f11defac7 100644 (file)
@@ -31,7 +31,7 @@
 #include "k5-int.h"
 
 /* Create asn.1 encoded KRB-CRED message from the kdc reply. */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_cred(context, dec_rep, etype, key, sender_addr, recv_addr, outbuf)
     krb5_context context;
     krb5_kdc_rep *dec_rep;
index 4f05e75ddbaedfbed48b0c92621ecf6317e8581d..1e772e56aeae22761e745c62874df141750c600c 100644 (file)
@@ -34,7 +34,7 @@
 
  returns system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_error(context, dec_err, enc_err)
     krb5_context context;
     const krb5_error *dec_err;
index 37cf62f9150c515ee618621a91d4f95245ce83cb..6a804915bfc1e4ae151d883a9ec745c4bbf8c792 100644 (file)
@@ -133,7 +133,7 @@ clean_scratch:
 }
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
     krb5_context       context;
     krb5_auth_context *        auth_context;
index b25e67c9a090bf1551d7148d9b63795951a646b4..9d5e81e2e3d9251e4096dbfcde915f736474bf0b 100644 (file)
@@ -36,7 +36,7 @@
  returns system errors
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_rep(context, auth_context, outbuf)
     krb5_context         context;
     krb5_auth_context  * auth_context;
index 3d86741fc188e2185c3ea83dbf0165a3d69f22f1..a9884a48b10637d21ca480bf1880925325a5a385 100644 (file)
@@ -48,7 +48,7 @@
 
 extern krb5_flags krb5_kdc_default_options;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
              ccache, outbuf)
     krb5_context          context;
index 528973d1c9a4a3fb6d0b65efb0576b51b37775b3..36670edff72ca8d5ed5ad3daac28dc164254c0e5 100644 (file)
@@ -117,7 +117,7 @@ cleanup_scratch:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
     krb5_context       context;
     krb5_auth_context *        auth_context;
index 2c614d946a5ebfa70d7ed329dbb1bb8c5e984846..b8e9a1b925723a8f84e7939ed1a3f712b935846a 100644 (file)
@@ -29,7 +29,7 @@
 /*
  * Convert a krb5_principal into the default salt for that principal.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_principal2salt_internal(context, pr, ret, use_realm)
     krb5_context context;
     register krb5_const_principal pr;
@@ -71,7 +71,7 @@ krb5_principal2salt_internal(context, pr, ret, use_realm)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_principal2salt(context, pr, ret)
     krb5_context context;
     register krb5_const_principal pr;
@@ -80,7 +80,7 @@ krb5_principal2salt(context, pr, ret)
        return krb5_principal2salt_internal(context, pr, ret, 1);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_principal2salt_norealm(context, pr, ret)
     krb5_context context;
     register krb5_const_principal pr;
index 8beade6efbd237ceef67e2a00862996f1b8e5437..00c17a9a2f057e0f18045bad9ab14bb6d8019ab9 100644 (file)
@@ -76,7 +76,7 @@ static krb5_error_code find_preauthenticator
  *
  *   Note: This is a first crack at what any preauthentication will need...
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_obtain_padata(context, type, client, src_addr, encrypt_key, ret_data)
     krb5_context context;
     int type;                          /*IN:  Preauth type */
@@ -182,7 +182,7 @@ error_out:
  *   Note: This is a first crack at what any preauthentication will need...
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_verify_padata(context, data,client,src_addr, decrypt_key, req_id, flags)
     krb5_context context;
     krb5_pa_data *data;                 /*IN: padata */
@@ -307,7 +307,7 @@ find_preauthenticator(type, preauth)
  */
 int seeded = 0 ; /* Used by srand below */
 
-krb5_error_code INTERFACE
+krb5_error_code
 get_unixtime_padata(context, client, src_addr, pa_data)
     krb5_context context;
     krb5_principal client;
@@ -344,7 +344,7 @@ get_unixtime_padata(context, client, src_addr, pa_data)
     return(0);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 verify_unixtime_padata(context, client, src_addr, data)
     krb5_context context;
     krb5_principal client;
@@ -379,7 +379,7 @@ verify_unixtime_padata(context, client, src_addr, data)
 #include "sdcli.h"
 #include "sdconf.c"
 
-krb5_error_code INTERFACE
+krb5_error_code
 verify_securid_padata(client, src_addr, data)
     krb5_principal client;
     krb5_address **src_addr;
@@ -427,7 +427,7 @@ verify_securid_padata(client, src_addr, data)
     }
 }
 #else
-krb5_error_code INTERFACE
+krb5_error_code
 verify_securid_padata(context, client, src_addr, data)
     krb5_context context;
     krb5_principal client;
@@ -451,7 +451,7 @@ static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended
  */
 static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended with Your PIN\n (or a \'#\'if Your PIN is entered on the card keypad): ";
 
-krb5_error_code INTERFACE
+krb5_error_code
 get_securid_padata(context, client,src_addr,pa_data)
     krb5_context context;
     krb5_principal client;
index 0ada4a26b126ef0ef99fe66c0d5fd4273f726e9b..35c5847c6a7e6f2539daa32abee20fa1569a660d 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "k5-int.h"
 
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_realm_compare(context, princ1, princ2)
     krb5_context context;
     krb5_const_principal princ1;
@@ -43,7 +43,7 @@ krb5_realm_compare(context, princ1, princ2)
     return TRUE;
 }
 
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_principal_compare(context, princ1, princ2)
     krb5_context context;
     krb5_const_principal princ1;
index d8212e5552c197c35a792f972f43b860c7466c9f..dfe774b5126156081f33ed56af0f70f28ced1c14 100644 (file)
@@ -33,7 +33,7 @@ extern krb5_deltat krb5_clockskew;
 #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew)
 
 /* Decode the KRB-CRED message, and return creds */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_cred(context, inbuf, key, creds, sender_addr, recv_addr)
     krb5_context context;
     const krb5_data *inbuf;
index 0b2d147f4f8b71836f3a21322873de0537814202..bf07539276be57177b94ed0b4be41e6b91a52809 100644 (file)
@@ -36,7 +36,7 @@
  *  returns system errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_error(context,  enc_errbuf, dec_error)
     krb5_context context;
     const krb5_data *enc_errbuf;
index 3aa6bd2659ff8bcefb2cf8da6b6e20c3100f06ec..3c5a416ba589ec2e76cbd7364f8880110d255850 100644 (file)
@@ -172,7 +172,7 @@ cleanup_privmsg:;
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
     krb5_context       context;
     krb5_auth_context * auth_context;
index cd498a1a4621e1151e8a4d210b2a55bd43c4a444..a2dfb3c572217ad8b355d72c07196755389f2c1f 100644 (file)
@@ -42,7 +42,7 @@
  *  returns system errors, encryption errors, replay errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_req(context, auth_context, inbuf, server, keytab, 
            ap_req_options, ticket)
     krb5_context         context;
index 85552960a03f49dc89c83a4d8911acbced53c7d6..0cee98c2a5cf9e8f91243bc9ab1bac8bdb8822a8 100644 (file)
@@ -90,7 +90,7 @@ krb5_rd_req_decrypt_tkt_part(context, req, keytab)
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_req_decoded(context, auth_context, req, server, keytab, 
                    ap_req_options, ticket)
     krb5_context         context;
index aa5dd35382e3df36a28dc3b0463d21f37356020b..b7798c16d16bdb57a166d67c2ad69a6c756dbd12 100644 (file)
@@ -161,7 +161,7 @@ cleanup:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
     krb5_context       context;
     krb5_auth_context * auth_context;
index 02c9e42cf6befa4c4a45d3d38e8c387d521bff33..b8e384a5df9c02e04f3d54f867ad4fd50e73d9ca 100644 (file)
@@ -36,7 +36,7 @@ extern krb5_flags     krb5_kdc_default_options;
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_recvauth(context, auth_context,
              /* IN */
              fd, appl_version, server, rc_type, flags, keytab,
index f093c488e5ffbaf2f387fa374081318688114315..e1bd769715c1ba1eefba4df95d41624ebdfde96e 100644 (file)
@@ -163,7 +163,7 @@ cleanup_scratch:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_send_tgs(context, kdcoptions, timestruct, etypes, sumtype, sname, addrs,
              authorization_data, padata, second_ticket, in_cred, rep)
     krb5_context context;
index e71a749704c9f2f3ca72906acfbee485f2b744b5..1e890e8d6ee380a00a2f9c3ae655fbdff9748ecb 100644 (file)
@@ -39,7 +39,7 @@ extern krb5_flags     krb5_kdc_default_options;
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_sendauth(context, auth_context,
              /* IN */
              fd, appl_version, client, server, ap_req_options, in_data,
index 56758706abd3044a936a66d47129ae115f53ce43..a2534318dce846481a6d3cc9281404125d182d16 100644 (file)
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <stdio.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_server_rcache(context, piece, rcptr)
     krb5_context context;
     const krb5_data *piece;
index 98e17b4e0ba85a7ed003623a7837d029e3fb336c..5db4d986d4e15ce93211f33fff3a693f4063164c 100644 (file)
@@ -28,7 +28,7 @@
 
 /* This is an internal-only function, used by krb5_get_cred_from_kdc() */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_tgtname(context, server, client, tgtprinc)
     krb5_context context;
     const krb5_data *server, *client;
index 64823c550c557b27fb4d61e0efee3dcc8bf7a968..d047a8bb6ef00b8ad64120d12659e36dd3d23ab9 100644 (file)
@@ -54,7 +54,7 @@
 #define REALM_SEP      '@'
 #define        COMPONENT_SEP   '/'
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_unparse_name_ext(context, principal, name, size)
     krb5_context context;
     krb5_const_principal principal;
index e083738045676c40a9646f35faef17ee89a0d15f..3e3945b00c1175f0d8a2957bffee9df9914eaf58 100644 (file)
@@ -34,7 +34,7 @@
 #define max(x,y) ((x) > (y) ? (x) : (y))
 #endif
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_walk_realm_tree(context, client, server, tree, realm_branch_char)
     krb5_context context;
     const krb5_data *client, *server;
index 75cb1dcb2102873ea83cfa4655e3bc4e2053360e..f647257c0d995943f00c82f9eaabf37c8ba3122d 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * read_pwd.c: __STDC__ conditional also checks the _WINDOWS define.
+
 Fri Apr 7 15:32:04 1995 Keith Vetter (keithv@fusion.com)
 
        * ccdefname.c: 
index 01e3d415c8bee7b6ad65987d6aff165a413d9022..cb11cfdd13217c7f3441c187b2c261fc52197c56 100644 (file)
@@ -173,7 +173,7 @@ username_an_to_ln(context, aname, lnsize, lname)
 
 #ifdef _MSDOS
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_aname_to_localname(context, aname, lnsize, lname)
     krb5_context context;
        krb5_const_principal aname;
index dd20f171be8418227c53916600efcd462363238a..fa794ca6a1919b78a3492fb3ff47b79aea2063b9 100644 (file)
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-char * INTERFACE
+char *
 krb5_cc_default_name(context)
     krb5_context context;
 {
index 8314d44f64fea9f468af1ee6110b09ff0ce22982..f112041e4e3e4224286b11bda4055707a0dc7e4f 100644 (file)
@@ -31,7 +31,7 @@
  Frees the storage taken by a realm list returned by krb5_get_local_realm.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_free_host_realm(context, realmlist)
     krb5_context context;
     char * const *realmlist;
index 8b50a74c7ed8384d96f0571c50403cb60e0bed52..066acfcbf63ce4e41c83f238280cea88cd5ced72 100644 (file)
@@ -30,7 +30,7 @@
  Frees the storage taken by a host list returned by krb5_get_krbhst.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_free_krbhst(context, hostlist)
     krb5_context context;
     char * const *hostlist;
index 7751064318ed3ddcc16c1bc46f4e8f8b470df8ec..41e6f1c1be7f40184495d4a80a8dd5ae148987eb 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_make_full_ipaddr(context, adr, port, outaddr)
     krb5_context context;
     krb5_int32 adr;
index 3789759aa07faf9e4db0815c37db147021bde12c..a5eb91bca54f3c0f6df099de8ccc8454af428785 100644 (file)
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_gen_portaddr(context, addr, ptr, outaddr)
     krb5_context context;
     const krb5_address *addr;
index d4b933de11a9183faeb1e8061cda02e2e7c5baad..50c17242c955afed495265e90611f87a9b38cfe8 100644 (file)
@@ -29,7 +29,7 @@
 #include "k5-int.h"
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_gen_replay_name(context, address, uniq, string)
     krb5_context context;
     const krb5_address *address;
index d41b80a37bbd08e0179f9cb1a39a96787dba746f..093af11638f069be4dfb2f50ab8167611a055df3 100644 (file)
@@ -57,7 +57,7 @@
 extern char *krb5_config_file;         /* extern so can be set at
                                           load/runtime */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_krbhst(context, realm, hostlist)
     krb5_context context;
     const krb5_data *realm;
index 89156ee4b3898c2b87102e1e7239d32ab58f51ef..950e2d04b55d2de6c927ffce2e9eee44abff32e8 100644 (file)
@@ -131,7 +131,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) {
 
 #endif /* _WINDOWS */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_host_realm(context, host, realmsp)
     krb5_context context;
     const char *host;
index 3f9599aad633316f999ab3445aec6118fa86e0be..4c92c6775dd14b06e55ef9d619ccc445da45c589 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_os_init_context(ctx)
        krb5_context ctx;
 {
@@ -45,7 +45,7 @@ krb5_os_init_context(ctx)
        return 0;
 }
 
-void INTERFACE
+void
 krb5_os_free_context(ctx)
        krb5_context    ctx;
 {
index 43d12478b935c8c0d662d6fb25a58c4115064f34..5cc9538013717b2a334198d520d418f39292d6ba 100644 (file)
@@ -51,7 +51,7 @@ static char *VersionID = "@(#)krbfileio.c     2 - 08/22/91";
 #   define OPEN_MODE_NOT_TRUSTWORTHY
 #endif
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_create_secure_file(context, pathname)
     krb5_context context;
     const char * pathname;
@@ -90,7 +90,7 @@ krb5_create_secure_file(context, pathname)
     }
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_sync_disk_file(context, fp)
     krb5_context context;
     FILE *fp;
index 3e9e13d5f20f5e5abdf7bac1d47d116812f44fd7..d6321eb46b73d19eacf7880606e9d009b2e4af20 100644 (file)
@@ -28,7 +28,7 @@
 
 extern char *krb5_defkeyname;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kt_default_name(context, name, namesize)
     krb5_context context;
     char *name;
index 5a25e53a0c4312887f845327aedbe348ec1f7b15..29573df15c139c59c77aae7c0896d5d41f146d7a 100644 (file)
@@ -143,7 +143,7 @@ krb5_kuserok(context, principal, luser)
  * If the given Kerberos name "server" translates to the same name as "luser"
  * (using * krb5_aname_to_lname()), returns TRUE.
  */
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_kuserok(context, principal, luser)
     krb5_context context;
     krb5_principal principal;
index 61abc2cef1835d649b022d37bd704a25d50ec2a4..cc498705c936c412b8f4d57f7e7a156420633c8f 100644 (file)
@@ -37,7 +37,7 @@ extern char *krb5_kdc_sec_udp_portname;
  * returns count of number of addresses found
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_locate_kdc(context, realm, addr_pp, naddrs)
     krb5_context context;
     const krb5_data *realm;
index a449da2501406c5216543d402aea4c45a8842834..dfdd729ed91aceb90937ef9725ccef2078a3433d 100644 (file)
@@ -108,7 +108,7 @@ krb5_lock_file(context, filep, pathname, mode)
 }
 #else   /* MSDOS or Macintosh */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_lock_file(context, filep, pathname, mode)
     krb5_context context;
     FILE *filep;
index 9b28896d96539e296f8a9fd2773a0471d4af7eae..8cd5d15ef48b04c9c4baec4ff2ae9275bc63c16c 100644 (file)
@@ -35,7 +35,7 @@
  * XXX must not use non-blocking I/O
  */
 
-int INTERFACE
+int
 krb5_net_read(context, fd, buf, len)
     krb5_context context;
     int fd;
index 4885a8172a0808a8fee44fd1244c1fa0d0190ad3..f623d99df14131e9860acd470790e2577374abfe 100644 (file)
@@ -34,7 +34,7 @@
  * XXX must not use non-blocking I/O
  */
 
-int INTERFACE
+int
 krb5_net_write(context, fd, buf, len)
     krb5_context context;
     int fd;
index e5f982673cf526978a60e4cd3beb8f705ce34236..f23bb664696a3ace4977273b703b8c58444966aa 100644 (file)
@@ -28,7 +28,7 @@
 #define KRB5_LIBOS_INT_PROTO__
 
 #ifdef SOCK_DGRAM                      /* XXX hack... */
-krb5_error_code INTERFACE krb5_locate_kdc
+krb5_error_code krb5_locate_kdc
     PROTOTYPE((krb5_context,
               const krb5_data *,
               struct sockaddr **,
@@ -36,20 +36,20 @@ krb5_error_code INTERFACE krb5_locate_kdc
 #endif
 
 #ifdef KRB5_USE_INET
-krb5_error_code INTERFACE krb5_unpack_full_ipaddr
+krb5_error_code krb5_unpack_full_ipaddr
     PROTOTYPE((krb5_context,
               const krb5_address *,
               krb5_int32 *,
               krb5_int16 *));
 
 #ifdef NARROW_PROTOTYPES
-krb5_error_code INTERFACE krb5_make_full_ipaddr
+krb5_error_code krb5_make_full_ipaddr
     PROTOTYPE((krb5_context,
               krb5_int32,
               krb5_int16,
               krb5_address **));
 #else
-krb5_error_code INTERFACE krb5_make_full_ipaddr
+krb5_error_code krb5_make_full_ipaddr
     PROTOTYPE((krb5_context,
               krb5_int32,
               int,                     /* unsigned short promotes to signed
index 7491727a58d53eab0458ea7767f858d82b73758e..531e61a470823b70ee0d7487cbd54d6b417a0c46 100644 (file)
@@ -30,7 +30,7 @@
 #ifdef KRB5_USE_INET
 #include "os-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_unpack_full_ipaddr(context, inaddr, adr, port)
     krb5_context context;
     const krb5_address *inaddr;
index bd9cb6ea64e27fa1dca5a0970bcf8a0aaa348948..a5dc7964c8b81759e6de760fcf70ed7fa3722226 100644 (file)
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include <errno.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_read_message(context, fdp, inbuf)
     krb5_context context;
        krb5_pointer fdp;
index 0c05359d35af69740063943d927d07dd0a645c69..0944e47fe2c1a3178d76fcae1874c82e0e46c5c5 100644 (file)
@@ -81,7 +81,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
     int *size_return;
 {
     /* adapted from Kerberos v4 des/read_password.c */
-#if defined(__STDC__) || defined(mips)
+#if defined(__STDC__) || defined(mips) || defined(_WINDOWS)
     /* readin_string is used after a longjmp, so must be volatile */
     volatile
 #endif
@@ -254,7 +254,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
 /* Don't expect to be called, just define it for sanity and the linker.
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_read_password(context, prompt, prompt2, return_pwd, size_return)
     krb5_context context;
     char *prompt;
index 5b4c071a98262959e426b1ecfda3925beceb5b6f..fcb0b5594defec4d7a2d1373a6937441501a20b3 100644 (file)
@@ -101,7 +101,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) {
 
 #endif /* _WINDOWS */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_realm_domain(context, realm, domain)
     krb5_context context;
     const char *realm;
index f4fffee9ba8fa68e27ceabf12b3a56f40fc26534..c64320c417899ecde4e81642c559f091f2a63845 100644 (file)
@@ -56,7 +56,7 @@ extern int krb5_max_skdc_timeout;
 extern int krb5_skdc_timeout_shift;
 extern int krb5_skdc_timeout_1;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_sendto_kdc (context, message, realm, reply)
     krb5_context context;
     const krb5_data * message;
index 3e0b3b32bae3a37009828c18a66e9a41eefc7b14..900073e09892ee285f4013c64e9ff51c01944c42 100644 (file)
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_unlock_file(context, filep, pathname)
     krb5_context context;
     FILE *filep;
index 85845c1da1bf441048bc8014d2e573d9b8671add..ec1ff01c4bde267c4c5b84626f645eb189ca9545 100644 (file)
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include <errno.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_write_message(context, fdp, outbuf)
     krb5_context context;
        krb5_pointer    fdp;
index c310a5e4acb05d35d766c63948e871e9a22a40bb..7734a5d02914395d85b3fccfc0b20c9560f64c68 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 16:44:55 1995 Keith Vetter (keithv@fusion.com)
+
+       * syslog.c: __STDC__ conditional also checks the _WINDOWS define.
+
 Tue Mar 28 18:46:55 1995  John Gilmore  (gnu at toad.com)
 
        * configure.in (AC_REPLACE_FUNCS):  Add getuid to the list.
index 4e5510f1fd7a0cdf87be0f8ce8db3e9c26fd1a39..c605e88bc024bf46d2e8ebdb2f8feab892634ef2 100644 (file)
@@ -33,8 +33,9 @@
  * Modified to use UNIX domain IPC by Ralph Campbell
  */
 
-#ifndef _MSDOS
-#ifdef __STDC__
+#ifndef _WINDOWS
+
+#if defined(__STDC__) || defined(_WINDOWS)
 #include <stdarg.h>
 #else
 #define const
@@ -62,7 +63,7 @@ static int    LogFacility = LOG_USER; /* default facility code */
 
 
 void
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 syslog(int pri, const char *fmt, ...)
 #else
 syslog(pri, fmt, va_alist)
@@ -73,7 +74,7 @@ syslog(pri, fmt, va_alist)
 {
     va_list pvar;
     void vsyslog();
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
     va_start(pvar, fmt);
 #else
     va_start(pvar);
index 01150216d0534bb96bc824c7e139cbb532c4c5a2..b55c33e99b35167ff6e269c0551c9f1a62385596 100644 (file)
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+       * *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Fri Mar 31 16:44:34 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * rc_dfl.c (krb5_rc_dfl_expunage): Close the old, temporary reply
index f7f9e44de5b376653dc94863bb1920d6cfa76750..1e53094c7a7091ccb302577310ff32fe99f7217a 100644 (file)
@@ -30,7 +30,7 @@ static struct krb5_rc_typelist *typehead = &krb5_rc_typelist_dfl;
 semaphore ex_typelist = 1;
 #endif
 
-krb5_error_code INTERFACE krb5_rc_register_type(context, ops)
+krb5_error_code krb5_rc_register_type(context, ops)
     krb5_context context;
     krb5_rc_ops *ops;
 {
@@ -59,7 +59,7 @@ krb5_error_code INTERFACE krb5_rc_register_type(context, ops)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_resolve_type(context, id, type)
+krb5_error_code krb5_rc_resolve_type(context, id, type)
     krb5_context context;
     krb5_rcache *id;
     char *type;
@@ -80,14 +80,14 @@ krb5_error_code INTERFACE krb5_rc_resolve_type(context, id, type)
  return 0;
 }
 
-char * INTERFACE krb5_rc_get_type(context, id)
+char * krb5_rc_get_type(context, id)
     krb5_context context;
     krb5_rcache id;
 {
  return id->ops->type;
 }
 
-char * INTERFACE krb5_rc_default_type(context)
+char * krb5_rc_default_type(context)
     krb5_context context;
 {
  char *s;
@@ -97,7 +97,7 @@ char * INTERFACE krb5_rc_default_type(context)
    return "dfl";
 }
 
-char * INTERFACE krb5_rc_default_name(context)
+char * krb5_rc_default_name(context)
     krb5_context context;
 {
  char *s;
@@ -107,7 +107,7 @@ char * INTERFACE krb5_rc_default_name(context)
    return (char *) 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rc_default(context, id)
     krb5_context context;
     krb5_rcache *id;
@@ -129,7 +129,7 @@ krb5_rc_default(context, id)
 }
 
 
-krb5_error_code INTERFACE krb5_rc_resolve_full(context, id, string_name)
+krb5_error_code krb5_rc_resolve_full(context, id, string_name)
     krb5_context context;
     krb5_rcache *id;
     char *string_name;
index 2ba4fca9c43af6c11c0d5609f2317b9113224d98..92cf77f8db0b130cb6e41b50ea1259d50919ed8f 100644 (file)
@@ -21,7 +21,7 @@ Local stuff:
   given auth, take important information and make rep; return -1 if failed
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_to_rep(context, auth, rep)
     krb5_context context;
     krb5_tkt_authent *auth;
index aecbb37e93799d1422332bc776c87eb126956f22..120eaa515c71ace353d9d4e85b2ace5d6cfb34b1 100644 (file)
@@ -165,14 +165,14 @@ static int store(context, id, rep)
  return CMP_HOHUM;
 }
 
-char * INTERFACE krb5_rc_dfl_get_name(context, id)
+char * krb5_rc_dfl_get_name(context, id)
     krb5_context context;
     krb5_rcache id;
 {
  return ((struct dfl_data *) (id->data))->name;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_get_span(context, id, lifespan)
+krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan)
     krb5_context context;
     krb5_rcache id;
     krb5_deltat *lifespan;
@@ -181,7 +181,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_get_span(context, id, lifespan)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_init(context, id, lifespan)
+krb5_error_code krb5_rc_dfl_init(context, id, lifespan)
     krb5_context context;
 krb5_rcache id;
 krb5_deltat lifespan;
@@ -200,7 +200,7 @@ krb5_deltat lifespan;
     return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_close_no_free(context, id)
+krb5_error_code krb5_rc_dfl_close_no_free(context, id)
     krb5_context context;
     krb5_rcache id;
 {
@@ -225,7 +225,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_close_no_free(context, id)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_close(context, id)
+krb5_error_code krb5_rc_dfl_close(context, id)
     krb5_context context;
     krb5_rcache id;
 {
@@ -234,7 +234,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_close(context, id)
     return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_destroy(context, id)
+krb5_error_code krb5_rc_dfl_destroy(context, id)
     krb5_context context;
 krb5_rcache id;
 {
@@ -245,7 +245,7 @@ krb5_rcache id;
  return krb5_rc_dfl_close(context, id);
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_resolve(context, id, name)
+krb5_error_code krb5_rc_dfl_resolve(context, id, name)
     krb5_context context;
     krb5_rcache id;
     char *name;
@@ -292,7 +292,7 @@ cleanup:
     return retval;
 }
 
-void INTERFACE krb5_rc_free_entry (context, rep)
+void krb5_rc_free_entry (context, rep)
     krb5_context context;
     krb5_donot_replay **rep;
 {
@@ -377,7 +377,7 @@ errout:
     
 
 
-krb5_error_code INTERFACE krb5_rc_dfl_recover(context, id)
+krb5_error_code krb5_rc_dfl_recover(context, id)
     krb5_context context;
 krb5_rcache id;
 {
@@ -486,7 +486,7 @@ krb5_rc_io_store (context, t, rep)
     return ret;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_store(context, id, rep)
+krb5_error_code krb5_rc_dfl_store(context, id, rep)
     krb5_context context;
 krb5_rcache id;
 krb5_donot_replay *rep;
@@ -522,7 +522,7 @@ krb5_donot_replay *rep;
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_dfl_expunge(context, id)
+krb5_error_code krb5_rc_dfl_expunge(context, id)
     krb5_context context;
 krb5_rcache id;
 {
index 0245ed06bf6891861fd4b1fc7ff433a079a627f8..6529b6d41c985d1a58484afc9c525d0c79c0c9a5 100644 (file)
 
 extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */
 
-krb5_error_code INTERFACE krb5_rc_dfl_init 
+krb5_error_code krb5_rc_dfl_init 
        PROTOTYPE((krb5_context,
                   krb5_rcache,
                   krb5_deltat));
-krb5_error_code INTERFACE krb5_rc_dfl_recover 
+krb5_error_code krb5_rc_dfl_recover 
        PROTOTYPE((krb5_context,
                   krb5_rcache)); 
-krb5_error_code INTERFACE krb5_rc_dfl_destroy 
+krb5_error_code krb5_rc_dfl_destroy 
        PROTOTYPE((krb5_context,
                   krb5_rcache));
-krb5_error_code INTERFACE krb5_rc_dfl_close 
+krb5_error_code krb5_rc_dfl_close 
        PROTOTYPE((krb5_context,
                   krb5_rcache));
-krb5_error_code INTERFACE krb5_rc_dfl_store 
+krb5_error_code krb5_rc_dfl_store 
        PROTOTYPE((krb5_context,
                   krb5_rcache,
                   krb5_donot_replay *));
-krb5_error_code INTERFACE krb5_rc_dfl_expunge 
+krb5_error_code krb5_rc_dfl_expunge 
        PROTOTYPE((krb5_context,
                   krb5_rcache));
-krb5_error_code INTERFACE krb5_rc_dfl_get_span 
+krb5_error_code krb5_rc_dfl_get_span 
        PROTOTYPE((krb5_context,
                   krb5_rcache,
                   krb5_deltat *));
-char * INTERFACE krb5_rc_dfl_get_name 
+char * krb5_rc_dfl_get_name 
        PROTOTYPE((krb5_context,
                   krb5_rcache));
-krb5_error_code INTERFACE krb5_rc_dfl_resolve 
+krb5_error_code krb5_rc_dfl_resolve 
        PROTOTYPE((krb5_context,
                   krb5_rcache,
                   char *));
-krb5_error_code INTERFACE krb5_rc_dfl_close_no_free
+krb5_error_code krb5_rc_dfl_close_no_free
        PROTOTYPE((krb5_context,
                   krb5_rcache));
-void INTERFACE krb5_rc_free_entry 
+void krb5_rc_free_entry 
        PROTOTYPE((krb5_context,
                   krb5_donot_replay **));
 #endif
index 8d61d5724688a619ac6cde67144a27aa5135b474..3bbd6004ccfcbfafbaab811c4a55d7a17318df40 100644 (file)
@@ -65,7 +65,7 @@ static void getdir()
   }
 }
 
-krb5_error_code INTERFACE krb5_rc_io_creat (context, d, fn)
+krb5_error_code krb5_rc_io_creat (context, d, fn)
     krb5_context context;
     krb5_rc_iostuff *d;
     char **fn;
@@ -149,7 +149,7 @@ krb5_error_code INTERFACE krb5_rc_io_creat (context, d, fn)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_open (context, d, fn)
+krb5_error_code krb5_rc_io_open (context, d, fn)
     krb5_context context;
     krb5_rc_iostuff *d;
     char *fn;
@@ -227,7 +227,7 @@ krb5_error_code INTERFACE krb5_rc_io_open (context, d, fn)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_move (context, new, old)
+krb5_error_code krb5_rc_io_move (context, new, old)
     krb5_context context;
     krb5_rc_iostuff *new;
     krb5_rc_iostuff *old;
@@ -243,7 +243,7 @@ krb5_error_code INTERFACE krb5_rc_io_move (context, new, old)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_write (context, d, buf, num)
+krb5_error_code krb5_rc_io_write (context, d, buf, num)
     krb5_context context;
     krb5_rc_iostuff *d;
     krb5_pointer buf;
@@ -264,7 +264,7 @@ krb5_error_code INTERFACE krb5_rc_io_write (context, d, buf, num)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_sync (context, d)
+krb5_error_code krb5_rc_io_sync (context, d)
     krb5_context context;
     krb5_rc_iostuff *d;
 {
@@ -281,7 +281,7 @@ krb5_error_code INTERFACE krb5_rc_io_sync (context, d)
     return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_read (context, d, buf, num)
+krb5_error_code krb5_rc_io_read (context, d, buf, num)
     krb5_context context;
     krb5_rc_iostuff *d;
     krb5_pointer buf;
@@ -300,7 +300,7 @@ krb5_error_code INTERFACE krb5_rc_io_read (context, d, buf, num)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_close (context, d)
+krb5_error_code krb5_rc_io_close (context, d)
     krb5_context context;
     krb5_rc_iostuff *d;
 {
@@ -311,7 +311,7 @@ krb5_error_code INTERFACE krb5_rc_io_close (context, d)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_destroy (context, d)
+krb5_error_code krb5_rc_io_destroy (context, d)
     krb5_context context;
     krb5_rc_iostuff *d;
 {
@@ -328,7 +328,7 @@ krb5_error_code INTERFACE krb5_rc_io_destroy (context, d)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_mark (context, d)
+krb5_error_code krb5_rc_io_mark (context, d)
     krb5_context context;
     krb5_rc_iostuff *d;
 {
@@ -336,7 +336,7 @@ krb5_error_code INTERFACE krb5_rc_io_mark (context, d)
  return 0;
 }
 
-krb5_error_code INTERFACE krb5_rc_io_unmark (context, d)
+krb5_error_code krb5_rc_io_unmark (context, d)
     krb5_context context;
     krb5_rc_iostuff *d;
 {
@@ -344,7 +344,7 @@ krb5_error_code INTERFACE krb5_rc_io_unmark (context, d)
  return 0;
 }
 
-long INTERFACE
+long
 krb5_rc_io_size (context, d)
     krb5_context context;
     krb5_rc_iostuff *d;
index 74df1a0aedac17579f1f20a10f18d1b081fc8203..aa909614cc706e8f359953db8ddb31009de04e01 100644 (file)
@@ -27,44 +27,44 @@ krb5_rc_iostuff;
 
 /* first argument is always iostuff for result file */
 
-krb5_error_code INTERFACE krb5_rc_io_creat 
+krb5_error_code krb5_rc_io_creat 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *,
                   char **));
-krb5_error_code INTERFACE krb5_rc_io_open 
+krb5_error_code krb5_rc_io_open 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *,
                   char *));
-krb5_error_code INTERFACE krb5_rc_io_move 
+krb5_error_code krb5_rc_io_move 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *,
                   krb5_rc_iostuff *));
-krb5_error_code INTERFACE krb5_rc_io_write 
+krb5_error_code krb5_rc_io_write 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *,
                   krb5_pointer,
                   int));
-krb5_error_code INTERFACE krb5_rc_io_read 
+krb5_error_code krb5_rc_io_read 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *,
                   krb5_pointer,
                   int));
-krb5_error_code INTERFACE krb5_rc_io_close 
+krb5_error_code krb5_rc_io_close 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *));
-krb5_error_code INTERFACE krb5_rc_io_destroy 
+krb5_error_code krb5_rc_io_destroy 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *));
-krb5_error_code INTERFACE krb5_rc_io_mark 
+krb5_error_code krb5_rc_io_mark 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *));
-krb5_error_code INTERFACE krb5_rc_io_unmark 
+krb5_error_code krb5_rc_io_unmark 
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *));
-krb5_error_code INTERFACE krb5_rc_io_sync
+krb5_error_code krb5_rc_io_sync
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *));
-long INTERFACE krb5_rc_io_size
+long krb5_rc_io_size
        PROTOTYPE((krb5_context,
                   krb5_rc_iostuff *));
 #endif
index 7f668c6182f17c7b57a974ec4acaf3e529fdddeb..79ac64df6299cee66f5d4f33ad9bce7f919e4a6b 100644 (file)
@@ -1,17 +1,38 @@
-;-----------------------------
-;   LIBKRB5.DEF - module definition file
-;-----------------------------
+;----------------------------------------------------
+;   LIBKRB5.DEF - LIBKRB5.DLL module definition file
+;----------------------------------------------------
 
-LIBRARY   LIBKRB5
-DESCRIPTION 'DLL for Kerberos 5'
-EXETYPE   WINDOWS
-CODE      PRELOAD MOVEABLE DISCARDABLE
-DATA      PRELOAD MOVEABLE SINGLE
-HEAPSIZE  8192
+LIBRARY        LIBKRB5
+DESCRIPTION    'DLL for Kerberos 5'
+EXETYPE        WINDOWS
+CODE           PRELOAD MOVEABLE DISCARDABLE
+DATA           PRELOAD MOVEABLE SINGLE
+HEAPSIZE       8192
 
 EXPORTS
-       WEP                                     @1 RESIDENTNAME
-       LIBMAIN                                 @2
+       WEP                                     @1001 RESIDENTNAME
+       LIBMAIN                                 @1002
+       GSS_ACQUIRE_CRED                        @1
+       GSS_RELEASE_CRED                        @2
+       GSS_INIT_SEC_CONTEXT                    @3
+       GSS_ACCEPT_SEC_CONTEXT                  @4
+       GSS_PROCESS_CONTEXT_TOKEN               @5
+       GSS_DELETE_SEC_CONTEXT                  @6
+       GSS_CONTEXT_TIME                        @7
+       GSS_SIGN                                @8
+       GSS_VERIFY                              @9
+       GSS_SEAL                                @10
+       GSS_UNSEAL                              @11
+       GSS_DISPLAY_STATUS                      @12
+       GSS_INDICATE_MECHS                      @13
+       GSS_COMPARE_NAME                        @14
+       GSS_DISPLAY_NAME                        @15
+       GSS_IMPORT_NAME                         @16
+       GSS_RELEASE_NAME                        @17
+       GSS_RELEASE_BUFFER                      @18
+       GSS_RELEASE_OID_SET                     @19
+       GSS_INQUIRE_CRED                        @20
+; Kerberos 5
        _krb5_build_principal_ext
        KRB5_CC_DEFAULT
        KRB5_FREE_ADDRESSES
@@ -36,26 +57,3 @@ EXPORTS
 ;Com_err routines
         _com_err
         ERROR_MESSAGE
-;GSSAPI
-       GSS_ACCEPT_SEC_CONTEXT
-       GSS_ACQUIRE_CRED
-       GSS_COMPARE_NAME
-       GSS_CONTEXT_TIME
-       GSS_DELETE_SEC_CONTEXT
-       GSS_DISPLAY_NAME
-       GSS_DISPLAY_STATUS
-       GSS_IMPORT_NAME
-       GSS_INDICATE_MECHS
-       GSS_INIT_SEC_CONTEXT
-       GSS_INQUIRE_CONTEXT
-       GSS_INQUIRE_CRED
-       GSS_PROCESS_CONTEXT_TOKEN
-       GSS_RELEASE_BUFFER
-       GSS_RELEASE_CRED
-       GSS_RELEASE_NAME
-       GSS_RELEASE_OID_SET
-       GSS_SEAL
-       GSS_SIGN
-       GSS_UNSEAL
-       GSS_VERIFY
-
index ea43dcd247e5e0ed73de882c2632c9cf75d8cc29..666514f920285174498462ab07d426b69e0bc616 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 16:02:24 1995 Keith Vetter (keithv@fusion.com)
+
+        * com_err.c, compile_et.c, error_ta.h, et_c.awk, internal.h:
+           __STDC__ conditionals also checks for the _WINDOWS define.
+
 Wed Apr 5 16:25:35 1995 Keith Vetter (keithv@fusion.com)
 
        * com_err.h: added FAR to pointers in prototypes.
index 43b315264683bcf9265d3bf236b243813bd44197..7a39966b74596210bd790dc69fd00dd8bb14ce44 100644 (file)
  * should fix up com_err.h so that it's safe to #include here 
  * directly.
  */
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 extern char const * INTERFACE error_message (long);
 #else
 extern char * INTERFACE error_message ();
 #endif
 
 static void
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
     default_com_err_proc (const char *whoami, long code, const char *fmt, va_list args)
 #else
     default_com_err_proc (whoami, code, fmt, args)
@@ -77,7 +77,7 @@ static void
 #endif
 }
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 typedef void (*errf) (const char *, long, const char *, va_list);
 #else
 typedef void (*errf) ();
index a6bf02c6a3e24710f55dd21f55ebfe5103356f79..921aad24001636234470b541f1045d0f9500f237 100644 (file)
@@ -76,7 +76,7 @@ static const char * const c_src_prolog[] = {
 };
 
 static const char * const krc_src_prolog[] = {
-    "#ifdef __STDC__\n",
+    "#if defined(__STDC__) || defined(_WINDOWS)\n",
     "#define NOARGS void\n",
     "#else\n",
     "#define NOARGS\n",
index f1d493fdae954dc4543517f9c52ea6150bbdf62b..53e73d5fcc74294ee40436c522c3c493f1bd20f6 100644 (file)
@@ -39,7 +39,7 @@ extern struct et_list * _et_list;
 #define        ERRCODE_RANGE   8       /* # of bits to shift table number */
 #define        BITS_PER_CHAR   6       /* # bits to shift per character in name */
 
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 extern const char *error_table_name (long);
 #else 
 extern const char *error_table_name ();
index 4f53fc3eb5afe7995d12f78694eaef980b353a6f..376a8d6536b3b5faec488d1dcf41693bb445f7de 100644 (file)
@@ -109,7 +109,7 @@ c2n["_"]=63
        print " * This file is automatically generated; please do not edit it." > outfile
        print " */" > outfile
 
-       print "#ifdef __STDC__" > outfile
+       print "#if defined(__STDC__) || defined(_WINDOWS)" > outfile
        print "#define NOARGS void" > outfile
        print "#else" > outfile
        print "#define NOARGS" > outfile
index a101f262f2b26a9d06e54dc852e560ddfa1bf571..9cf55c8d4213dc84e313bc6f9aeea75efbb7d437 100644 (file)
@@ -10,6 +10,6 @@ extern char const * const sys_errlist[];
 extern const int sys_nerr;
 #endif
 
-#if defined(__STDC__) && !defined(HDR_HAS_PERROR)
+#if defined(__STDC__) && !defined(HDR_HAS_PERROR) && !defined(_WINDOWS)
 void perror (const char *);
 #endif
index c1acf83867abfed92d2983b41c37c7fc3accf31d..6d7921292f3d3b74f8085eb2500dc19176a6c0b6 100644 (file)
@@ -1,3 +1,8 @@
+Thu Apr 13 16:19:01 1995 Keith Vetter (keithv@fusion.com)
+
+       * cns.c: Added better error message for incorrect password.
+        * tktlist.c: flag string gets displayed within parentheses.
+
 Fri Apr 7 15:03:10 1995 Keith Vetter (keithv@fusion.com)
 
         * cns.c, cns.h, cns.rc: added option dialog widget allowing user
index 50cf1cdd2cebc9028ff4fbdb30909a044db8f69b..6d4c6cdad23c1e27636de149ad1e74fff6604212 100644 (file)
@@ -1940,7 +1940,6 @@ kwin_command (
         krb5_principal principal;
                krb5_creds creds;
                krb5_principal server;
-               krb5_timestamp now;
         krb5_int32 sec, usec;
        #endif
 
@@ -2063,12 +2062,6 @@ kwin_command (
 
                 code = krb5_us_timeofday(k5_context, &sec, &usec);
                 if (code) break;
- code = krb5_timeofday(k5_context, &now);
- if (code) break;
- if (labs(now-sec) > 60*60) {            // Off by more than an hour
-     MessageBox (NULL, "DEBUG: timeofday != us_timeofday", NULL, 0);
-     now = sec;
- }
                 creds.times.starttime = 0;
                        creds.times.endtime = sec + 60L * lifetime;
                        creds.times.renew_till = 0;
@@ -2099,7 +2092,11 @@ kwin_command (
 
                #ifdef KRB5
                        if (code) {
-                               com_err (NULL, code, "while logging in");
+               if (code == KRB5KRB_AP_ERR_BAD_INTEGRITY)
+                    MessageBox (hwnd, "Password incorrect", NULL, 
+                                       MB_OK | MB_ICONEXCLAMATION);
+                else 
+                               com_err (NULL, code, "while logging in");
                                return TRUE;
                        }
                #endif
index 8f258c640171bbb6039fed0bbad710604716a6cd..1478ea18fb122124603716c20d357593ecd0bfba 100644 (file)
@@ -445,6 +445,7 @@ flags_string(krb5_creds *cred) {
     int i = 0;
 
     buf[i++] = ' ';    
+    buf[i++] = '(';    
     if (cred->ticket_flags & TKT_FLG_FORWARDABLE)
         buf[i++] = 'F';
     if (cred->ticket_flags & TKT_FLG_FORWARDED)
@@ -468,7 +469,10 @@ flags_string(krb5_creds *cred) {
     if (cred->ticket_flags & TKT_FLG_PRE_AUTH)
         buf[i++] = 'A';
 
+    buf[i++] = ')';    
     buf[i] = '\0';
+    if (i <= 3)
+        buf[0] = '\0';
     return(buf);
 }