change const krb5_pointer to krb5_const_pointer

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

diff --git a/src/include/krb5/asn.1/encode.h b/src/include/krb5/asn.1/encode.h
index 584ed363cd8e3a00b4e94fe3ddb32eec4b17cec9..a40172f6ccfca0afe2238b23190103c1e4237ac5 100644 (file)
--- a/src/include/krb5/asn.1/encode.h
+++ b/src/include/krb5/asn.1/encode.h
@@ -23,7 +23,7 @@ typedef int (*decoder_func) PROTOTYPE((PE, int, int, char *, krb5_pointer));
 
 /* encode.c */
 krb5_error_code krb5_encode_generic
-    PROTOTYPE((const krb5_pointer,
+    PROTOTYPE((krb5_const_pointer,
               krb5_data **,
               int (* )PROTOTYPE ((PE *,int,int,char *,krb5_pointer )),
               krb5_pointer (* )PROTOTYPE ((krb5_pointer,int *)),
@@ -56,7 +56,7 @@ krb5_error_code encode_krb5_as_req
                   krb5_data **));
 
 #define encode_krb5_authenticator(pauth, output) \
-    krb5_encode_generic((krb5_pointer)pauth,  output, \
+    krb5_encode_generic((krb5_const_pointer)pauth,  output, \
                   (encoder_func) encode_KRB5_Authenticator, \
                   (translator_func) krb5_authenticator2KRB5_Authenticator, \
                   (free_func) free_KRB5_Authenticator)
@@ -67,7 +67,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_Authenticator)
                                                
 #define encode_krb5_ticket(ptick, output) \
-    krb5_encode_generic((krb5_pointer)ptick,  output, \
+    krb5_encode_generic((krb5_const_pointer)ptick,  output, \
                   (encoder_func) encode_KRB5_Ticket, \
                   (translator_func) krb5_ticket2KRB5_Ticket, \
                   (free_func) free_KRB5_Ticket)
@@ -78,7 +78,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_Ticket)
 
 #define encode_krb5_enc_tkt_part(ptick, output) \
-    krb5_encode_generic((krb5_pointer)ptick,  output, \
+    krb5_encode_generic((krb5_const_pointer)ptick,  output, \
                   (encoder_func) encode_KRB5_EncTicketPart, \
                   (translator_func) krb5_enc_tkt_part2KRB5_EncTicketPart, \
                   (free_func) free_KRB5_EncTicketPart)
@@ -89,7 +89,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_EncTicketPart)
 
 #define encode_krb5_enc_kdc_rep_part(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_EncTGSRepPart, \
                   (translator_func) krb5_enc_kdc_rep_part2KRB5_EncTGSRepPart, \
                   (free_func) free_KRB5_EncTGSRepPart)
@@ -100,7 +100,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_EncTGSRepPart)
 
 #define encode_krb5_tgs_rep(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_TGS__REP, \
                   (translator_func) krb5_tgs_rep2KRB5_KDC__REP, \
                   (free_func) free_KRB5_TGS__REP)
@@ -111,7 +111,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_TGS__REP)
 
 #define encode_krb5_ap_req(req, output) \
-    krb5_encode_generic((krb5_pointer)req,  output, \
+    krb5_encode_generic((krb5_const_pointer)req,  output, \
                   (encoder_func) encode_KRB5_AP__REQ, \
                   (translator_func) krb5_ap_req2KRB5_AP__REQ, \
                   (free_func) free_KRB5_AP__REQ)
@@ -122,7 +122,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_AP__REQ)
 
 #define encode_krb5_ap_rep(reply, output) \
-    krb5_encode_generic((krb5_pointer)reply, output, \
+    krb5_encode_generic((krb5_const_pointer)reply, output, \
                   (encoder_func) encode_KRB5_AP__REP, \
                   (translator_func) krb5_ap_rep2KRB5_AP__REP, \
                   (free_func) free_KRB5_AP__REP)
@@ -133,7 +133,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_AP__REP)
 
 #define encode_krb5_ap_rep_enc_part(rpart, output) \
