diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-09-27 03:46:57 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-09-27 03:46:57 +0000 |
| commit | 312b5a3b38c6df9b55fc1c3ac58abe8f9f590cea (patch) | |
| tree | f280ba3145288fd2c68850192a1b84b29e138229 /src | |
| parent | e76d9a48c905e6db8ea9b7af4b843070756effaa (diff) | |
| download | krb5-312b5a3b38c6df9b55fc1c3ac58abe8f9f590cea.tar.gz krb5-312b5a3b38c6df9b55fc1c3ac58abe8f9f590cea.tar.xz krb5-312b5a3b38c6df9b55fc1c3ac58abe8f9f590cea.zip | |
Simplify acquire_accept_cred very slightly, avoiding some long lines
and repeated macro calls.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24357 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/gssapi/krb5/acquire_cred.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index 55214ce6a2..a0bf5399e9 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -228,12 +228,11 @@ acquire_init_cred(krb5_context context, krb5_error_code code; krb5_ccache ccache; krb5_principal ccache_princ = NULL, tmp_princ; - krb5_const_principal cred_princ = NULL; krb5_cc_cursor cur; krb5_creds creds; int got_endtime; int caller_provided_ccache_name = 0; - krb5_data password_data; + krb5_data password_data, *cred_princ_realm; cred->ccache = NULL; @@ -397,7 +396,7 @@ acquire_init_cred(krb5_context context, } assert(cred->name->princ != NULL); - cred_princ = cred->name->princ; + cred_princ_realm = krb5_princ_realm(context, cred->name->princ); if (password != GSS_C_NO_BUFFER) { /* stash the password for later */ @@ -439,11 +438,11 @@ acquire_init_cred(krb5_context context, got_endtime = 0; code = krb5_build_principal_ext(context, &tmp_princ, - krb5_princ_realm(context, cred_princ)->length, - krb5_princ_realm(context, cred_princ)->data, + cred_princ_realm->length, + cred_princ_realm->data, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME, - krb5_princ_realm(context, cred_princ)->length, - krb5_princ_realm(context, cred_princ)->data, + cred_princ_realm->length, + cred_princ_realm->data, 0); if (code) { krb5_cc_close(context, ccache); |