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

Better error strings, from Andrew Bartlet.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19035 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-11-14 09:49:56 +00:00
parent 891f46953e
commit 92486672bd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/gssapi/krb5/wrap.c
View File

@@ -56,10 +56,14 @@ _gsskrb5i_get_initiator_subkey(const gsskrb5_ctx ctx,
ctx->auth_context, ctx->auth_context,
key); key);
} }
if (*key == NULL) if (ret == 0 && *key == NULL)
ret = krb5_auth_con_getkey(context, ret = krb5_auth_con_getkey(context,
ctx->auth_context, ctx->auth_context,
key); key);
if (ret == 0 && *key == NULL) {
krb5_set_error_string(context, "No initiator subkey available");
return GSS_KRB5_S_KG_NO_SUBKEY;
}
return ret; return ret;
} }
@@ -80,6 +84,10 @@ _gsskrb5i_get_acceptor_subkey(const gsskrb5_ctx ctx,
ctx->auth_context, ctx->auth_context,
key); key);
} }
if (ret == 0 && *key == NULL) {
krb5_set_error_string(context, "No acceptor subkey available");
return GSS_KRB5_S_KG_NO_SUBKEY;
}
return ret; return ret;
} }
@@ -97,8 +105,10 @@ _gsskrb5i_get_token_key(const gsskrb5_ctx ctx,
if ((ctx->more_flags & ACCEPTOR_SUBKEY) == 0) if ((ctx->more_flags & ACCEPTOR_SUBKEY) == 0)
_gsskrb5i_get_initiator_subkey(ctx, context, key); _gsskrb5i_get_initiator_subkey(ctx, context, key);
} }
if (*key == NULL) if (*key == NULL) {
krb5_set_error_string(context, "No token key available");
return GSS_KRB5_S_KG_NO_SUBKEY; return GSS_KRB5_S_KG_NO_SUBKEY;
}
return 0; return 0;
} }