From 2cb1ffe588a1c65a875f73e584f5c10dc58c5270 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Thu, 21 Feb 1991 11:41:54 +0000 Subject: [PATCH] Changes to conform with API modifications git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1750 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/func-proto.h | 17 ++++++++++++----- src/include/krb5/los-proto.h | 3 +-- src/lib/krb5/keytab/read_servi.c | 12 +----------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h index 035badd34..12c7cdb41 100644 --- a/src/include/krb5/func-proto.h +++ b/src/include/krb5/func-proto.h @@ -63,7 +63,7 @@ krb5_error_code krb5_rd_req_simple PROTOTYPE((const krb5_data *, krb5_const_principal, const krb5_address *, - krb5_tkt_authent * )); + krb5_tkt_authent ** )); krb5_error_code krb5_mk_rep PROTOTYPE((const krb5_ap_rep_enc_part *, const krb5_keyblock *, @@ -71,19 +71,20 @@ krb5_error_code krb5_mk_rep krb5_error_code krb5_rd_rep PROTOTYPE((const krb5_data *, const krb5_keyblock *, - krb5_ap_rep_enc_part *)); + krb5_ap_rep_enc_part **)); krb5_error_code krb5_mk_error PROTOTYPE((const krb5_error *, krb5_data * )); krb5_error_code krb5_rd_error PROTOTYPE((const krb5_data *, - krb5_error * )); + krb5_error ** )); krb5_error_code krb5_rd_safe PROTOTYPE((const krb5_data *, const krb5_keyblock *, const krb5_address *, const krb5_address *, krb5_int32, krb5_int32, + krb5_rcache, krb5_data * )); krb5_error_code krb5_rd_priv PROTOTYPE((const krb5_data *, @@ -92,6 +93,7 @@ krb5_error_code krb5_rd_priv const krb5_address *, krb5_int32, krb5_int32, krb5_pointer, + krb5_rcache, krb5_data * )); krb5_error_code krb5_parse_name PROTOTYPE((const char *, @@ -119,6 +121,9 @@ int krb5_fulladdr_order PROTOTYPE((const krb5_fulladdr *, const krb5_fulladdr *)); krb5_error_code krb5_copy_keyblock + PROTOTYPE((const krb5_keyblock *, + krb5_keyblock **)); +krb5_error_code krb5_copy_keyblock_contents PROTOTYPE((const krb5_keyblock *, krb5_keyblock *)); krb5_error_code krb5_copy_creds @@ -236,6 +241,8 @@ void krb5_free_pa_data PROTOTYPE((krb5_pa_data **)); void krb5_free_ap_rep_enc_part PROTOTYPE((krb5_ap_rep_enc_part *)); +void krb5_free_tkt_authent + PROTOTYPE((krb5_tkt_authent *)); #include @@ -311,7 +318,7 @@ krb5_error_code krb5_rd_req krb5_keyblock ** ), krb5_pointer, krb5_rcache, - krb5_tkt_authent * )); + krb5_tkt_authent ** )); krb5_error_code krb5_rd_req_decoded PROTOTYPE((const krb5_ap_req *, krb5_const_principal, @@ -323,7 +330,7 @@ krb5_error_code krb5_rd_req_decoded krb5_keyblock ** ), krb5_pointer, krb5_rcache, - krb5_tkt_authent * )); + krb5_tkt_authent ** )); krb5_error_code krb5_kt_read_service_key PROTOTYPE((krb5_pointer, diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h index c85c7fc66..5e97429ca 100644 --- a/src/include/krb5/los-proto.h +++ b/src/include/krb5/los-proto.h @@ -61,8 +61,7 @@ krb5_error_code krb5_aname_to_localname const int, char * )); krb5_error_code krb5_get_default_realm - PROTOTYPE((const int, - char * )); + PROTOTYPE(( char ** )); krb5_error_code krb5_get_host_realm PROTOTYPE((const char *, char *** )); diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index 7a39bc8bd..67758b436 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -23,7 +23,6 @@ static char rcsid_krb5_kt_read_service_key_c[] = #include -/* XXX Things that I need and don't know where to get yet */ #define KSUCCESS 0 krb5_error_code @@ -74,16 +73,7 @@ OLDDECLARG(krb5_keyblock **, key) if (kerror) return(kerror); - /* - * This routine takes a krb5_keyblock **. Should it? I assume this - * means that it is supposed allocate the key and return it... - * XXX - */ - - if (!(*key = (krb5_keyblock *)malloc(sizeof(krb5_keyblock)))) - return (ENOMEM); /* XXX */ - - krb5_copy_keyblock(&entry.key, *key); + krb5_copy_keyblock(&entry.key, key); krb5_kt_free_entry(&entry); -- 2.26.2