diff options
| author | John Carr <jfc@mit.edu> | 1992-08-21 03:29:21 +0000 |
|---|---|---|
| committer | John Carr <jfc@mit.edu> | 1992-08-21 03:29:21 +0000 |
| commit | 25660ba3ae371bb1d2bd7fe89351dfe206f5a406 (patch) | |
| tree | bdf48f2bb812fb253b43a55f2b2b29d3f3231b7c /src/lib | |
| parent | 1a6dd7e4eb7cebf997d6b910e3d66985c4b0de66 (diff) | |
| download | krb5-25660ba3ae371bb1d2bd7fe89351dfe206f5a406.tar.gz krb5-25660ba3ae371bb1d2bd7fe89351dfe206f5a406.tar.xz krb5-25660ba3ae371bb1d2bd7fe89351dfe206f5a406.zip | |
Principal type changes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2367 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb425/get_cred.c | 16 | ||||
| -rw-r--r-- | src/lib/krb425/rd_req.c | 9 | ||||
| -rw-r--r-- | src/lib/krb5/free/f_princ.c | 6 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/lib/krb425/get_cred.c b/src/lib/krb425/get_cred.c index 739be1e7f..58c13b1ff 100644 --- a/src/lib/krb425/get_cred.c +++ b/src/lib/krb425/get_cred.c @@ -76,7 +76,7 @@ CREDENTIALS *c; i = 0; if (creds.server) while (creds.server[i]) { - EPRINT "server: %d: ``%.*s''\n", i, + EPRINT("server: %d: ``%.*s''\n", i, creds.server[i]->length, creds.server[i]->data ? creds.server[i]->data : ""); @@ -85,7 +85,7 @@ CREDENTIALS *c; i = 0; if (creds.client) while (creds.client[i]) { - EPRINT "client: %d: ``%.*s''\n", i, + EPRINT("client: %d: ``%.*s''\n", i, creds.client[i]->length, creds.client[i]->data ? creds.client[i]->data : ""); @@ -93,12 +93,12 @@ CREDENTIALS *c; } } #endif - set_string(c->pname, ANAME_SZ, creds.client[1]); - set_string(c->pinst, INST_SZ, creds.client[2]); - - set_string(c->realm, REALM_SZ, creds.server[0]); - set_string(c->service, REALM_SZ, creds.server[1]); - set_string(c->instance, REALM_SZ, creds.server[2]); + set_string(c->pname, ANAME_SZ, krb5_princ_component(creds.client, 1)); + set_string(c->pinst, INST_SZ, krb5_princ_component(creds.client, 2)); + + set_string(c->realm, REALM_SZ, krb5_princ_realm(creds.server)); + set_string(c->service, REALM_SZ, krb5_princ_component(creds.server, 1)); + set_string(c->instance, REALM_SZ, krb5_princ_component(creds.server, 2)); c->ticket_st.length = creds.ticket.length; memcpy((char *)c->ticket_st.dat, diff --git a/src/lib/krb425/rd_req.c b/src/lib/krb425/rd_req.c index 9049e7d42..f604cb359 100644 --- a/src/lib/krb425/rd_req.c +++ b/src/lib/krb425/rd_req.c @@ -174,9 +174,12 @@ char *fn; } r = 0; #endif - set_string(ad->pname, ANAME_SZ, authdat->authenticator->client[1]); - set_string(ad->pinst, INST_SZ, authdat->authenticator->client[2]); - set_string(ad->prealm, REALM_SZ, authdat->authenticator->client[0]); + set_string(ad->pname, ANAME_SZ, + krb5_princ_component(authdat->authenticator->client, 1)); + set_string(ad->pinst, INST_SZ, + krb5_princ_component(authdat->authenticator->client, 2)); + set_string(ad->prealm, REALM_SZ, + krb5_princ_component(authdat->authenticator->client, 0)); ad->checksum = *(long *)authdat->authenticator->checksum->contents; diff --git a/src/lib/krb5/free/f_princ.c b/src/lib/krb5/free/f_princ.c index 7536ae0a5..f08262769 100644 --- a/src/lib/krb5/free/f_princ.c +++ b/src/lib/krb5/free/f_princ.c @@ -37,10 +37,10 @@ void krb5_free_principal(val) krb5_principal val; { - register krb5_data **temp; + register int i = krb5_princ_size(val); - for (temp = val; *temp; temp++) - krb5_free_data(*temp); + while(--i >= 0) + free(krb5_princ_component(val, i)->data); xfree(val); return; } |