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

Use krb5_kt_close/krb5_kt_resolve.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4552 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-03-06 01:28:01 +00:00
parent f917307717
commit 27820be63e
4 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/gssapi/accept_sec_context.c
View File

@@ -40,15 +40,22 @@
RCSID("$Id$"); RCSID("$Id$");
static krb5_keytab_data gss_keytab = { NULL }; static krb5_keytab gss_keytab;
OM_uint32 gsskrb5_register_acceptor_identity OM_uint32
(char *identity) gsskrb5_register_acceptor_identity (char *identity)
{ {
if (gss_keytab.filename != NULL) char *p;
free(gss_keytab.filename); if(gss_keytab != NULL) {
gss_keytab.filename = strdup(identity); krb5_kt_close(gssapi_krb5_context, gss_keytab);
return GSS_S_COMPLETE; gss_keytab = NULL;
}
asprintf(&p, "FILE:%s", identity);
if(p == NULL)
return GSS_S_FAILURE;
krb5_kt_resolve(gssapi_krb5_context, p, &gss_keytab);
free(p);
return GSS_S_COMPLETE;
} }
OM_uint32 gss_accept_sec_context OM_uint32 gss_accept_sec_context
@@ -72,7 +79,7 @@ OM_uint32 gss_accept_sec_context
OM_uint32 flags; OM_uint32 flags;
krb5_ticket *ticket; krb5_ticket *ticket;
Checksum cksum; Checksum cksum;
krb5_keytab_data *keytab = NULL; krb5_keytab keytab = NULL;
gssapi_krb5_init (); gssapi_krb5_init ();
@@ -114,8 +121,8 @@ OM_uint32 gss_accept_sec_context
goto failure; goto failure;
if (acceptor_cred_handle == GSS_C_NO_CREDENTIAL) { if (acceptor_cred_handle == GSS_C_NO_CREDENTIAL) {
if (gss_keytab.filename != NULL) { if (gss_keytab != NULL) {
keytab = &gss_keytab; keytab = gss_keytab;
} }
} else if (acceptor_cred_handle->keytab != NULL) { } else if (acceptor_cred_handle->keytab != NULL) {
keytab = acceptor_cred_handle->keytab; keytab = acceptor_cred_handle->keytab;

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

@@ -40,15 +40,22 @@
RCSID("$Id$"); RCSID("$Id$");
static krb5_keytab_data gss_keytab = { NULL }; static krb5_keytab gss_keytab;
OM_uint32 gsskrb5_register_acceptor_identity OM_uint32
(char *identity) gsskrb5_register_acceptor_identity (char *identity)
{ {
if (gss_keytab.filename != NULL) char *p;
free(gss_keytab.filename); if(gss_keytab != NULL) {
gss_keytab.filename = strdup(identity); krb5_kt_close(gssapi_krb5_context, gss_keytab);
return GSS_S_COMPLETE; gss_keytab = NULL;
}
asprintf(&p, "FILE:%s", identity);
if(p == NULL)
return GSS_S_FAILURE;
krb5_kt_resolve(gssapi_krb5_context, p, &gss_keytab);
free(p);
return GSS_S_COMPLETE;
} }
OM_uint32 gss_accept_sec_context OM_uint32 gss_accept_sec_context
@@ -72,7 +79,7 @@ OM_uint32 gss_accept_sec_context
OM_uint32 flags; OM_uint32 flags;
krb5_ticket *ticket; krb5_ticket *ticket;
Checksum cksum; Checksum cksum;
krb5_keytab_data *keytab = NULL; krb5_keytab keytab = NULL;
gssapi_krb5_init (); gssapi_krb5_init ();
@@ -114,8 +121,8 @@ OM_uint32 gss_accept_sec_context
goto failure; goto failure;
if (acceptor_cred_handle == GSS_C_NO_CREDENTIAL) { if (acceptor_cred_handle == GSS_C_NO_CREDENTIAL) {
if (gss_keytab.filename != NULL) { if (gss_keytab != NULL) {
keytab = &gss_keytab; keytab = gss_keytab;
} }
} else if (acceptor_cred_handle->keytab != NULL) { } else if (acceptor_cred_handle->keytab != NULL) {
keytab = acceptor_cred_handle->keytab; keytab = acceptor_cred_handle->keytab;

9
lib/gssapi/krb5/release_cred.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -52,11 +52,8 @@ OM_uint32 gss_release_cred
gssapi_krb5_init (); gssapi_krb5_init ();
krb5_free_principal(gssapi_krb5_context, (*cred_handle)->principal); krb5_free_principal(gssapi_krb5_context, (*cred_handle)->principal);
if ((*cred_handle)->keytab != NULL) { if ((*cred_handle)->keytab != NULL)
if ((*cred_handle)->keytab->filename != NULL) krb5_kt_close(gssapi_krb5_context, (*cred_handle)->keytab);
free((*cred_handle)->keytab->filename);
free((*cred_handle)->keytab);
}
gss_release_oid_set(NULL, &(*cred_handle)->mechanisms); gss_release_oid_set(NULL, &(*cred_handle)->mechanisms);
free(*cred_handle); free(*cred_handle);
*cred_handle = GSS_C_NO_CREDENTIAL; *cred_handle = GSS_C_NO_CREDENTIAL;

9
lib/gssapi/release_cred.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -52,11 +52,8 @@ OM_uint32 gss_release_cred
gssapi_krb5_init (); gssapi_krb5_init ();
krb5_free_principal(gssapi_krb5_context, (*cred_handle)->principal); krb5_free_principal(gssapi_krb5_context, (*cred_handle)->principal);
if ((*cred_handle)->keytab != NULL) { if ((*cred_handle)->keytab != NULL)
if ((*cred_handle)->keytab->filename != NULL) krb5_kt_close(gssapi_krb5_context, (*cred_handle)->keytab);
free((*cred_handle)->keytab->filename);
free((*cred_handle)->keytab);
}
gss_release_oid_set(NULL, &(*cred_handle)->mechanisms); gss_release_oid_set(NULL, &(*cred_handle)->mechanisms);
free(*cred_handle); free(*cred_handle);
*cred_handle = GSS_C_NO_CREDENTIAL; *cred_handle = GSS_C_NO_CREDENTIAL;