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

(acquire_initiator_cred): if the requested name isn't in the ccache,

Browse Source 
also check keytab.  Extact the krbtgt for the default realm to check
how long the credentials will last.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11971 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-04-06 00:31:55 +00:00
parent 1dcc7970e3
commit 1cd476c394
2 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/gssapi/acquire_cred.c
View File

@@ -95,8 +95,9 @@ static OM_uint32 acquire_initiator_cred
} else if (handle->principal != NULL && } else if (handle->principal != NULL &&
krb5_principal_compare(gssapi_krb5_context, handle->principal, krb5_principal_compare(gssapi_krb5_context, handle->principal,
def_princ) == FALSE) { def_princ) == FALSE) {
kret = KRB5_PRINC_NOMATCH; /* Before failing, lets check the keytab */
goto end; krb5_free_principal(gssapi_krb5_context, def_princ);
def_princ = NULL;
} }
if (def_princ == NULL) { if (def_princ == NULL) {
/* We have no existing credentials cache, /* We have no existing credentials cache,
@@ -126,10 +127,34 @@ static OM_uint32 acquire_initiator_cred
kret = krb5_cc_store_cred(gssapi_krb5_context, ccache, &cred); kret = krb5_cc_store_cred(gssapi_krb5_context, ccache, &cred);
if (kret) if (kret)
goto end; goto end;
} handle->lifetime = cred.times.endtime;
} else {
krb5_creds in_cred, *out_cred;
krb5_const_realm realm;
{ memset(&in_cred, 0, sizeof(in_cred));
/* XXX get expiration -> handle->lifetime */ in_cred.client = handle->principal;
realm = krb5_principal_get_realm(gssapi_krb5_context,
handle->principal);
if (realm == NULL) {
kret = KRB5_PRINC_NOMATCH; /* XXX */
goto end;
}
kret = krb5_make_principal(gssapi_krb5_context, &in_cred.server,
realm, KRB5_TGS_NAME, realm, NULL);
if (kret)
goto end;
kret = krb5_get_credentials(gssapi_krb5_context, 0,
ccache, &in_cred, &out_cred);
krb5_free_principal(gssapi_krb5_context, in_cred.server);
if (kret)
goto end;
handle->lifetime = out_cred->times.endtime;
krb5_free_creds(gssapi_krb5_context, out_cred);
} }
handle->ccache = ccache; handle->ccache = ccache;
@@ -271,9 +296,7 @@ OM_uint32 gss_acquire_cred
} }
*minor_status = 0; *minor_status = 0;
if (time_rec) if (time_rec)
*time_rec = time_req; *time_rec = handle->lifetime;
/* XXX */
handle->lifetime = time_req;
handle->usage = cred_usage; handle->usage = cred_usage;
*output_cred_handle = handle; *output_cred_handle = handle;
return (GSS_S_COMPLETE); return (GSS_S_COMPLETE);

39
lib/gssapi/krb5/acquire_cred.c
View File

@@ -95,8 +95,9 @@ static OM_uint32 acquire_initiator_cred
} else if (handle->principal != NULL && } else if (handle->principal != NULL &&
krb5_principal_compare(gssapi_krb5_context, handle->principal, krb5_principal_compare(gssapi_krb5_context, handle->principal,
def_princ) == FALSE) { def_princ) == FALSE) {
kret = KRB5_PRINC_NOMATCH; /* Before failing, lets check the keytab */
goto end; krb5_free_principal(gssapi_krb5_context, def_princ);
def_princ = NULL;
} }
if (def_princ == NULL) { if (def_princ == NULL) {
/* We have no existing credentials cache, /* We have no existing credentials cache,
@@ -126,10 +127,34 @@ static OM_uint32 acquire_initiator_cred
kret = krb5_cc_store_cred(gssapi_krb5_context, ccache, &cred); kret = krb5_cc_store_cred(gssapi_krb5_context, ccache, &cred);
if (kret) if (kret)
goto end; goto end;
} handle->lifetime = cred.times.endtime;
} else {
krb5_creds in_cred, *out_cred;
krb5_const_realm realm;
{ memset(&in_cred, 0, sizeof(in_cred));
/* XXX get expiration -> handle->lifetime */ in_cred.client = handle->principal;
realm = krb5_principal_get_realm(gssapi_krb5_context,
handle->principal);
if (realm == NULL) {
kret = KRB5_PRINC_NOMATCH; /* XXX */
goto end;
}
kret = krb5_make_principal(gssapi_krb5_context, &in_cred.server,
realm, KRB5_TGS_NAME, realm, NULL);
if (kret)
goto end;
kret = krb5_get_credentials(gssapi_krb5_context, 0,
ccache, &in_cred, &out_cred);
krb5_free_principal(gssapi_krb5_context, in_cred.server);
if (kret)
goto end;
handle->lifetime = out_cred->times.endtime;
krb5_free_creds(gssapi_krb5_context, out_cred);
} }
handle->ccache = ccache; handle->ccache = ccache;
@@ -271,9 +296,7 @@ OM_uint32 gss_acquire_cred
} }
*minor_status = 0; *minor_status = 0;
if (time_rec) if (time_rec)
*time_rec = time_req; *time_rec = handle->lifetime;
/* XXX */
handle->lifetime = time_req;
handle->usage = cred_usage; handle->usage = cred_usage;
*output_cred_handle = handle; *output_cred_handle = handle;
return (GSS_S_COMPLETE); return (GSS_S_COMPLETE);