From 973f5ca0e0181560f552453c39f7602a6b7bd768 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Sun, 12 Mar 2000 19:23:09 +0000 Subject: [PATCH] Change function prototypes to match the entries in krb5.hin - specifically use krb5_const instead of const. Under ultrix they are not the same. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12101 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/keytab/ChangeLog | 5 +++++ src/lib/krb5/keytab/ktbase.c | 2 +- src/lib/krb5/krb/ChangeLog | 7 +++++++ src/lib/krb5/krb/addr_comp.c | 4 ++-- src/lib/krb5/krb/addr_order.c | 4 ++-- src/lib/krb5/krb/addr_srch.c | 4 ++-- src/lib/krb5/krb/bld_pr_ext.c | 4 ++-- src/lib/krb5/krb/bld_princ.c | 4 ++-- src/lib/krb5/krb/encrypt_tk.c | 2 +- src/lib/krb5/krb/gen_seqnum.c | 2 +- src/lib/krb5/krb/gen_subkey.c | 2 +- 11 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index 71c5a4208..fa1e715e2 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,8 @@ +2000-03-12 Ezra Peisach + + * ktbase.c (krb5_kt_resolve): Change prototype from const to + krb5_const to match krb5.hin + 1999-10-26 Tom Yu * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index 32c84a47b..f438ca6a6 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -84,7 +84,7 @@ krb5_kt_register(context, ops) KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_kt_resolve (context, name, ktid) krb5_context context; - const char FAR *name; + krb5_const char FAR *name; krb5_keytab FAR *ktid; { struct krb5_kt_typelist *tlist; diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 98c7b1e1a..7d436c7c4 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,10 @@ +2000-03-12 Ezra Peisach + + * addr_comp.c, addr_order.c, addr_srch.c, bld_pr_ext.c, + bld_princ.c, encrypt_tk.c, gen_seqnum.c, gen_subkey.c: Change + prototypes to use krb5_const instead of const to match the entries + in krb5.hin + 2000-03-10 Miro Jurisic * get_in_tkt.c (krb5_get_init_creds): Always initialize local_as_reply diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c index 359e570fd..587bd5ff3 100644 --- a/src/lib/krb5/krb/addr_comp.c +++ b/src/lib/krb5/krb/addr_comp.c @@ -35,8 +35,8 @@ krb5_boolean krb5_address_compare(context, addr1, addr2) krb5_context context; - const krb5_address *addr1; - const krb5_address *addr2; + krb5_const krb5_address *addr1; + krb5_const krb5_address *addr2; { if (addr1->addrtype != addr2->addrtype) return(FALSE); diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c index f9a92b470..800fa2b1a 100644 --- a/src/lib/krb5/krb/addr_order.c +++ b/src/lib/krb5/krb/addr_order.c @@ -40,8 +40,8 @@ int krb5_address_order(context, addr1, addr2) krb5_context context; - register const krb5_address *addr1; - register const krb5_address *addr2; + register krb5_const krb5_address *addr1; + register krb5_const krb5_address *addr2; { int dir; register int i; diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c index 75da7d21d..25b515664 100644 --- a/src/lib/krb5/krb/addr_srch.c +++ b/src/lib/krb5/krb/addr_srch.c @@ -36,8 +36,8 @@ krb5_boolean krb5_address_search(context, addr, addrlist) krb5_context context; - const krb5_address *addr; - krb5_address * const * addrlist; + krb5_const krb5_address *addr; + krb5_address * krb5_const * addrlist; { if (!addrlist) return TRUE; diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c index 52f4ebb50..f2c450f59 100644 --- a/src/lib/krb5/krb/bld_pr_ext.c +++ b/src/lib/krb5/krb/bld_pr_ext.c @@ -37,13 +37,13 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV_C #ifdef HAVE_STDARG_H -krb5_build_principal_ext(krb5_context context, krb5_principal FAR * princ, int rlen, const char FAR * realm, ...) +krb5_build_principal_ext(krb5_context context, krb5_principal FAR * princ, int rlen, krb5_const char FAR * realm, ...) #else krb5_build_principal_ext(context, princ, rlen, realm, va_alist) krb5_context context; krb5_principal FAR *princ; int rlen; - const char FAR *realm; + krb5_const char FAR *realm; va_dcl #endif { diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index 417c980bf..bf4910510 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -102,13 +102,13 @@ krb5_build_principal_va(context, princ, rlen, realm, ap) KRB5_DLLIMP krb5_error_code KRB5_CALLCONV_C #ifdef HAVE_STDARG_H krb5_build_principal(krb5_context context, krb5_principal * princ, int rlen, - const char * realm, ...) + krb5_const char FAR * realm, ...) #else krb5_build_principal(context, princ, rlen, realm, va_alist) krb5_context context; krb5_principal *princ; int rlen; - const char *realm; + krb5_const char FAR *realm; va_dcl #endif { diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index 07642f04e..6b7c94bdb 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -44,7 +44,7 @@ krb5_error_code krb5_encrypt_tkt_part(context, srv_key, dec_ticket) krb5_context context; - const krb5_keyblock *srv_key; + krb5_const krb5_keyblock *srv_key; register krb5_ticket *dec_ticket; { krb5_data *scratch; diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c index 0089c5d2a..e9b387815 100644 --- a/src/lib/krb5/krb/gen_seqnum.c +++ b/src/lib/krb5/krb/gen_seqnum.c @@ -38,7 +38,7 @@ krb5_error_code krb5_generate_seq_number(context, key, seqno) krb5_context context; - const krb5_keyblock *key; + krb5_const krb5_keyblock *key; krb5_int32 *seqno; { krb5_data seed; diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c index bf6eed938..41b8dd3a9 100644 --- a/src/lib/krb5/krb/gen_subkey.c +++ b/src/lib/krb5/krb/gen_subkey.c @@ -32,7 +32,7 @@ krb5_error_code krb5_generate_subkey(context, key, subkey) krb5_context context; - const krb5_keyblock *key; + krb5_const krb5_keyblock *key; krb5_keyblock **subkey; { krb5_error_code retval; -- 2.26.2