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

(gss_userok): create a local krb5_context and use that instead of the

Browse Source 
libgssapi context (that might not exist).


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17690 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-06-27 13:49:06 +00:00
parent 57e3dddd18
commit 4c6a364bf5
1 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
appl/ftp/ftpd/gss_userok.c
View File

@@ -41,8 +41,6 @@ RCSID("$Id$");
What is the correct way to do this? What is the correct way to do this?
*/ */
extern krb5_context gssapi_krb5_context;
/* XXX sync with gssapi.c */ /* XXX sync with gssapi.c */
struct gss_data { struct gss_data {
gss_ctx_id_t context_hdl; gss_ctx_id_t context_hdl;
@@ -56,17 +54,24 @@ int
gss_userok(void *app_data, char *username) gss_userok(void *app_data, char *username)
{ {
struct gss_data *data = app_data; struct gss_data *data = app_data;
if(gssapi_krb5_context) { krb5_context context;
krb5_principal client;
krb5_error_code ret; krb5_error_code ret;
krb5_principal client;
OM_uint32 minor_status; OM_uint32 minor_status;
ret = krb5_parse_name(gssapi_krb5_context, data->client_name, &client); ret = krb5_init_context(&context);
if (ret) if (ret)
return 1; return 1;
ret = krb5_kuserok(gssapi_krb5_context, client, username);
ret = krb5_parse_name(context, data->client_name, &client);
if(ret) {
krb5_free_context(context);
return 1;
}
ret = krb5_kuserok(context, client, username);
if (!ret) { if (!ret) {
krb5_free_principal(gssapi_krb5_context, client); krb5_free_principal(context, client);
krb5_free_context(context);
return 1; return 1;
} }
@@ -79,11 +84,11 @@ gss_userok(void *app_data, char *username)
const char* ticketfile; const char* ticketfile;
struct passwd *kpw; struct passwd *kpw;
ret = krb5_cc_gen_new(gssapi_krb5_context, &krb5_fcc_ops, &ccache); ret = krb5_cc_gen_new(context, &krb5_fcc_ops, &ccache);
if (ret) if (ret)
goto fail; goto fail;
ticketfile = krb5_cc_get_name(gssapi_krb5_context, ccache); ticketfile = krb5_cc_get_name(context, ccache);
ret = gss_krb5_copy_ccache(&minor_status, ret = gss_krb5_copy_ccache(&minor_status,
data->delegated_cred_handle, data->delegated_cred_handle,
@@ -111,12 +116,11 @@ gss_userok(void *app_data, char *username)
afslog(NULL, 1); afslog(NULL, 1);
fail: fail:
if (ccache) if (ccache)
krb5_cc_close(gssapi_krb5_context, ccache); krb5_cc_close(context, ccache);
} }
gss_release_cred(&minor_status, &data->delegated_cred_handle); gss_release_cred(&minor_status, &data->delegated_cred_handle);
krb5_free_principal(gssapi_krb5_context, client); krb5_free_principal(context, client);
krb5_free_context(context);
return ret; return ret;
} }
return 1;
}