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

(gss_accept_sec_context): don't always pass server == NULL to

Browse Source 
krb5_rd_req.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3045 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-08-17 16:38:07 +00:00
parent 04bd7f5762
commit 1ff1285235
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gssapi/accept_sec_context.c
View File

@@ -64,9 +64,11 @@ OM_uint32 gss_accept_sec_context
gssapi_krb5_init (); gssapi_krb5_init ();
if (*context_handle != GSS_C_NO_CONTEXT) {
*context_handle = malloc(sizeof(**context_handle)); *context_handle = malloc(sizeof(**context_handle));
if (*context_handle == NULL) if (*context_handle == GSS_C_NO_CONTEXT)
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
(*context_handle)->auth_context = NULL; (*context_handle)->auth_context = NULL;
(*context_handle)->source = NULL; (*context_handle)->source = NULL;
@@ -102,8 +104,10 @@ OM_uint32 gss_accept_sec_context
kret = krb5_rd_req (gssapi_krb5_context, kret = krb5_rd_req (gssapi_krb5_context,
&(*context_handle)->auth_context, &(*context_handle)->auth_context,
&indata, &indata,
/*server*/ NULL, /* XXX */ (acceptor_cred_handle == GSS_C_NO_CREDENTIAL) ? NULL
NULL, : acceptor_cred_handle->principal,
(acceptor_cred_handle == GSS_C_NO_CREDENTIAL) ? NULL
: acceptor_cred_handle->keytab,
&ap_options, &ap_options,
&ticket); &ticket);
if (kret) { if (kret) {

10
lib/gssapi/krb5/accept_sec_context.c
View File

@@ -64,9 +64,11 @@ OM_uint32 gss_accept_sec_context
gssapi_krb5_init (); gssapi_krb5_init ();
if (*context_handle != GSS_C_NO_CONTEXT) {
*context_handle = malloc(sizeof(**context_handle)); *context_handle = malloc(sizeof(**context_handle));
if (*context_handle == NULL) if (*context_handle == GSS_C_NO_CONTEXT)
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
(*context_handle)->auth_context = NULL; (*context_handle)->auth_context = NULL;
(*context_handle)->source = NULL; (*context_handle)->source = NULL;
@@ -102,8 +104,10 @@ OM_uint32 gss_accept_sec_context
kret = krb5_rd_req (gssapi_krb5_context, kret = krb5_rd_req (gssapi_krb5_context,
&(*context_handle)->auth_context, &(*context_handle)->auth_context,
&indata, &indata,
/*server*/ NULL, /* XXX */ (acceptor_cred_handle == GSS_C_NO_CREDENTIAL) ? NULL
NULL, : acceptor_cred_handle->principal,
(acceptor_cred_handle == GSS_C_NO_CREDENTIAL) ? NULL
: acceptor_cred_handle->keytab,
&ap_options, &ap_options,
&ticket); &ticket);
if (kret) { if (kret) {