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

Get default keytab name from context.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4702 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-04-03 02:18:11 +00:00
parent 6fce76cd71
commit ec6338f9d4
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/krb5/keytab.c
View File

@@ -66,12 +66,11 @@ krb5_kt_resolve(krb5_context context,
{ {
krb5_keytab k; krb5_keytab k;
int i; int i;
const char *p = strchr(name, ':'); const char *type, *residual;
size_t type_len;
krb5_error_code ret; krb5_error_code ret;
if(p == NULL) /* register default set of types */
return KRB5_KT_UNKNOWN_TYPE;
if(num_kt_types == 0) { if(num_kt_types == 0) {
ret = krb5_kt_register(context, &fops); ret = krb5_kt_register(context, &fops);
if(ret) return ret; if(ret) return ret;
@@ -79,8 +78,19 @@ krb5_kt_resolve(krb5_context context,
if(ret) return ret; if(ret) return ret;
} }
residual = strchr(name, ':');
if(residual == NULL) {
type = "FILE";
type_len = strlen(type);
residual = name;
} else {
type = name;
type_len = residual - name;
residual++;
}
for(i = 0; i < num_kt_types; i++) { for(i = 0; i < num_kt_types; i++) {
if(strncmp(name, kt_types[i].prefix, p - name) == 0) if(strncmp(type, kt_types[i].prefix, type_len) == 0)
break; break;
} }
if(i == num_kt_types) if(i == num_kt_types)
@@ -89,29 +99,28 @@ krb5_kt_resolve(krb5_context context,
ALLOC(k, 1); ALLOC(k, 1);
memcpy(k, &kt_types[i], sizeof(*k)); memcpy(k, &kt_types[i], sizeof(*k));
k->data = NULL; k->data = NULL;
ret = (*k->resolve)(context, p + 1, k); ret = (*k->resolve)(context, residual, k);
if(ret) { if(ret) {
free(k); free(k);
k = NULL; k = NULL;
} }
*id = k; *id = k;
return ret; return ret;
return 0;
} }
#define KEYTAB_DEFAULT "FILE:/etc/krb5.keytab"
krb5_error_code krb5_error_code
krb5_kt_default_name(krb5_context context, char *name, int namesize) krb5_kt_default_name(krb5_context context, char *name, size_t namesize)
{ {
strncpy (name, KEYTAB_DEFAULT, namesize); strncpy(name, context->default_keytab, namesize);
if(strlen(context->default_keytab) >= namesize)
return KRB5_CONFIG_NOTENUFSPACE;
return 0; return 0;
} }
krb5_error_code krb5_error_code
krb5_kt_default(krb5_context context, krb5_keytab *id) krb5_kt_default(krb5_context context, krb5_keytab *id)
{ {
return krb5_kt_resolve (context, KEYTAB_DEFAULT, id); return krb5_kt_resolve (context, context->default_keytab, id);
} }
krb5_error_code krb5_error_code