oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_get_forwarded_creds): Use [appdefault]no-addresses before

Browse Source 
checking if the krbtgt is address-less, use KRB5_ADDRESSLESS_DEFAULT.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16687 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-02-03 11:37:29 +00:00
parent 99dd89912c
commit 1bb5af8ef5
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/krb5/get_for_creds.c
View File

@@ -185,10 +185,20 @@ krb5_get_forwarded_creds (krb5_context context,
addrs.val = NULL; addrs.val = NULL;
paddrs = &addrs; paddrs = &addrs;
{
krb5_boolean noaddr;
krb5_appdefault_boolean(context, NULL, realm,
"no-addresses", KRB5_ADDRESSLESS_DEFAULT,
&noaddr);
if (noaddr)
paddrs = NULL;
}
/* /*
* If tickets are address-less, forward address-less tickets. * If tickets are address-less, forward address-less tickets.
*/ */
if (paddrs) {
ret = _krb5_get_krbtgt (context, ret = _krb5_get_krbtgt (context,
ccache, ccache,
realm, realm,
@@ -198,6 +208,7 @@ krb5_get_forwarded_creds (krb5_context context,
paddrs = NULL; paddrs = NULL;
krb5_free_creds (context, ticket); krb5_free_creds (context, ticket);
} }
}
if (paddrs != NULL) { if (paddrs != NULL) {
@@ -277,14 +288,8 @@ krb5_get_forwarded_creds (krb5_context context,
enc_krb_cred_part.usec = NULL; enc_krb_cred_part.usec = NULL;
} }
if (auth_context->local_address && auth_context->local_port) { if (auth_context->local_address && auth_context->local_port && paddrs) {
krb5_boolean noaddr;
krb5_const_realm srealm;
srealm = krb5_principal_get_realm(context, out_creds->server);
krb5_appdefault_boolean(context, NULL, srealm, "no-addresses",
paddrs == NULL, &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,
auth_context->local_address, auth_context->local_address,
@@ -292,7 +297,6 @@ krb5_get_forwarded_creds (krb5_context context,
if (ret) if (ret)
goto out4; goto out4;
} }
}
if (auth_context->remote_address) { if (auth_context->remote_address) {
if (auth_context->remote_port) { if (auth_context->remote_port) {