change 'const krb5_principal' to krb5_const_principal

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

diff --git a/src/include/krb5/asn.1/asn1defs.h b/src/include/krb5/asn.1/asn1defs.h
index e43fdd2de6c607a99ebbac86b7c43a36f7b56f8b..b4a0e5cd27b0ba864f7d2fa8d3215cd7e270c5fc 100644 (file)
--- a/src/include/krb5/asn.1/asn1defs.h
+++ b/src/include/krb5/asn.1/asn1defs.h
@@ -158,7 +158,7 @@ struct type_KRB5_EncKrbPrivPart *krb5_priv_enc_part2KRB5_EncKrbPrivPart
 
 /* kprin2prin.c */
 struct type_KRB5_PrincipalName *krb5_principal2KRB5_PrincipalName
-       PROTOTYPE((const krb5_principal , int *));
+       PROTOTYPE((krb5_const_principal , int *));
 
 /* kpriv2priv.c */
 struct type_KRB5_KRB__PRIV *krb5_priv2KRB5_KRB__PRIV

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index e07ec9e4dc17067729941a413321339c74adcf29..0c63875fc8d9bc21049434902aa47c6c5a35558d 100644 (file)
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -47,7 +47,7 @@ krb5_error_code krb5_send_tgs
                   const krb5_ticket_times *,
                   const krb5_enctype,
                   const krb5_cksumtype,
-                  const krb5_principal,
+                  krb5_const_principal,
                   krb5_address * const *,
                   krb5_authdata * const *,
                   const krb5_data *,
@@ -95,7 +95,7 @@ krb5_error_code krb5_get_in_tkt_with_skey
                   krb5_ccache,
                   krb5_creds * ));
 krb5_error_code krb5_mk_req
