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

Cleanups: s/\<assert\>/heim_assert/

Browse Source
This commit is contained in:
Nicolas Williams
2011-10-20 12:43:24 -05:00
parent 9f5a43084c
commit 248e1eb772
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5/principal.c
View File

@@ -57,8 +57,6 @@ host/admin@H5L.ORG
#include <fnmatch.h> #include <fnmatch.h>
#include "resolve.h" #include "resolve.h"
#include <assert.h>
#define princ_num_comp(P) ((P)->name.name_string.len) #define princ_num_comp(P) ((P)->name.name_string.len)
#define princ_type(P) ((P)->name.name_type) #define princ_type(P) ((P)->name.name_type)
#define princ_comp(P) ((P)->name.name_string.val) #define princ_comp(P) ((P)->name.name_string.val)
@@ -1354,7 +1352,8 @@ expand_search_list(krb5_context context, krb5_name_canon_rule *r, size_t *n,
int ret; int ret;
/* Sanitize */ /* Sanitize */
assert((*n) > insert_point); heim_assert((*n) > insert_point,
"name canon search list rule expansion: internal error");
free((*r)[insert_point].domain); free((*r)[insert_point].domain);
free((*r)[insert_point].realm); free((*r)[insert_point].realm);
(*r)[insert_point].domain = NULL; (*r)[insert_point].domain = NULL;
@@ -1663,7 +1662,8 @@ _krb5_apply_name_canon_rule(krb5_context context, krb5_name_canon_rule rule,
char *new_hostname; char *new_hostname;
const char *cp; const char *cp;
assert(in_princ->name.name_type == KRB5_NT_SRV_HST_NEEDS_CANON); heim_assert(in_princ->name.name_type == KRB5_NT_SRV_HST_NEEDS_CANON,
"internal error: principal does not need canon");
*out_princ = NULL; *out_princ = NULL;
if (rule_opts) if (rule_opts)
*rule_opts = 0; *rule_opts = 0;
@@ -1707,7 +1707,12 @@ _krb5_apply_name_canon_rule(krb5_context context, krb5_name_canon_rule rule,
goto out; goto out;
break; break;
case KRB5_NCRT_QUALIFY: case KRB5_NCRT_QUALIFY:
assert(rule->domain != NULL); /*
* Note that we should never get these rules even if specified
* in krb5.conf. See rule parser.
*/
heim_assert(rule->domain != NULL,
"missing domain for qualify name canon rule");
cp = strchr(hostname, '.'); cp = strchr(hostname, '.');
if (cp && (cp = strstr(cp, rule->domain))) { if (cp && (cp = strstr(cp, rule->domain))) {
new_hostname = strdup(hostname); new_hostname = strdup(hostname);