(krb5_get_forwarded_creds): rename two of the local `realm' to srealm

to avoid shadowing


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15388 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-15 02:44:36 +00:00
parent 76f6061241
commit 2872371a33

View File

@@ -279,11 +279,11 @@ krb5_get_forwarded_creds (krb5_context context,
if (auth_context->local_address && auth_context->local_port) { if (auth_context->local_address && auth_context->local_port) {
krb5_boolean noaddr; krb5_boolean noaddr;
krb5_const_realm realm; krb5_const_realm srealm;
realm = krb5_principal_get_realm(context, out_creds->server); srealm = krb5_principal_get_realm(context, out_creds->server);
krb5_appdefault_boolean(context, NULL, realm, "no-addresses", paddrs == NULL, krb5_appdefault_boolean(context, NULL, srealm, "no-addresses",
&noaddr); paddrs == NULL, &noaddr);
if (!noaddr) { if (!noaddr) {
ret = krb5_make_addrport (context, ret = krb5_make_addrport (context,
&enc_krb_cred_part.s_address, &enc_krb_cred_part.s_address,
@@ -297,15 +297,15 @@ krb5_get_forwarded_creds (krb5_context context,
if (auth_context->remote_address) { if (auth_context->remote_address) {
if (auth_context->remote_port) { if (auth_context->remote_port) {
krb5_boolean noaddr; krb5_boolean noaddr;
krb5_const_realm realm; krb5_const_realm srealm;
realm = krb5_principal_get_realm(context, out_creds->server); srealm = krb5_principal_get_realm(context, out_creds->server);
/* Is this correct, and should we use the paddrs == NULL /* Is this correct, and should we use the paddrs == NULL
trick here as well? Having an address-less ticket may trick here as well? Having an address-less ticket may
indicate that we don't know our own global address, but indicate that we don't know our own global address, but
it does not necessary mean that we don't know the it does not necessary mean that we don't know the
server's. */ server's. */
krb5_appdefault_boolean(context, NULL, realm, "no-addresses", krb5_appdefault_boolean(context, NULL, srealm, "no-addresses",
FALSE, &noaddr); FALSE, &noaddr);
if (!noaddr) { if (!noaddr) {
ret = krb5_make_addrport (context, ret = krb5_make_addrport (context,