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

(gss_add_cred): don't create a new ccache, just open the old one;

Browse Source 
better check if output handle is compatible with new (copied) handle


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

39
lib/gssapi/add_cred.c
View File

@@ -64,12 +64,14 @@ OM_uint32 gss_add_cred (
return GSS_S_NO_CRED; return GSS_S_NO_CRED;
} }
if (cred->usage == cred_usage /* check if requested output usage is compatible with output usage */
|| (cred->usage == GSS_C_BOTH && output_cred_handle != NULL)) { if (output_cred_handle != NULL &&
(cred->usage != cred_usage && cred->usage != GSS_C_BOTH)) {
*minor_status = GSS_KRB5_S_G_BAD_USAGE; *minor_status = GSS_KRB5_S_G_BAD_USAGE;
return(GSS_S_FAILURE); return(GSS_S_FAILURE);
} }
/* check that we have the same name */
if (desired_name != GSS_C_NO_NAME && if (desired_name != GSS_C_NO_NAME &&
krb5_principal_compare(gssapi_krb5_context, desired_name, krb5_principal_compare(gssapi_krb5_context, desired_name,
cred->principal) != FALSE) { cred->principal) != FALSE) {
@@ -139,25 +141,36 @@ OM_uint32 gss_add_cred (
if (cred->ccache) { if (cred->ccache) {
krb5_error_code kret; krb5_error_code kret;
const char *type, *name;
char *type_name;
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
kret = krb5_cc_gen_new(gssapi_krb5_context, type = krb5_cc_get_type(gssapi_krb5_context, cred->ccache);
krb5_cc_get_ops(gssapi_krb5_context, if (type == NULL){
cred->ccache), *minor_status = ENOMEM;
goto failure;
}
name = krb5_cc_get_name(gssapi_krb5_context, cred->ccache);
if (name == NULL) {
*minor_status = ENOMEM;
goto failure;
}
asprintf(&type_name, "%s:%s", type, name);
if (type_name == NULL) {
*minor_status = ENOMEM;
goto failure;
}
kret = krb5_cc_resolve(gssapi_krb5_context, type_name,
&handle->ccache); &handle->ccache);
free(type_name);
if (kret) { if (kret) {
*minor_status = kret; *minor_status = kret;
goto failure; goto failure;
} }
kret = krb5_cc_copy_cache(gssapi_krb5_context, cred->ccache,
handle->ccache);
if (kret) {
*minor_status = kret;
goto failure;
}
} }
ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms); ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms);

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

@@ -64,12 +64,14 @@ OM_uint32 gss_add_cred (
return GSS_S_NO_CRED; return GSS_S_NO_CRED;
} }
if (cred->usage == cred_usage /* check if requested output usage is compatible with output usage */
|| (cred->usage == GSS_C_BOTH && output_cred_handle != NULL)) { if (output_cred_handle != NULL &&
(cred->usage != cred_usage && cred->usage != GSS_C_BOTH)) {
*minor_status = GSS_KRB5_S_G_BAD_USAGE; *minor_status = GSS_KRB5_S_G_BAD_USAGE;
return(GSS_S_FAILURE); return(GSS_S_FAILURE);
} }
/* check that we have the same name */
if (desired_name != GSS_C_NO_NAME && if (desired_name != GSS_C_NO_NAME &&
krb5_principal_compare(gssapi_krb5_context, desired_name, krb5_principal_compare(gssapi_krb5_context, desired_name,
cred->principal) != FALSE) { cred->principal) != FALSE) {
@@ -139,25 +141,36 @@ OM_uint32 gss_add_cred (
if (cred->ccache) { if (cred->ccache) {
krb5_error_code kret; krb5_error_code kret;
const char *type, *name;
char *type_name;
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
kret = krb5_cc_gen_new(gssapi_krb5_context, type = krb5_cc_get_type(gssapi_krb5_context, cred->ccache);
krb5_cc_get_ops(gssapi_krb5_context, if (type == NULL){
cred->ccache), *minor_status = ENOMEM;
goto failure;
}
name = krb5_cc_get_name(gssapi_krb5_context, cred->ccache);
if (name == NULL) {
*minor_status = ENOMEM;
goto failure;
}
asprintf(&type_name, "%s:%s", type, name);
if (type_name == NULL) {
*minor_status = ENOMEM;
goto failure;
}
kret = krb5_cc_resolve(gssapi_krb5_context, type_name,
&handle->ccache); &handle->ccache);
free(type_name);
if (kret) { if (kret) {
*minor_status = kret; *minor_status = kret;
goto failure; goto failure;
} }
kret = krb5_cc_copy_cache(gssapi_krb5_context, cred->ccache,
handle->ccache);
if (kret) {
*minor_status = kret;
goto failure;
}
} }
ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms); ret = gss_create_empty_oid_set(minor_status, &handle->mechanisms);