-    krb5_encode_generic((krb5_pointer)rpart, output, \
+    krb5_encode_generic((krb5_const_pointer)rpart, output, \
                   (encoder_func) encode_KRB5_EncAPRepPart, \
                   (translator_func) krb5_ap_rep_enc_part2KRB5_EncAPRepPart, \
                   (free_func) free_KRB5_EncAPRepPart)
@@ -144,7 +144,7 @@ krb5_error_code encode_krb5_as_req
                    (free_func) free_KRB5_EncAPRepPart)
 
 #define encode_krb5_tgs_req(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_TGS__REQ, \
                   (translator_func) krb5_kdc_req2KRB5_TGS__REQ, \
                   (free_func) free_KRB5_TGS__REQ)
@@ -155,7 +155,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_TGS__REQ)
 
 #define encode_krb5_kdc_req_body(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_KDC__REQ__BODY, \
                   (translator_func) krb5_kdc_req2KRB5_KDC__REQ__BODY, \
                   (free_func) free_KRB5_KDC__REQ__BODY)
@@ -166,7 +166,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_KDC__REQ__BODY)
 
 #define encode_krb5_safe(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_KRB__SAFE, \
                   (translator_func) krb5_safe2KRB5_KRB__SAFE, \
                   (free_func) free_KRB5_KRB__SAFE)
@@ -177,7 +177,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_KRB__SAFE)
 
 #define encode_krb5_priv(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_KRB__PRIV, \
                   (translator_func) krb5_priv2KRB5_KRB__PRIV, \
                   (free_func) free_KRB5_KRB__PRIV)
@@ -188,7 +188,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_KRB__PRIV)
 
 #define encode_krb5_enc_priv_part(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_EncKrbPrivPart, \
                   (translator_func) krb5_priv_enc_part2KRB5_EncKrbPrivPart, \
                   (free_func) free_KRB5_EncKrbPrivPart)
@@ -199,7 +199,7 @@ krb5_error_code encode_krb5_as_req
                   (free_func) free_KRB5_EncKrbPrivPart)
 
 #define encode_krb5_error(req, output) \
-    krb5_encode_generic((krb5_pointer)req, output, \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
                   (encoder_func) encode_KRB5_KRB__ERROR, \
                   (translator_func) krb5_error2KRB5_KRB__ERROR, \
                   (free_func) free_KRB5_KRB__ERROR)

diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index cead95a204c08a20a51edee2775cf8d9debf160a..9ffe8083cef28b97d92cc46345224178d5f13a3b 100644 (file)
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -43,12 +43,12 @@ 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_error_code (*encrypt_func) PROTOTYPE((const krb5_pointer /* in */,
+    krb5_error_code (*encrypt_func) PROTOTYPE((krb5_const_pointer /* in */,
                                               krb5_pointer /* out */,
                                               const size_t,
                                               krb5_encrypt_block *,
                                               krb5_pointer));
-    krb5_error_code (*decrypt_func) PROTOTYPE((const krb5_pointer /* in */,
+    krb5_error_code (*decrypt_func) PROTOTYPE((krb5_const_pointer /* in */,
                                               krb5_pointer /* out */,
                                               const size_t,
                                               krb5_encrypt_block *,

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index fea33902cb54ad20dfc3a3615460f0d6aac77783..e07ec9e4dc17067729941a413321339c74adcf29 100644 (file)
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -31,7 +31,7 @@ krb5_error_code krb5_decode_kdc_rep
                   krb5_kdc_rep ** ));
 krb5_error_code krb5_kdc_rep_decrypt_proc
        PROTOTYPE((const krb5_keyblock *,
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_kdc_rep * ));
 krb5_error_code krb5_encode_ticket
        PROTOTYPE((const krb5_ticket *,
@@ -72,11 +72,11 @@ krb5_error_code krb5_get_in_tkt
                   krb5_error_code (* )(const krb5_keytype,
                                        krb5_keyblock **,
                                        krb5_pointer ),
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_error_code (* )(const krb5_keyblock *,
-                                       const krb5_pointer,
+                                       krb5_const_pointer,
                                        krb5_kdc_rep * ),
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_creds *,
                   krb5_ccache ));
 krb5_error_code krb5_get_in_tkt_with_password
@@ -118,24 +118,24 @@ krb5_error_code krb5_rd_req
        PROTOTYPE((const krb5_data *,
                   const krb5_principal,
                   const krb5_address *,
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_error_code (* )(krb5_pointer,
                                        krb5_principal,
                                        krb5_kvno,
                                        krb5_keyblock ** ),
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_rcache,
                   krb5_tkt_authent * ));
 krb5_error_code krb5_rd_req_decoded
        PROTOTYPE((const krb5_ap_req *,
                   const krb5_principal,
                   const krb5_address *,
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_error_code (* )(krb5_pointer,
                                        krb5_principal,
                                        krb5_kvno,
                                        krb5_keyblock ** ),
-                  const krb5_pointer,
+                  krb5_const_pointer,
                   krb5_rcache,
                   krb5_tkt_authent * ));
 krb5_error_code krb5_mk_rep

diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c
index 097100114eece5c2f016e1af81dd00375103de0e..0b4c6e882a5a816f539715d61d05721e59b82eed 100644 (file)
--- a/src/lib/crypto/des/cs_entry.c
+++ b/src/lib/crypto/des/cs_entry.c
@@ -21,12 +21,12 @@ static char rcsid_cs_entry_c[] =
 #include <krb5/mit-des.h>
 #include <krb5/crc-32.h>
 
-extern krb5_error_code mit_des_encrypt_func PROTOTYPE((const krb5_pointer,
+extern krb5_error_code mit_des_encrypt_func PROTOTYPE((krb5_const_pointer,
                                                       krb5_pointer,
                                                       const size_t,
                                                       krb5_encrypt_block *,
                                                       krb5_pointer));
-extern krb5_error_code mit_des_decrypt_func PROTOTYPE((const krb5_pointer,
+extern krb5_error_code mit_des_decrypt_func PROTOTYPE((krb5_const_pointer,
                                                       krb5_pointer,
                                                       const size_t,
                                                       krb5_encrypt_block *,

diff --git a/src/lib/krb5/asn.1/encode.c b/src/lib/krb5/asn.1/encode.c
index 33340dfc142526663ab239597291aaa5b86402c6..8caadd841ff3a6738b96320d801c8c795143a6bf 100644 (file)
--- a/src/lib/krb5/asn.1/encode.c
+++ b/src/lib/krb5/asn.1/encode.c
@@ -28,7 +28,7 @@ static char rcsid_encode_c[] =
 
 krb5_error_code
 krb5_encode_generic(input, data_out, encoder, translator, free_translation)
-const krb5_pointer input;
+krb5_const_pointer input;
 register krb5_data **data_out;
 int (*encoder) PROTOTYPE((PE *, int, int, char *, krb5_pointer));
 krb5_pointer (*translator) PROTOTYPE((krb5_pointer, int * ));

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 35e8e2d42ab090d4e35aee8b762dce3b0eec0fb0..fd11cbb0c9e461001edb5d9a92a9f54c3b5aded4 100644 (file)
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -60,7 +60,7 @@ typedef krb5_error_code (*git_key_proc) PROTOTYPE((const krb5_keytype,
                                                   krb5_keyblock **,
                                                   krb5_pointer ));
 typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((const krb5_keyblock *,
-                                                      const krb5_pointer,
+                                                      krb5_const_pointer,
                                                       krb5_kdc_rep * ));
 krb5_error_code
 krb5_get_in_tkt(DECLARG(const krb5_flags, options),
@@ -68,9 +68,9 @@ krb5_get_in_tkt(DECLARG(const krb5_flags, options),
                DECLARG(const krb5_enctype, etype),
                DECLARG(const krb5_keytype, keytype),
                DECLARG(git_key_proc, key_proc),
-               DECLARG(const krb5_pointer, keyseed),
+               DECLARG(krb5_const_pointer, keyseed),
                DECLARG(git_decrypt_proc, decrypt_proc),
-               DECLARG(const krb5_pointer, decryptarg),
+               DECLARG(krb5_const_pointer, decryptarg),
                DECLARG(krb5_creds *, creds),
                DECLARG(krb5_ccache, ccache))
 OLDDECLARG(const krb5_flags, options)
@@ -78,9 +78,9 @@ OLDDECLARG(krb5_address * const *, addrs)
 OLDDECLARG(const krb5_enctype, etype)
 OLDDECLARG(const krb5_keytype, keytype)
 OLDDECLARG(git_key_proc, key_proc)
-OLDDECLARG(const krb5_pointer, keyseed)
+OLDDECLARG(krb5_const_pointer, keyseed)
 OLDDECLARG(git_decrypt_proc, decrypt_proc)
-OLDDECLARG(const krb5_pointer, decryptarg)
+OLDDECLARG(krb5_const_pointer, decryptarg)
 OLDDECLARG(krb5_creds *, creds)
 OLDDECLARG(krb5_ccache, ccache)
 {

diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c
index 273a6a2471322a8a6feec31dbee1d91207170b3b..8fb19d7241e7a5f878f682730d9e6d1b21cde953 100644 (file)
--- a/src/lib/krb5/krb/kdc_rep_dc.c
+++ b/src/lib/krb5/krb/kdc_rep_dc.c
@@ -29,10 +29,10 @@ static char rcsid_kdc_rep_dc_c [] =
 /*ARGSUSED*/
 krb5_error_code
 krb5_kdc_rep_decrypt_proc(DECLARG(const krb5_keyblock *, key),
-                         DECLARG(const krb5_pointer, decryptarg),
+                         DECLARG(krb5_const_pointer, decryptarg),
                          DECLARG(krb5_kdc_rep *, dec_rep))
 OLDDECLARG(const krb5_keyblock *, key)
-OLDDECLARG(const krb5_pointer, decryptarg)
+OLDDECLARG(krb5_const_pointer, decryptarg)
 OLDDECLARG(krb5_kdc_rep *, dec_rep)
 {
     krb5_error_code retval;

diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 6345ec9e30927b2ada782a6368fc371e2789f459..1a4486cc97c6a624d63c8c2e80a3c75b11ed5c8a 100644 (file)
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -51,12 +51,12 @@ krb5_rd_req(inbuf, server, sender_addr, fetchfrom, keyproc, keyprocarg,
 const krb5_data *inbuf;
 const krb5_principal server;
 const krb5_address *sender_addr;
-const krb5_pointer fetchfrom;
+krb5_const_pointer fetchfrom;
 krb5_error_code (*keyproc) PROTOTYPE((krb5_pointer, 
                                      krb5_principal,
                                      krb5_kvno,
                                      krb5_keyblock **));
-const krb5_pointer keyprocarg;
+krb5_const_pointer keyprocarg;
 krb5_rcache rcache;
 krb5_tkt_authent *authdat;
 {

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index f63cfa5fef3bf09735d0ab52b29808c8d380387b..bf1193973c55e03b0d89010f7afcf8c369e1dcc4 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -60,12 +60,12 @@ krb5_rd_req_decoded(req, server, sender_addr, fetchfrom, keyproc, keyprocarg,
 const krb5_ap_req *req;
 const krb5_principal server;
 const krb5_address *sender_addr;
-const krb5_pointer fetchfrom;
+krb5_const_pointer fetchfrom;
 krb5_error_code (*keyproc) PROTOTYPE((krb5_pointer,
                                      krb5_principal,
                                      krb5_kvno,
                                      krb5_keyblock **));
-const krb5_pointer keyprocarg;
+krb5_const_pointer keyprocarg;
 krb5_rcache rcache;
 krb5_tkt_authent *tktauthent;
 {