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

(gsskrb5_register_acceptor_identity): allow reseting to default keytab

Browse Source 
by passing in NULL as identity.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13689 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-04-05 20:17:26 +00:00
parent e2f5762cc8
commit 503d84b4f9
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/gssapi/accept_sec_context.c
View File

@@ -42,7 +42,6 @@ OM_uint32
gsskrb5_register_acceptor_identity (const char *identity) gsskrb5_register_acceptor_identity (const char *identity)
{ {
krb5_error_code ret; krb5_error_code ret;
char *p;
ret = gssapi_krb5_init(); ret = gssapi_krb5_init();
if(ret) if(ret)
@@ -54,6 +53,11 @@ gsskrb5_register_acceptor_identity (const char *identity)
krb5_kt_close(gssapi_krb5_context, gssapi_krb5_keytab); krb5_kt_close(gssapi_krb5_context, gssapi_krb5_keytab);
gssapi_krb5_keytab = NULL; gssapi_krb5_keytab = NULL;
} }
if (identity == NULL) {
ret = krb5_kt_default(gssapi_krb5_context, &gssapi_krb5_keytab);
} else {
char *p;
asprintf(&p, "FILE:%s", identity); asprintf(&p, "FILE:%s", identity);
if(p == NULL) { if(p == NULL) {
HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex); HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex);
@@ -61,6 +65,7 @@ gsskrb5_register_acceptor_identity (const char *identity)
} }
ret = krb5_kt_resolve(gssapi_krb5_context, p, &gssapi_krb5_keytab); ret = krb5_kt_resolve(gssapi_krb5_context, p, &gssapi_krb5_keytab);
free(p); free(p);
}
HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex); HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex);
if(ret) if(ret)
return GSS_S_FAILURE; return GSS_S_FAILURE;

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

@@ -42,7 +42,6 @@ OM_uint32
gsskrb5_register_acceptor_identity (const char *identity) gsskrb5_register_acceptor_identity (const char *identity)
{ {
krb5_error_code ret; krb5_error_code ret;
char *p;
ret = gssapi_krb5_init(); ret = gssapi_krb5_init();
if(ret) if(ret)
@@ -54,6 +53,11 @@ gsskrb5_register_acceptor_identity (const char *identity)
krb5_kt_close(gssapi_krb5_context, gssapi_krb5_keytab); krb5_kt_close(gssapi_krb5_context, gssapi_krb5_keytab);
gssapi_krb5_keytab = NULL; gssapi_krb5_keytab = NULL;
} }
if (identity == NULL) {
ret = krb5_kt_default(gssapi_krb5_context, &gssapi_krb5_keytab);
} else {
char *p;
asprintf(&p, "FILE:%s", identity); asprintf(&p, "FILE:%s", identity);
if(p == NULL) { if(p == NULL) {
HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex); HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex);
@@ -61,6 +65,7 @@ gsskrb5_register_acceptor_identity (const char *identity)
} }
ret = krb5_kt_resolve(gssapi_krb5_context, p, &gssapi_krb5_keytab); ret = krb5_kt_resolve(gssapi_krb5_context, p, &gssapi_krb5_keytab);
free(p); free(p);
}
HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex); HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex);
if(ret) if(ret)
return GSS_S_FAILURE; return GSS_S_FAILURE;