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

diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 71c5a42084dd4e16ca4889269c6caabfdb64f137..fa1e715e2617d2062f7576e87fd44fe296769a25 100644 (file)
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-12  Ezra Peisach  <epeisach@mit.edu>
+
+       * ktbase.c (krb5_kt_resolve): Change prototype from const to
+       krb5_const to match krb5.hin
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
        * 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 32c84a47bf930a3849ee884e569df4afa574e7c7..f438ca6a6364089298fe74252da60d0e0a3a3459 100644 (file)
--- 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 98c7b1e1aa19e9fec83b6e2322b414b1d23006bf..7d436c7c4069c6fcdc08b2998971627647368410 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-12  Ezra Peisach  <epeisach@mit.edu>
+
+       * 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  <meeroh@mit.edu>
 
        * 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 359e570fd2b61161c797ed659c131ea456870c1f..587bd5ff3257d003e6774bf91f8e0b298b34cb65 100644 (file)
--- 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 f9a92b470cce52b5341eda1f37c2154d739240ff..800fa2b1aaa48a2a24392fa8c6446a92e6621d70 100644 (file)
--- 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 75da7d21d2d94afa1df6281088b299f962cbc1fb..25b51566445b8a0306f7a1501472353f221ee327 100644 (file)
--- 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 52f4ebb50b7d155cda66b9ac7d769e45a83d60e3..f2c450f594f6d8b9c5cd76ad5bf7820931a1ae46 100644 (file)
--- 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 417c980bf090abe9172bce1eeb575c0b86512e3d..bf4910510c9038a2f0ae941b4765db8f9ac08356 100644 (file)
--- 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 07642f04e4a03153797cecbddcbfaf03b0bb5f81..6b7c94bdb04b9509b1cd35cc5b51abe53e2b0a09 100644 (file)
--- 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 0089c5d2a93c2e45381bb3fab4502c07c420f796..e9b387815edf5d87819de4a4a2035af401fc2253 100644 (file)
--- 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 bf6eed93834b8383b55e8bccbab9b8a876122369..41b8dd3a9ed8ef637a6b45c1846b80a3d1215012 100644 (file)
--- 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;