diff options
| author | Tom Yu <tlyu@mit.edu> | 1995-11-27 00:37:13 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1995-11-27 00:37:13 +0000 |
| commit | 9d1b326a79926af76080abf907119c9bb4225cef (patch) | |
| tree | ef385fbe95eb573f7b9e18363f411992ec66ac17 /src/include | |
| parent | ba076089caa523565c50b7514e4fa5644c9ac2af (diff) | |
| download | krb5-9d1b326a79926af76080abf907119c9bb4225cef.tar.gz krb5-9d1b326a79926af76080abf907119c9bb4225cef.tar.xz krb5-9d1b326a79926af76080abf907119c9bb4225cef.zip | |
* k5-int.h: Ultrix is broken. Hacked around by redefining the
typedefs of preauth_obtain_data_proc and
preauth_process_proc to be pointers to the functions
rather than the functions themselves. Also made some
things KRB5_NPROTOTYPE.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7124 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/k5-int.h | 40 |
2 files changed, 28 insertions, 20 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 27be88109..a9d7e60a9 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +Sun Nov 26 19:23:35 1995 Tom Yu <tlyu@dragons-lair.MIT.EDU> + + * k5-int.h: Ultrix is broken. Hacked around by redefining the + typedefs of preauth_obtain_data_proc and + preauth_process_proc to be pointers to the functions + rather than the functions themselves. Also made some + things KRB5_NPROTOTYPE. + Fri Nov 17 22:29:13 1995 Theodore Y. Ts'o <tytso@dcl> * krb5.hin, k5-int.h: Moved prototype for encode_kdc_rep to diff --git a/src/include/k5-int.h b/src/include/k5-int.h index b1525becb..7be7ba70b 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -814,8 +814,8 @@ typedef struct _krb5_pa_enc_ts { krb5_int32 pausec; } krb5_pa_enc_ts; -typedef krb5_error_code (krb5_preauth_obtain_proc) - KRB5_PROTOTYPE((krb5_context, +typedef krb5_error_code (*krb5_preauth_obtain_proc) + KRB5_NPROTOTYPE((krb5_context, krb5_pa_data *, krb5_etype_info, krb5_keyblock *, @@ -829,8 +829,8 @@ typedef krb5_error_code (krb5_preauth_obtain_proc) krb5_kdc_req *, krb5_pa_data **)); -typedef krb5_error_code (krb5_preauth_process_proc) - KRB5_PROTOTYPE((krb5_context, +typedef krb5_error_code (*krb5_preauth_process_proc) + KRB5_NPROTOTYPE((krb5_context, krb5_pa_data *, krb5_kdc_req *, krb5_kdc_rep *, @@ -853,18 +853,18 @@ typedef struct _krb5_preauth_ops { krb5_magic magic; int type; int flags; - krb5_preauth_obtain_proc *obtain; - krb5_preauth_process_proc *process; + krb5_preauth_obtain_proc obtain; + krb5_preauth_process_proc process; } krb5_preauth_ops; krb5_error_code krb5_obtain_padata KRB5_PROTOTYPE((krb5_context, krb5_pa_data **, - krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, - krb5_data *, - krb5_const_pointer, - krb5_keyblock **), + krb5_error_code ( * )KRB5_NPROTOTYPE((krb5_context, + krb5_const krb5_enctype, + krb5_data *, + krb5_const_pointer, + krb5_keyblock **)), krb5_const_pointer, krb5_creds *, krb5_kdc_req *)); @@ -873,16 +873,16 @@ krb5_error_code krb5_process_padata KRB5_PROTOTYPE((krb5_context, krb5_kdc_req *, krb5_kdc_rep *, - krb5_error_code ( * )(krb5_context, - krb5_const krb5_enctype, - krb5_data *, - krb5_const_pointer, - krb5_keyblock **), + krb5_error_code ( * )KRB5_NPROTOTYPE((krb5_context, + krb5_const krb5_enctype, + krb5_data *, + krb5_const_pointer, + krb5_keyblock **)), krb5_const_pointer, - krb5_error_code ( * )(krb5_context, - krb5_const krb5_keyblock *, - krb5_const_pointer, - krb5_kdc_rep * ), + krb5_error_code ( * )KRB5_NPROTOTYPE((krb5_context, + krb5_const krb5_keyblock *, + krb5_const_pointer, + krb5_kdc_rep * )), krb5_keyblock **, krb5_creds *, krb5_int32 *)); |