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

fix various borked stuff in previous commits

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11109 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-08-16 19:42:18 +00:00
parent d27b1c7b05
commit c84480bd74
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/krb5/context.c
View File

@@ -51,7 +51,7 @@ set_etypes (krb5_context context,
krb5_enctype **ret_enctypes) krb5_enctype **ret_enctypes)
{ {
char **etypes_str; char **etypes_str;
krb5_enctype *etypes; krb5_enctype *etypes = NULL;
etypes_str = krb5_config_get_strings(context, NULL, "libdefaults", etypes_str = krb5_config_get_strings(context, NULL, "libdefaults",
name, NULL); name, NULL);
@@ -70,8 +70,8 @@ set_etypes (krb5_context context,
} }
etypes[k] = ETYPE_NULL; etypes[k] = ETYPE_NULL;
krb5_config_free_strings(etypes_str); krb5_config_free_strings(etypes_str);
*ret_enctypes = etypes; }
} *ret_enctypes = etypes;
return 0; return 0;
} }
@@ -91,7 +91,7 @@ init_context_from_config_file(krb5_context context)
INIT_FIELD(context, int, max_retries, 3, "max_retries"); INIT_FIELD(context, int, max_retries, 3, "max_retries");
INIT_FIELD(context, string, http_proxy, NULL, "http_proxy"); INIT_FIELD(context, string, http_proxy, NULL, "http_proxy");
ret = set_etypes (context, "default_etypes", &tmptypes); ret = set_etypes (context, "default_etypes", &tmptypes);
if(ret) if(ret)
return ret; return ret;
@@ -248,10 +248,11 @@ krb5_set_config_files(krb5_context context, char **filenames)
krb5_config_binding *tmp = NULL; krb5_config_binding *tmp = NULL;
while(filenames != NULL && *filenames != NULL && **filenames != '\0') { while(filenames != NULL && *filenames != NULL && **filenames != '\0') {
ret = krb5_config_parse_file_multi(context, *filenames, &tmp); ret = krb5_config_parse_file_multi(context, *filenames, &tmp);
if(ret != ENOENT) { if(ret != 0 && ret != ENOENT) {
krb5_config_file_free(context, tmp); krb5_config_file_free(context, tmp);
return ret; return ret;
} }
filenames++;
} }
krb5_config_file_free(context, context->cf); krb5_config_file_free(context, context->cf);
context->cf = tmp; context->cf = tmp;