GCC wants the "register" keyword to be first (before the "const" keyword)

Fixed a number of memory leaks.

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

diff --git a/src/lib/krb5/asn.1/aprp2kaprp.c b/src/lib/krb5/asn.1/aprp2kaprp.c
index 49bc5b297f82a0b52f5b300591d3d986a3c8a929..a77c1edf882146750a010f78398a01ba6d9dc59b 100644 (file)
--- a/src/lib/krb5/asn.1/aprp2kaprp.c
+++ b/src/lib/krb5/asn.1/aprp2kaprp.c
@@ -43,7 +43,7 @@ static char rcsid_aprp2kaprp_c[] =
 
 krb5_ap_rep *
 KRB5_AP__REP2krb5_ap_rep(val, error)
-const register struct type_KRB5_AP__REP *val;
+register const struct type_KRB5_AP__REP *val;
 register int *error;
 {
     register krb5_ap_rep *retval;

diff --git a/src/lib/krb5/asn.1/aprq2kaprq.c b/src/lib/krb5/asn.1/aprq2kaprq.c
index 7c587723c0558c263752e93264dbbcb4a3541dd7..c67c01b4d1164034dfe002c66a13c383b270328c 100644 (file)
--- a/src/lib/krb5/asn.1/aprq2kaprq.c
+++ b/src/lib/krb5/asn.1/aprq2kaprq.c
@@ -43,7 +43,7 @@ static char rcsid_aprq2kaprq_c[] =
 
 krb5_ap_req *
 KRB5_AP__REQ2krb5_ap_req(val, error)
-const register struct type_KRB5_AP__REQ *val;
+register const struct type_KRB5_AP__REQ *val;
 register int *error;
 {
     register krb5_ap_req *retval;

diff --git a/src/lib/krb5/asn.1/arep2karep.c b/src/lib/krb5/asn.1/arep2karep.c
index 25a4cfd87ac5cca613d79e560db119a281d8fb2c..a123a55e9231064aa37e11b6ebfe8e1742d65b54 100644 (file)
--- a/src/lib/krb5/asn.1/arep2karep.c
+++ b/src/lib/krb5/asn.1/arep2karep.c
@@ -43,7 +43,7 @@ static char rcsid_arep2karep_c[] =
 
 krb5_ap_rep_enc_part *
 KRB5_EncAPRepPart2krb5_ap_rep_enc_part(val, error)
-const register struct type_KRB5_EncAPRepPart *val;
+register const struct type_KRB5_EncAPRepPart *val;
 register int *error;
 {
     register krb5_ap_rep_enc_part *retval;

diff --git a/src/lib/krb5/asn.1/auth2kauth.c b/src/lib/krb5/asn.1/auth2kauth.c
index 91fa9a2a8b9a6aed6d1e8a0f5e00ab98c8de9b9f..66d00a4466ed99f135a81c7f9a4580d86c2abc72 100644 (file)
--- a/src/lib/krb5/asn.1/auth2kauth.c
+++ b/src/lib/krb5/asn.1/auth2kauth.c
@@ -43,7 +43,7 @@ static char rcsid_auth2kauth_c[] =
 
 krb5_authenticator *
 KRB5_Authenticator2krb5_authenticator(val, error)
-const register struct type_KRB5_Authenticator *val;
+register const struct type_KRB5_Authenticator *val;
 register int *error;
 {
     register krb5_authenticator *retval;

diff --git a/src/lib/krb5/asn.1/ck2kck.c b/src/lib/krb5/asn.1/ck2kck.c
index f68927e28f7acaf20011fcedda36c47f6de4ad15..fc4c725ab2194f4a2de8a5426e5343fca497369c 100644 (file)
--- a/src/lib/krb5/asn.1/ck2kck.c
+++ b/src/lib/krb5/asn.1/ck2kck.c
@@ -43,7 +43,7 @@ static char rcsid_ck2kck_c[] =
 
 krb5_checksum *
 KRB5_Checksum2krb5_checksum(val, error)
-const register struct type_KRB5_Checksum *val;
+register const struct type_KRB5_Checksum *val;
 register int *error;
 {
     krb5_checksum *retval;

diff --git a/src/lib/krb5/asn.1/cred2kcred.c b/src/lib/krb5/asn.1/cred2kcred.c
index 2cd082a6d4b37a2d4f790a30ee6b384c038468b7..793ce784fe07ce5827b0b5e4f3e9a2967c6e2ddc 100644 (file)
--- a/src/lib/krb5/asn.1/cred2kcred.c
+++ b/src/lib/krb5/asn.1/cred2kcred.c
@@ -43,7 +43,7 @@ static char rcsid_cred2kcred_c[] =
 
 krb5_cred *
 KRB5_KRB__CRED2krb5_cred(val, error)
-const register struct type_KRB5_KRB__CRED *val;
+register const struct type_KRB5_KRB__CRED *val;
 register int *error;
 {
     register krb5_cred *retval;

diff --git a/src/lib/krb5/asn.1/crep2kcrep.c b/src/lib/krb5/asn.1/crep2kcrep.c
index 11cae366d988b13ccb471881ec72a056c38f4aba..61e79772e111f6f8e8615cd42ae5e196e5743158 100644 (file)
--- a/src/lib/krb5/asn.1/crep2kcrep.c
+++ b/src/lib/krb5/asn.1/crep2kcrep.c
@@ -43,7 +43,7 @@ static char rcsid_crep2kcrep_c[] =
 
 krb5_cred_enc_part *
 KRB5_EncKrbCredPart2krb5_cred_enc_part(val, error)
-const register struct type_KRB5_EncKrbCredPart *val;
+register const struct type_KRB5_EncKrbCredPart *val;
 register int *error;
 {
     register krb5_cred_enc_part *retval;
@@ -64,8 +64,8 @@ register int *error;
     retval->ticket_info = (krb5_cred_info **) 
       xcalloc(i + 1, sizeof(*retval->ticket_info));
     if (!retval->ticket_info) {
-    nomem:
        *error = ENOMEM;
+       krb5_xfree(retval);
        return(0);
     }
     
@@ -75,19 +75,24 @@ register int *error;
       retval->nonce = 0;
     
     if (val->timestamp) {
+       if (!(val->optionals & opt_KRB5_EncKrbPrivPart_usec)) {
+           /* must have usec if we have timestamp */
+           *error = ISODE_50_LOCAL_ERR_BADCOMBO;
+           goto errout;
+       }
+       
        retval->timestamp = gentime2unix(val->timestamp, error);
        if (*error) {
          errout:
            krb5_free_cred_enc_part(retval);
            return(0);
        }
+       retval->usec = val->usec;
+    } else {
+       retval->timestamp = 0;
+       retval->usec = 0;
     }
-    
-    if (val->optionals & opt_KRB5_EncKrbCredPart_usec)
-      retval->usec = val->usec;
-    else
-      retval->timestamp = 0;
-    
+       
     if (val->s__address) {
        retval->s_address = 
          KRB5_HostAddress2krb5_addr(val->s__address, 
@@ -110,8 +115,8 @@ register int *error;
        retval->ticket_info[i] = (krb5_cred_info *) 
          xmalloc(sizeof(*retval->ticket_info[i]));
        if (!retval->ticket_info[i]) {
-           krb5_free_cred_enc_part(retval);
-           goto nomem;
+           *error = ENOMEM;
+           goto errout;
        }
        xbzero((char *)retval->ticket_info[i], 
               sizeof(*retval->ticket_info[i]));

diff --git a/src/lib/krb5/asn.1/edat2kedat.c b/src/lib/krb5/asn.1/edat2kedat.c
index da0a4b955bb124b6f1beb3a0f080da52e022df00..4e3f99cff07ec65123a7bbdd873d358228fe98fb 100644 (file)
--- a/src/lib/krb5/asn.1/edat2kedat.c
+++ b/src/lib/krb5/asn.1/edat2kedat.c
@@ -43,7 +43,7 @@ static char rcsid_edat2kedat_c[] =
 
 krb5_enc_data *
 KRB5_EncryptedData2krb5_enc_data(val, error)
-const register struct type_KRB5_EncryptedData *val;
+register const struct type_KRB5_EncryptedData *val;
 register int *error;
 {
     register krb5_enc_data *retval;

diff --git a/src/lib/krb5/asn.1/ekrp2kekrp.c b/src/lib/krb5/asn.1/ekrp2kekrp.c
index 7a53badf70aa4e0721fcf11dce694ed524190243..e161916b346cc2e289b05c68386338a1d40d3d92 100644 (file)
--- a/src/lib/krb5/asn.1/ekrp2kekrp.c
+++ b/src/lib/krb5/asn.1/ekrp2kekrp.c
@@ -43,7 +43,7 @@ static char rcsid_ekrp2kekrp_c[] =
 
 krb5_enc_kdc_rep_part *
 KRB5_EncKDCRepPart2krb5_enc_kdc_rep_part(val, error)
-const register struct type_KRB5_EncKDCRepPart *val;
+register const struct type_KRB5_EncKDCRepPart *val;
 register int *error;
 {
     register krb5_enc_kdc_rep_part *retval;

diff --git a/src/lib/krb5/asn.1/enck2kkey.c b/src/lib/krb5/asn.1/enck2kkey.c
index 4db62735b998f01843719849564edc0948ca32eb..9ad82e4565e447390b79f808863f5b03241f6b70 100644 (file)
--- a/src/lib/krb5/asn.1/enck2kkey.c
+++ b/src/lib/krb5/asn.1/enck2kkey.c
@@ -44,7 +44,7 @@ static char rcsid_enck2kkey_c[] =
 
 krb5_keyblock *
 KRB5_EncryptionKey2krb5_keyblock(val, error)
-const register struct type_KRB5_EncryptionKey *val;
+register const struct type_KRB5_EncryptionKey *val;
 register int *error;
 {
     krb5_keyblock *retval;

diff --git a/src/lib/krb5/asn.1/err2kerr.c b/src/lib/krb5/asn.1/err2kerr.c
index 4dd918cd8ccee5f11fa5701a231190ee756e20a1..49a279ff1bc3b806705db22ae16b56b4db773301 100644 (file)
--- a/src/lib/krb5/asn.1/err2kerr.c
+++ b/src/lib/krb5/asn.1/err2kerr.c
@@ -43,7 +43,7 @@ static char rcsid_err2kerr_c[] =
 
 krb5_error *
 KRB5_KRB__ERROR2krb5_error(val, error)
-const register struct type_KRB5_KRB__ERROR *val;
+register const struct type_KRB5_KRB__ERROR *val;
 register int *error;
 {
     register krb5_error *retval;

diff --git a/src/lib/krb5/asn.1/etpt2ketpt.c b/src/lib/krb5/asn.1/etpt2ketpt.c
index a78aef4e7213c8d74050c149dd2c0225f304b191..de85d394e484400539510dd8084681f13c7f5157 100644 (file)
--- a/src/lib/krb5/asn.1/etpt2ketpt.c
+++ b/src/lib/krb5/asn.1/etpt2ketpt.c
@@ -43,7 +43,7 @@ static char rcsid_etpt2ketpt_c[] =
 
 krb5_enc_tkt_part *
 KRB5_EncTicketPart2krb5_enc_tkt_part(val, error)
-const register struct type_KRB5_EncTicketPart *val;
+register const struct type_KRB5_EncTicketPart *val;
 register int *error;
 {
     register krb5_enc_tkt_part *retval;

diff --git a/src/lib/krb5/asn.1/kaprp2aprp.c b/src/lib/krb5/asn.1/kaprp2aprp.c
index b71cd93b55a993720882de2186ee36bb29dc0873..f4c7a96dc12583c5ac889054bae5b4ab502cb839 100644 (file)
--- a/src/lib/krb5/asn.1/kaprp2aprp.c
+++ b/src/lib/krb5/asn.1/kaprp2aprp.c
@@ -43,7 +43,7 @@ static char rcsid_kaprp2aprp_c[] =
 
 struct type_KRB5_AP__REP *
 krb5_ap_rep2KRB5_AP__REP(val, error)
-const register krb5_ap_rep *val;
+register const krb5_ap_rep *val;
 register int *error;
 {
     register struct type_KRB5_AP__REP *retval;

diff --git a/src/lib/krb5/asn.1/kaprq2aprq.c b/src/lib/krb5/asn.1/kaprq2aprq.c
index 86e0c6e27151bed45d31b93b26de6da8aeb96940..e3d0b3ef00e93cf7ce05072d485a5894ddf8e8ab 100644 (file)
--- a/src/lib/krb5/asn.1/kaprq2aprq.c
+++ b/src/lib/krb5/asn.1/kaprq2aprq.c
@@ -43,7 +43,7 @@ static char rcsid_kaprq2aprq_c[] =
 
 struct type_KRB5_AP__REQ *
 krb5_ap_req2KRB5_AP__REQ(val, error)
-const register krb5_ap_req *val;
+register const krb5_ap_req *val;
 register int *error;
 {
     register struct type_KRB5_AP__REQ *retval;

diff --git a/src/lib/krb5/asn.1/karep2arep.c b/src/lib/krb5/asn.1/karep2arep.c
index 146346fed89c2aee233bae97e7618623af3de5d4..bd8d69d6099360742e9bcee272b7c351a99a6e5d 100644 (file)
--- a/src/lib/krb5/asn.1/karep2arep.c
+++ b/src/lib/krb5/asn.1/karep2arep.c
@@ -43,7 +43,7 @@ static char rcsid_karep2arep_c[] =
 
 struct type_KRB5_EncAPRepPart *
 krb5_ap_rep_enc_part2KRB5_EncAPRepPart(val, error)
-const register krb5_ap_rep_enc_part *val;
+register const krb5_ap_rep_enc_part *val;
 register int *error;
 {
     register struct type_KRB5_EncAPRepPart *retval;

diff --git a/src/lib/krb5/asn.1/kauth2auth.c b/src/lib/krb5/asn.1/kauth2auth.c
index c3e94dc2f3ab93b2cb135666d7f99425eb7a88e8..77da94179b56b513579c662e2e6d535f21344b9c 100644 (file)
--- a/src/lib/krb5/asn.1/kauth2auth.c
+++ b/src/lib/krb5/asn.1/kauth2auth.c
@@ -43,7 +43,7 @@ static char rcsid_kauth2auth_c[] =
 
 struct type_KRB5_Authenticator *
 krb5_authenticator2KRB5_Authenticator(val, error)
-const register krb5_authenticator *val;
+register const krb5_authenticator *val;
 register int *error;
 {
     register struct type_KRB5_Authenticator *retval;

diff --git a/src/lib/krb5/asn.1/kcred2cred.c b/src/lib/krb5/asn.1/kcred2cred.c
index 2e6cf76397989469800338bca752b893029d4112..c796b53614e186bb6d4846108e69e03b56dd3305 100644 (file)
--- a/src/lib/krb5/asn.1/kcred2cred.c
+++ b/src/lib/krb5/asn.1/kcred2cred.c
@@ -44,7 +44,7 @@ static char rcsid_kcred2cred_c[] =
 
 struct type_KRB5_KRB__CRED *
 krb5_cred2KRB5_KRB__CRED(val, error)
-const register krb5_cred *val;
+register const krb5_cred *val;
 register int *error;
 {
     register struct type_KRB5_KRB__CRED *retval;

diff --git a/src/lib/krb5/asn.1/kcrep2crep.c b/src/lib/krb5/asn.1/kcrep2crep.c
index 3c48216a048b7bd6fe923cbed7961a13ed7d3d62..a7f6883aa64a19e1230603c018f6fc0eb44f3fe0 100644 (file)
--- a/src/lib/krb5/asn.1/kcrep2crep.c
+++ b/src/lib/krb5/asn.1/kcrep2crep.c
@@ -43,7 +43,7 @@ static char rcsid_kcrep2crep_c[] =
 
 struct type_KRB5_EncKrbCredPart *
 krb5_cred_enc_part2KRB5_EncKrbCredPart(val, error)
-const register krb5_cred_enc_part *val;
+register const krb5_cred_enc_part *val;
 register int *error;
 {
     struct type_KRB5_EncKrbCredPart *retval = 0;

diff --git a/src/lib/krb5/asn.1/kdcr2kkdcr.c b/src/lib/krb5/asn.1/kdcr2kkdcr.c
index a60ccfe31f7cd9fddbd159bf0cac1827f45dc62a..01ee747596de987ed14540cc837d15652c78711a 100644 (file)
--- a/src/lib/krb5/asn.1/kdcr2kkdcr.c
+++ b/src/lib/krb5/asn.1/kdcr2kkdcr.c
@@ -62,7 +62,8 @@ element_KRB5_112krb5_pa_data(val, error)
     }
     for (i = 0, rv = val; rv; rv = rv->next, i++) {
        if (qb_pullup(rv->PA__DATA->pa__data) != OK) {
-           krb5_xfree(retval);
+           retval[i] = 0;
+           krb5_free_pa_data(retval);
            *error = ENOMEM;
            return(0);
        }
@@ -95,7 +96,7 @@ element_KRB5_112krb5_pa_data(val, error)
 
 krb5_kdc_rep *
 KRB5_KDC__REP2krb5_kdc_rep(val, error)
-const register struct type_KRB5_TGS__REP *val;
+register const struct type_KRB5_TGS__REP *val;
 register int *error;
 {
     register krb5_kdc_rep *retval;
@@ -122,7 +123,7 @@ register int *error;
                                                       val->crealm,
                                                       error);
     if (!retval->client) {
-       krb5_xfree(retval);
+       krb5_free_kdc_rep(retval);
        return(0);
     }
 

diff --git a/src/lib/krb5/asn.1/kdcr2ktgsr.c b/src/lib/krb5/asn.1/kdcr2ktgsr.c
index d034ec001c17d2b91968dbdd8990026a5d7de3ca..a3352044b254796dbbb50ff0e9a1161bc57b36a7 100644 (file)
--- a/src/lib/krb5/asn.1/kdcr2ktgsr.c
+++ b/src/lib/krb5/asn.1/kdcr2ktgsr.c
@@ -43,7 +43,7 @@ static char rcsid_kdcr2ktgsr_c[] =
 
 krb5_kdc_rep *
 KRB5_KDC__REP2krb5_tgs_rep(val, error)
-const register struct type_KRB5_TGS__REP *val;
+register const struct type_KRB5_TGS__REP *val;
 register int *error;
 {
     return KRB5_KDC__REP2krb5_kdc_rep(val, error);

diff --git a/src/lib/krb5/asn.1/kedat2edat.c b/src/lib/krb5/asn.1/kedat2edat.c
index f66918feb58565da3685775f11d8a3743e6655c4..6df7d2cc95606bab24bdd25f5a5e5e93ddcf7c32 100644 (file)
--- a/src/lib/krb5/asn.1/kedat2edat.c
+++ b/src/lib/krb5/asn.1/kedat2edat.c
@@ -43,7 +43,7 @@ static char rcsid_kedat2edat_c[] =
 
 struct type_KRB5_EncryptedData *
 krb5_enc_data2KRB5_EncryptedData(val, error)
-const register krb5_enc_data *val;
+register const krb5_enc_data *val;
 register int *error;
 {
     register struct type_KRB5_EncryptedData *retval;

diff --git a/src/lib/krb5/asn.1/kekrp2ekrp.c b/src/lib/krb5/asn.1/kekrp2ekrp.c
index ee53e3479884aa828645379588431725d7196531..ecf814d4549b6e0b2c053e0e7a43f473b3ab0f80 100644 (file)
--- a/src/lib/krb5/asn.1/kekrp2ekrp.c
+++ b/src/lib/krb5/asn.1/kekrp2ekrp.c
@@ -43,7 +43,7 @@ static char rcsid_kekrp2ekrp_c[] =
 
 struct type_KRB5_EncKDCRepPart *
 krb5_enc_kdc_rep_part2KRB5_EncKDCRepPart(val, error)
-const register krb5_enc_kdc_rep_part *val;
+register const krb5_enc_kdc_rep_part *val;
 register int *error;
 {
     register struct type_KRB5_EncKDCRepPart *retval;

diff --git a/src/lib/krb5/asn.1/kerr2err.c b/src/lib/krb5/asn.1/kerr2err.c
index 102f7e297fffb027a72f88401f49acce45194323..5f3513d808b71d09786dc44d34c5f20c14f69274 100644 (file)
--- a/src/lib/krb5/asn.1/kerr2err.c
+++ b/src/lib/krb5/asn.1/kerr2err.c
@@ -43,7 +43,7 @@ static char rcsid_kerr2err_c[] =
 
 struct type_KRB5_KRB__ERROR *
 krb5_error2KRB5_KRB__ERROR(val, error)
-const register krb5_error *val;
+register const krb5_error *val;
 register int *error;
 {
     register struct type_KRB5_KRB__ERROR *retval;

diff --git a/src/lib/krb5/asn.1/ketpt2etpt.c b/src/lib/krb5/asn.1/ketpt2etpt.c
index 94dc4530d4f23dc9fcfef1768c95115223dfa880..28e75c09747db48b0430276332c278e9ce5c6019 100644 (file)
--- a/src/lib/krb5/asn.1/ketpt2etpt.c
+++ b/src/lib/krb5/asn.1/ketpt2etpt.c
@@ -39,7 +39,7 @@ static char rcsid_ketpt2etpt_c[] =
 
 struct type_KRB5_EncTicketPart *
 krb5_enc_tkt_part2KRB5_EncTicketPart(val, error)
-const register krb5_enc_tkt_part *val;
+register const krb5_enc_tkt_part *val;
 register int *error;
 {
     register struct type_KRB5_EncTicketPart *retval;

diff --git a/src/lib/krb5/asn.1/kkdcr2kdcr.c b/src/lib/krb5/asn.1/kkdcr2kdcr.c
index ed294b7af248cb66bc5dce881bd40cc4480bbb78..1a0a8ab69aa044ed80f4e1b34c67740fbb3d13c1 100644 (file)
--- a/src/lib/krb5/asn.1/kkdcr2kdcr.c
+++ b/src/lib/krb5/asn.1/kkdcr2kdcr.c
@@ -92,9 +92,9 @@ struct element_KRB5_11 *krb5_pa_data2element_KRB5_11(val, error)
 }
 
 struct type_KRB5_TGS__REP *
-krb5_kdc_rep2KRB5_KDC__REP(DECLARG(const register krb5_kdc_rep *,val),
+krb5_kdc_rep2KRB5_KDC__REP(DECLARG(register const krb5_kdc_rep *,val),
                           DECLARG(register int *,error))
-OLDDECLARG(const register krb5_kdc_rep *,val)
+OLDDECLARG(register const krb5_kdc_rep *,val)
 OLDDECLARG(register int *,error)
 {
     register struct type_KRB5_TGS__REP *retval;

diff --git a/src/lib/krb5/asn.1/kprep2prep.c b/src/lib/krb5/asn.1/kprep2prep.c
index 9c4ebc3454c83458919e964112c79fc879bb8991..8235c6e8597948f8342ded83c873dc9377df1afa 100644 (file)
--- a/src/lib/krb5/asn.1/kprep2prep.c
+++ b/src/lib/krb5/asn.1/kprep2prep.c
@@ -43,7 +43,7 @@ static char rcsid_kprep2prep_c[] =
 
 struct type_KRB5_EncKrbPrivPart *
 krb5_priv_enc_part2KRB5_EncKrbPrivPart(val, error)
-const register krb5_priv_enc_part *val;
+register const krb5_priv_enc_part *val;
 register int *error;
 {
     register struct type_KRB5_EncKrbPrivPart *retval;

diff --git a/src/lib/krb5/asn.1/kpriv2priv.c b/src/lib/krb5/asn.1/kpriv2priv.c
index 656849ecb792bd1148741f87bbf8ec265016cf72..77e1e973f23d8daf31d34700298b216176544786 100644 (file)
--- a/src/lib/krb5/asn.1/kpriv2priv.c
+++ b/src/lib/krb5/asn.1/kpriv2priv.c
@@ -43,7 +43,7 @@ static char rcsid_kpriv2priv_c[] =
 
 struct type_KRB5_KRB__PRIV *
 krb5_priv2KRB5_KRB__PRIV(val, error)
-const register krb5_priv *val;
+register const krb5_priv *val;
 register int *error;
 {
     register struct type_KRB5_KRB__PRIV *retval;

diff --git a/src/lib/krb5/asn.1/kpwd2pwd.c b/src/lib/krb5/asn.1/kpwd2pwd.c
index a2fbc4541db0241611ff2ab01c99b105ef0ba97f..ab9fba1c9202fe7afdd6aa8c7f7a2b341a3ab063 100644 (file)
--- a/src/lib/krb5/asn.1/kpwd2pwd.c
+++ b/src/lib/krb5/asn.1/kpwd2pwd.c
@@ -65,7 +65,7 @@ static char rcsid_kpwd2pwd[] =
 
 struct type_KRB5_PasswdSequence *
 krb5_pwd_seq2KRB5_PWD__SEQ(val, error)
-const register passwd_phrase_element *val;
+register const passwd_phrase_element *val;
 register int *error;
 {
     register struct type_KRB5_PasswdSequence *retval;

diff --git a/src/lib/krb5/asn.1/ksafe2safe.c b/src/lib/krb5/asn.1/ksafe2safe.c
index 59763f45f7c2371593942587339fd2e5aa4d112b..a522e235f1b2d99204d3213fbda3a17fb1bb8ed8 100644 (file)
--- a/src/lib/krb5/asn.1/ksafe2safe.c
+++ b/src/lib/krb5/asn.1/ksafe2safe.c
@@ -43,7 +43,7 @@ static char rcsid_ksafe2safe_c[] =
 
 struct type_KRB5_KRB__SAFE *
 krb5_safe2KRB5_KRB__SAFE(val, error)
-const register krb5_safe *val;
+register const krb5_safe *val;
 register int *error;
 {
     register struct type_KRB5_KRB__SAFE *retval;

diff --git a/src/lib/krb5/asn.1/ktgrq2tgrq.c b/src/lib/krb5/asn.1/ktgrq2tgrq.c
index e560aa7b18aeda73f9cdc026a1abae08b57ea944..d980cb22f739fc53ec6d02fb41b32f28f0bf8e9b 100644 (file)
--- a/src/lib/krb5/asn.1/ktgrq2tgrq.c
+++ b/src/lib/krb5/asn.1/ktgrq2tgrq.c
@@ -43,7 +43,7 @@ static char rcsid_ktgrq2tgrq_c[] =
 
 struct type_KRB5_KDC__REQ__BODY *
 krb5_kdc_req2KRB5_KDC__REQ__BODY(val, error)
-const register krb5_kdc_req *val;
+register const krb5_kdc_req *val;
 register int *error;
 {
     register struct type_KRB5_KDC__REQ__BODY *retval;
@@ -283,7 +283,7 @@ struct element_KRB5_7 *krb5_pa_data2element_KRB5_7(val, error)
 
 struct type_KRB5_KDC__REQ *
 krb5_kdc_req2KRB5_KDC__REQ(val, error)
-const register krb5_kdc_req *val;
+register const krb5_kdc_req *val;
 register int *error;
 {
     register struct type_KRB5_KDC__REQ *retval;

diff --git a/src/lib/krb5/asn.1/ktgsr2kdcr.c b/src/lib/krb5/asn.1/ktgsr2kdcr.c
index 6da92b1bf6e40457597435c7117336fefe20139a..6779731ec8e032d1376d08e7d4295772d6c5fea5 100644 (file)
--- a/src/lib/krb5/asn.1/ktgsr2kdcr.c
+++ b/src/lib/krb5/asn.1/ktgsr2kdcr.c
@@ -43,7 +43,7 @@ static char rcsid_ktgsr2kdcr_c[] =
 
 struct type_KRB5_TGS__REP *
 krb5_tgs_rep2KRB5_KDC__REP(val, error)
-const register krb5_kdc_rep *val;
+register const krb5_kdc_rep *val;
 register int *error;
 {
     return (struct type_KRB5_TGS__REP *)

diff --git a/src/lib/krb5/asn.1/ktkt2tkt.c b/src/lib/krb5/asn.1/ktkt2tkt.c
index 89ee2443a3ed04560a66309dfecd5c10eac271e0..023de917ab087f12360a25834002ba63ee619cd8 100644 (file)
--- a/src/lib/krb5/asn.1/ktkt2tkt.c
+++ b/src/lib/krb5/asn.1/ktkt2tkt.c
@@ -43,7 +43,7 @@ static char rcsid_ktkt2tkt_c[] =
 
 struct type_KRB5_Ticket *
 krb5_ticket2KRB5_Ticket(val, error)
-const register krb5_ticket *val;
+register const krb5_ticket *val;
 register int *error;
 {
     register struct type_KRB5_Ticket *retval;

diff --git a/src/lib/krb5/asn.1/ktran2tran.c b/src/lib/krb5/asn.1/ktran2tran.c
index e39405658ce26e94a554a143475bdcdf6b18f1e2..5e66e855f86a51d459447e2faf9e3eb27384b6bb 100644 (file)
--- a/src/lib/krb5/asn.1/ktran2tran.c
+++ b/src/lib/krb5/asn.1/ktran2tran.c
@@ -43,7 +43,7 @@ static char rcsid_ktran2tran_c[] =
 
 struct type_KRB5_TransitedEncoding *
 krb5_transited2KRB5_TransitedEncoding(val, error)
-const register krb5_transited *val;
+register const krb5_transited *val;
 register int *error;
 {
     register struct type_KRB5_TransitedEncoding *retval;

diff --git a/src/lib/krb5/asn.1/prep2kprep.c b/src/lib/krb5/asn.1/prep2kprep.c
index 85195c3b9654d05b0d2533938b34963f361b5d27..78a5d5baf72d17b7801e3194a27f79ccf2a9a1d9 100644 (file)
--- a/src/lib/krb5/asn.1/prep2kprep.c
+++ b/src/lib/krb5/asn.1/prep2kprep.c
@@ -43,7 +43,7 @@ static char rcsid_prep2kprep_c[] =
 
 krb5_priv_enc_part *
 KRB5_EncKrbPrivPart2krb5_priv_enc_part(val, error)
-const register struct type_KRB5_EncKrbPrivPart *val;
+register const struct type_KRB5_EncKrbPrivPart *val;
 register int *error;
 {
     register krb5_priv_enc_part *retval;

diff --git a/src/lib/krb5/asn.1/prin2kprin.c b/src/lib/krb5/asn.1/prin2kprin.c
index f642115922afa1d977901ee37423bc92a4bcfb3f..a586dca4f8c5c0c49dc8f11e7d172ca23fc5c182 100644 (file)
--- a/src/lib/krb5/asn.1/prin2kprin.c
+++ b/src/lib/krb5/asn.1/prin2kprin.c
@@ -76,7 +76,6 @@ register int *error;
     for (i = 1, rv = val->name__string; rv->next; i++, rv = rv->next)
        ;
 
-    /* plus one for the realm */
     retval->length = i;
     retval->data = (krb5_data *)malloc(i * sizeof(krb5_data));
     if (retval->data == 0) {
@@ -99,6 +98,10 @@ register int *error;
            while (--i >= 0)
                free(krb5_princ_component(retval, i)->data);
            *error = ENOMEM;
+           if (retval->realm.data)
+               krb5_xfree(retval->realm.data);
+           krb5_xfree(retval->data);
+           krb5_xfree(retval);
            return(0);
        }
     return(retval);

diff --git a/src/lib/krb5/asn.1/priv2kpriv.c b/src/lib/krb5/asn.1/priv2kpriv.c
index dbf447a727694f10fa63416364cb14ecee1a9e38..9ddb4ae887ec9529972c2f607e2e3bd032f91fc6 100644 (file)
--- a/src/lib/krb5/asn.1/priv2kpriv.c
+++ b/src/lib/krb5/asn.1/priv2kpriv.c
@@ -43,7 +43,7 @@ static char rcsid_priv2kpriv_c[] =
 
 krb5_priv *
 KRB5_KRB__PRIV2krb5_priv(val, error)
-const register struct type_KRB5_KRB__PRIV *val;
+register const struct type_KRB5_KRB__PRIV *val;
 register int *error;
 {
     register krb5_priv *retval;

diff --git a/src/lib/krb5/asn.1/pwd2kpwd.c b/src/lib/krb5/asn.1/pwd2kpwd.c
index 5349c800640e726a6f3c419232dc4ba6e5f54207..3cd4a36c445e3e26366583f17a89e69344ead933 100644 (file)
--- a/src/lib/krb5/asn.1/pwd2kpwd.c
+++ b/src/lib/krb5/asn.1/pwd2kpwd.c
@@ -43,7 +43,7 @@ static char rcsid_pwd2kpwd[] =
 
 passwd_phrase_element *
 KRB5_PWD__SEQ2krb5_pwd_seq(val, error)
-const register struct type_KRB5_PasswdSequence *val;
+register const struct type_KRB5_PasswdSequence *val;
 register int *error;
 {
     register passwd_phrase_element *retval;

diff --git a/src/lib/krb5/asn.1/pwds2kpwds.c b/src/lib/krb5/asn.1/pwds2kpwds.c
index bffa2d5783e175b0ba651681e4bf3fa5b6ba9f3d..148097ba9bed225e9a8e26781f6522d49afd87f6 100644 (file)
--- a/src/lib/krb5/asn.1/pwds2kpwds.c
+++ b/src/lib/krb5/asn.1/pwds2kpwds.c
@@ -41,7 +41,7 @@ static char rcsid_pwds2kpwds[] =
 
 krb5_pwd_data *
 KRB5_PWD__DATA2krb5_pwd_data(val, error)
-const register struct type_KRB5_PasswdData *val;
+register const struct type_KRB5_PasswdData *val;
 register int *error;
 {
     register krb5_pwd_data *retval;

diff --git a/src/lib/krb5/asn.1/safe2ksafe.c b/src/lib/krb5/asn.1/safe2ksafe.c
index bd3121f6beadcc1d087e39768884e3b9c2ab19c3..57484139aeccf918c6dd2da27fd942255fac259b 100644 (file)
--- a/src/lib/krb5/asn.1/safe2ksafe.c
+++ b/src/lib/krb5/asn.1/safe2ksafe.c
@@ -43,7 +43,7 @@ static char rcsid_safe2ksafe_c[] =
 
 krb5_safe *
 KRB5_KRB__SAFE2krb5_safe(val, error)
-const register struct type_KRB5_KRB__SAFE *val;
+register const struct type_KRB5_KRB__SAFE *val;
 register int *error;
 {
     register krb5_safe *retval;

diff --git a/src/lib/krb5/asn.1/tgrq2ktgrq.c b/src/lib/krb5/asn.1/tgrq2ktgrq.c
index 67755746405967998ca6ce67aa079af8e1ccbf75..5caf362114c4bf64d7c52d20085bb8e3274f2203 100644 (file)
--- a/src/lib/krb5/asn.1/tgrq2ktgrq.c
+++ b/src/lib/krb5/asn.1/tgrq2ktgrq.c
@@ -46,7 +46,7 @@ static char rcsid_tgrq2ktgrq_c[] =
 
 krb5_kdc_req *
 KRB5_KDC__REQ__BODY2krb5_kdc_req(val, error)
-const register struct type_KRB5_KDC__REQ__BODY *val;
+register const struct type_KRB5_KDC__REQ__BODY *val;
 register int *error;
 {
     register krb5_kdc_req *retval;
@@ -253,7 +253,7 @@ element_KRB5_72krb5_pa_data(val, error)
 
 krb5_kdc_req *
 KRB5_KDC__REQ2krb5_kdc_req(val, error)
-const register struct type_KRB5_KDC__REQ *val;
+register const struct type_KRB5_KDC__REQ *val;
 register int *error;
 {
     register krb5_kdc_req *retval;

diff --git a/src/lib/krb5/asn.1/tkt2ktkt.c b/src/lib/krb5/asn.1/tkt2ktkt.c
index e05873d3468edde6b27a9f834206de64d82a6589..1af07772719b7065f3553941adfef6825b61ea1c 100644 (file)
--- a/src/lib/krb5/asn.1/tkt2ktkt.c
+++ b/src/lib/krb5/asn.1/tkt2ktkt.c
@@ -43,7 +43,7 @@ static char rcsid_tkt2ktkt_c[] =
 
 krb5_ticket *
 KRB5_Ticket2krb5_ticket(val, error)
-const register struct type_KRB5_Ticket *val;
+register const struct type_KRB5_Ticket *val;
 register int *error;
 {
     register krb5_ticket *retval;

diff --git a/src/lib/krb5/asn.1/tran2ktran.c b/src/lib/krb5/asn.1/tran2ktran.c
index 6a9ff49961517ae800df94ef61775111423cd5e4..1d0bb7ae12e06251ad5eb84ee5ee846bc4ec190c 100644 (file)
--- a/src/lib/krb5/asn.1/tran2ktran.c
+++ b/src/lib/krb5/asn.1/tran2ktran.c
@@ -43,7 +43,7 @@ static char rcsid_tran2ktran_c[] =
 
 krb5_transited *
 KRB5_TransitedEncoding2krb5_transited(val, error)
-const register struct type_KRB5_TransitedEncoding *val;
+register const struct type_KRB5_TransitedEncoding *val;
 register int *error;
 {
     register krb5_transited *retval;