svn rev #24357: trunk/src/lib/gssapi/krb5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24357
Commit By: ghudson
Log Message:
Simplify acquire_accept_cred very slightly, avoiding some long lines
and repeated macro calls.



Changed Files:
U   trunk/src/lib/gssapi/krb5/acquire_cred.c
Modified: trunk/src/lib/gssapi/krb5/acquire_cred.c
===================================================================
--- trunk/src/lib/gssapi/krb5/acquire_cred.c	2010-09-27 03:39:22 UTC (rev 24356)
+++ trunk/src/lib/gssapi/krb5/acquire_cred.c	2010-09-27 03:46:57 UTC (rev 24357)
@@ -228,12 +228,11 @@
     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 @@
     }
 
     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 @@
     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);