abort -> krb5_abortx
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6036 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -338,7 +338,7 @@ krb5_config_parse_file (const char *fname, krb5_config_section **res)
|
|||||||
#endif /* HAVE_NETINFO_NI_H */
|
#endif /* HAVE_NETINFO_NI_H */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
free_binding (krb5_config_binding *b)
|
free_binding (krb5_context context, krb5_config_binding *b)
|
||||||
{
|
{
|
||||||
krb5_config_binding *next_b;
|
krb5_config_binding *next_b;
|
||||||
|
|
||||||
@@ -347,9 +347,10 @@ free_binding (krb5_config_binding *b)
|
|||||||
if (b->type == krb5_config_string)
|
if (b->type == krb5_config_string)
|
||||||
free (b->u.string);
|
free (b->u.string);
|
||||||
else if (b->type == krb5_config_list)
|
else if (b->type == krb5_config_list)
|
||||||
free_binding (b->u.list);
|
free_binding (context, b->u.list);
|
||||||
else
|
else
|
||||||
abort ();
|
krb5_abortx(context, "unknown binding type (%d) in free_binding",
|
||||||
|
b->type);
|
||||||
next_b = b->next;
|
next_b = b->next;
|
||||||
free (b);
|
free (b);
|
||||||
b = next_b;
|
b = next_b;
|
||||||
@@ -357,9 +358,9 @@ free_binding (krb5_config_binding *b)
|
|||||||
}
|
}
|
||||||
|
|
||||||
krb5_error_code
|
krb5_error_code
|
||||||
krb5_config_file_free (krb5_config_section *s)
|
krb5_config_file_free (krb5_context context, krb5_config_section *s)
|
||||||
{
|
{
|
||||||
free_binding (s);
|
free_binding (context, s);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -725,10 +726,14 @@ krb5_config_get_int (krb5_context context,
|
|||||||
|
|
||||||
#ifdef TEST
|
#ifdef TEST
|
||||||
|
|
||||||
static int print_list (FILE *f, krb5_config_binding *l, unsigned level);
|
static int print_list (krb5_context context, FILE *f,
|
||||||
static int print_binding (FILE *f, krb5_config_binding *b, unsigned level);
|
krb5_config_binding *l, unsigned level);
|
||||||
static int print_section (FILE *f, krb5_config_section *s, unsigned level);
|
static int print_binding (krb5_context context, FILE *f,
|
||||||
static int print_config (FILE *f, krb5_config_section *c);
|
krb5_config_binding *b, unsigned level);
|
||||||
|
static int print_section (krb5_context context, FILE *f,
|
||||||
|
krb5_config_section *s, unsigned level);
|
||||||
|
static int print_config (krb5_context context, FILE *f,
|
||||||
|
krb5_config_section *c);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
tab (FILE *f, unsigned count)
|
tab (FILE *f, unsigned count)
|
||||||
@@ -738,17 +743,23 @@ tab (FILE *f, unsigned count)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
print_list (FILE *f, krb5_config_binding *l, unsigned level)
|
print_list (krb5_context context,
|
||||||
|
FILE *f,
|
||||||
|
krb5_config_binding *l,
|
||||||
|
unsigned level)
|
||||||
{
|
{
|
||||||
while(l) {
|
while(l) {
|
||||||
print_binding (f, l, level);
|
print_binding (context, f, l, level);
|
||||||
l = l->next;
|
l = l->next;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
print_binding (FILE *f, krb5_config_binding *b, unsigned level)
|
print_binding (krb5_context context,
|
||||||
|
FILE *f,
|
||||||
|
krb5_config_binding *b,
|
||||||
|
unsigned level)
|
||||||
{
|
{
|
||||||
tab (f, level);
|
tab (f, level);
|
||||||
fprintf (f, "%s = ", b->name);
|
fprintf (f, "%s = ", b->name);
|
||||||
@@ -760,7 +771,8 @@ print_binding (FILE *f, krb5_config_binding *b, unsigned level)
|
|||||||
tab (f, level);
|
tab (f, level);
|
||||||
fprintf (f, "}\n");
|
fprintf (f, "}\n");
|
||||||
} else
|
} else
|
||||||
abort ();
|
krb5_abortx(context, "unknown binding type (%d) in print_binding",
|
||||||
|
b->type);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997-1999 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -114,7 +114,7 @@ krb5_mk_rep(krb5_context context,
|
|||||||
free_AP_REP (&ap);
|
free_AP_REP (&ap);
|
||||||
|
|
||||||
if(len != buf_size)
|
if(len != buf_size)
|
||||||
abort();
|
krb5_abortx(context, "krb5_mk_rep: encoded length != calculated length");
|
||||||
outbuf->data = buf;
|
outbuf->data = buf;
|
||||||
outbuf->length = len;
|
outbuf->length = len;
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -284,8 +284,7 @@ krb5_unparse_name_ext(krb5_context context,
|
|||||||
char **name,
|
char **name,
|
||||||
size_t *size)
|
size_t *size)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "krb5_unparse_name_ext: not implemented\n");
|
krb5_abortx(context, "unimplemented krb5_unparse_name_ext called");
|
||||||
abort();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user