-       PROTOTYPE((const krb5_principal,
+       PROTOTYPE((krb5_const_principal,
                   const krb5_flags,
                   const krb5_checksum *,
                   krb5_ccache,
@@ -111,12 +111,12 @@ krb5_error_code krb5_mk_req_extended
                   krb5_data * ));
 krb5_error_code krb5_rd_req_simple
        PROTOTYPE((const krb5_data *,
-                  const krb5_principal,
+                  krb5_const_principal,
                   const krb5_address *,
                   krb5_tkt_authent * ));
 krb5_error_code krb5_rd_req
        PROTOTYPE((const krb5_data *,
-                  const krb5_principal,
+                  krb5_const_principal,
                   const krb5_address *,
                   krb5_const_pointer,
                   krb5_error_code (* )(krb5_pointer,
@@ -128,7 +128,7 @@ krb5_error_code krb5_rd_req
                   krb5_tkt_authent * ));
 krb5_error_code krb5_rd_req_decoded
        PROTOTYPE((const krb5_ap_req *,
-                  const krb5_principal,
+                  krb5_const_principal,
                   const krb5_address *,
                   krb5_const_pointer,
                   krb5_error_code (* )(krb5_pointer,
@@ -184,10 +184,10 @@ krb5_error_code krb5_parse_name
        PROTOTYPE((const char *,
                   krb5_principal * ));
 krb5_error_code krb5_unparse_name
-       PROTOTYPE((const krb5_principal,
+       PROTOTYPE((krb5_const_principal,
                   char ** ));
 krb5_error_code krb5_unparse_name_ext
-       PROTOTYPE((const krb5_principal,
+       PROTOTYPE((krb5_const_principal,
                   char **,
                   int *));
 krb5_boolean krb5_address_search
@@ -200,8 +200,8 @@ int krb5_address_order
        PROTOTYPE((const krb5_address *,
                   const krb5_address *));
 krb5_boolean krb5_principal_compare
-       PROTOTYPE((const krb5_principal,
-                  const krb5_principal));
+       PROTOTYPE((krb5_const_principal,
+                  krb5_const_principal));
 int krb5_fulladdr_order
        PROTOTYPE((const krb5_fulladdr *,
                   const krb5_fulladdr *));
@@ -215,7 +215,7 @@ krb5_error_code krb5_copy_data
     PROTOTYPE((const krb5_data *,
               krb5_data **));
 krb5_error_code krb5_copy_principal
-    PROTOTYPE((const krb5_principal,
+    PROTOTYPE((krb5_const_principal,
               krb5_principal *));
 krb5_error_code krb5_copy_addresses
     PROTOTYPE((krb5_address * const *,

diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index cf747aca7baaba2613122d38479af4e86d217684..80f300cce5dfc649a34ebdb426265f2cd0f6a0cf 100644 (file)
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -57,7 +57,7 @@ krb5_error_code krb5_get_krbhst
 krb5_error_code krb5_free_krbhst
        PROTOTYPE((char * const * ));
 krb5_error_code krb5_aname_to_localname
-       PROTOTYPE((const krb5_principal,
+       PROTOTYPE((krb5_const_principal,
                   const int,
                   char * ));
 krb5_error_code krb5_get_default_realm

diff --git a/src/lib/krb5/asn.1/kprin2prin.c b/src/lib/krb5/asn.1/kprin2prin.c
index d0e47f4243bad6fcc11f134d4496b29bdeaac094..33500c6728ab4a6d257dc95d568d7761812d8459 100644 (file)
--- a/src/lib/krb5/asn.1/kprin2prin.c
+++ b/src/lib/krb5/asn.1/kprin2prin.c
@@ -30,7 +30,7 @@ static char rcsid_kprin2prin_c[] =
 
 struct type_KRB5_PrincipalName *
 krb5_principal2KRB5_PrincipalName(val, error)
-const krb5_principal val;
+krb5_const_principal val;
 register int *error;
 {
     register int i;

diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c
index cdbdfab78ce06911a393891991dfa5728152ced9..ad13beb666ec02bd4d95c0f524fe49da2e199a99 100644 (file)
--- a/src/lib/krb5/krb/copy_princ.c
+++ b/src/lib/krb5/krb/copy_princ.c
@@ -25,7 +25,7 @@ static char rcsid_copy_princ_c[] =
  */
 krb5_error_code
 krb5_copy_principal(inprinc, outprinc)
-const krb5_principal inprinc;
+krb5_const_principal inprinc;
 krb5_principal *outprinc;
 {
     krb5_error_code retval;

diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index 7a9dc7b6e064988296606f1dab672e4543763465..fb032280b59a09e304a016dbd78a78b5b7336574 100644 (file)
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -26,8 +26,8 @@ krb5_error_code krb5_get_cred_via_tgt
               const krb5_cksumtype,
               krb5_creds * ));
 krb5_error_code krb5_walk_realm_tree
-    PROTOTYPE((const krb5_principal,
-              const krb5_principal,
+    PROTOTYPE((krb5_const_principal,
+              krb5_const_principal,
               krb5_principal **));
 void krb5_free_realm_tree
     PROTOTYPE((const krb5_principal *));

diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index b3cbcc3a596e641d08d8c534cc0d5a93424a778a..ecd2d028367441ab5a9418671c06dfd48b54b400 100644 (file)
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -43,7 +43,7 @@ extern krb5_flags krb5_kdc_default_options;
 
 krb5_error_code
 krb5_mk_req(server, ap_req_options, checksum, ccache, outbuf)
-const krb5_principal server;
+krb5_const_principal server;
 const krb5_flags ap_req_options;
 const krb5_checksum *checksum;
 krb5_ccache ccache;

diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c
index e2543c6d86f8fd50d1181abb5a85efdcc4c26390..8d28d7e840d0202ef4af744e75fe6665e02fd1a6 100644 (file)
--- a/src/lib/krb5/krb/princ_comp.c
+++ b/src/lib/krb5/krb/princ_comp.c
@@ -27,8 +27,8 @@ static char rcsid_princ_comp_c[] =
 
 krb5_boolean
 krb5_principal_compare(princ1, princ2)
-const krb5_principal princ1;
-const krb5_principal princ2;
+krb5_const_principal princ1;
+krb5_const_principal princ2;
 {
     register krb5_data **p1, **p2;
 

diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 1a4486cc97c6a624d63c8c2e80a3c75b11ed5c8a..06d22e982f248181ac3d914cf53ac148ff235f9f 100644 (file)
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -49,7 +49,7 @@ krb5_error_code
 krb5_rd_req(inbuf, server, sender_addr, fetchfrom, keyproc, keyprocarg,
            rcache, authdat)
 const krb5_data *inbuf;
-const krb5_principal server;
+krb5_const_principal server;
 const krb5_address *sender_addr;
 krb5_const_pointer fetchfrom;
 krb5_error_code (*keyproc) PROTOTYPE((krb5_pointer, 

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index bf1193973c55e03b0d89010f7afcf8c369e1dcc4..48052d87501cd9afd285bdbcecc2f06e942c646e 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -58,7 +58,7 @@ krb5_error_code
 krb5_rd_req_decoded(req, server, sender_addr, fetchfrom, keyproc, keyprocarg,
                    rcache, tktauthent)
 const krb5_ap_req *req;
-const krb5_principal server;
+krb5_const_principal server;
 const krb5_address *sender_addr;
 krb5_const_pointer fetchfrom;
 krb5_error_code (*keyproc) PROTOTYPE((krb5_pointer,

diff --git a/src/lib/krb5/krb/rd_req_sim.c b/src/lib/krb5/krb/rd_req_sim.c
index 12200f33f0fed617319208af99c0c7aacd859c98..657309b9e0c5ae2a663497ebefd617d47ce61cca 100644 (file)
--- a/src/lib/krb5/krb/rd_req_sim.c
+++ b/src/lib/krb5/krb/rd_req_sim.c
@@ -42,7 +42,7 @@ static char rcsid_rd_req_sim_c[] =
 krb5_error_code
 krb5_rd_req_simple(inbuf, server, sender_addr, authdat)
 const krb5_data *inbuf;
-const krb5_principal server;
+krb5_const_principal server;
 const krb5_address *sender_addr;
 krb5_tkt_authent *authdat;
 {

diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index ddebd213d59daa7dbd2a06ecd5565a608117046c..1e73897b0c1bbb57db2a7be7f8df100fc153df22 100644 (file)
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -44,7 +44,7 @@ krb5_send_tgs(DECLARG(const krb5_flags, kdcoptions),
              DECLARG(const krb5_ticket_times *,timestruct),
              DECLARG(const krb5_enctype, etype),
              DECLARG(const krb5_cksumtype, sumtype),
-             DECLARG(const krb5_principal, sname),
+             DECLARG(krb5_const_principal, sname),
              DECLARG(krb5_address * const *, addrs),
              DECLARG(krb5_authdata * const *,authorization_data),
              DECLARG(const krb5_data *,second_ticket),
@@ -54,7 +54,7 @@ OLDDECLARG(const krb5_flags, kdcoptions)
 OLDDECLARG(const krb5_ticket_times *,timestruct)
 OLDDECLARG(const krb5_enctype, etype)
 OLDDECLARG(const krb5_cksumtype, sumtype)
-OLDDECLARG(const krb5_principal, sname)
+OLDDECLARG(krb5_const_principal, sname)
 OLDDECLARG(krb5_address * const *, addrs)
 OLDDECLARG(krb5_authdata * const *,authorization_data)
 OLDDECLARG(const krb5_data *,second_ticket)

diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c
index f4b4fa563e513d7beace005014c7540124626aed..25979174a15878434d880def1b5a1b590be693fa 100644 (file)
--- a/src/lib/krb5/krb/walk_rtree.c
+++ b/src/lib/krb5/krb/walk_rtree.c
@@ -31,7 +31,7 @@ static char rcsid_walk_rtree_c[] =
 
 krb5_error_code
 krb5_walk_realm_tree(client, server, tree)
-const krb5_principal client, server;
+krb5_const_principal client, server;
 krb5_principal **tree;
 {
     krb5_error_code retval;

diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index 2e42f0627e9152898f520a4f9b086ac0d1180601..7e33a0365a09a6eef463a24ddd5dda434293097a 100644 (file)
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -56,7 +56,7 @@ extern char *krb5_lname_file;
  */
 krb5_error_code
 krb5_aname_to_localname(aname, lnsize, lname)
-const krb5_principal aname;
+krb5_const_principal aname;
 const int lnsize;
 char *lname;
 {
@@ -104,7 +104,7 @@ char *lname;
  */
 krb5_error_code
 krb5_aname_to_localname(aname, lnsize, lname)
-const krb5_principal aname;
+krb5_const_principal aname;
 const int lnsize;
 char *lname;
 {