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

Fix 64-bit warnings in name canon rules code

Browse Source
This commit is contained in:
Nicolas Williams
2011-10-29 16:48:56 -05:00
parent 1fe4d77846
commit 1192120b86
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/principal.c
View File

@@ -1421,8 +1421,8 @@ expand_search_list(krb5_context context, krb5_name_canon_rule *r, size_t *n,
/* Make room for the new rules */ /* Make room for the new rules */
if (insert_point < (*n) - 1) { if (insert_point < (*n) - 1) {
_krb5_debug(context, 5, "Inserting %d qualify rules in place of a " _krb5_debug(context, 5, "Inserting %ld qualify rules in place of a "
"resolver searchlist rule", srch_list_len); "resolver searchlist rule", (unsigned long)srch_list_len);
/* /*
* Move the rules that follow the search list rule down by * Move the rules that follow the search list rule down by
* srch_list_len - 1 rules. * srch_list_len - 1 rules.
@@ -1444,7 +1444,7 @@ expand_search_list(krb5_context context, krb5_name_canon_rule *r, size_t *n,
dnsrch[i]); dnsrch[i]);
new_r[insert_point + i].type = KRB5_NCRT_QUALIFY; new_r[insert_point + i].type = KRB5_NCRT_QUALIFY;
new_r[insert_point + i].domain = domains[i]; new_r[insert_point + i].domain = domains[i];
new_r[insert_point + i].options = new_r[insert_point].options; new_r[insert_point + i].options = opts;
} }
free(domains); free(domains);
@@ -1600,9 +1600,9 @@ _krb5_get_name_canon_rules(krb5_context context, krb5_name_canon_rule *rules)
krb5_name_canon_rule r; krb5_name_canon_rule r;
for (k = 0, r = *rules; r; r = r->next, k++) { for (k = 0, r = *rules; r; r = r->next, k++) {
_krb5_debug(context, 5, _krb5_debug(context, 5,
"Name canon rule %d type=%d, options=%x, mindots=%d, " "Name canon rule %ld type=%d, options=%x, mindots=%d, "
"domain=%s, realm=%s", "domain=%s, realm=%s",
k, r->type, r->options, r->mindots, (unsigned long)k, r->type, r->options, r->mindots,
r->domain ? r->domain : "<none>", r->domain ? r->domain : "<none>",
r->realm ? r->realm : "<none>" r->realm ? r->realm : "<none>"
); );
@@ -1779,7 +1779,7 @@ out:
char *unparsed; char *unparsed;
ret2 = krb5_unparse_name(context, *out_princ, &unparsed); ret2 = krb5_unparse_name(context, *out_princ, &unparsed);
if (ret) { if (ret2) {
_krb5_debug(context, 5, "Couldn't unparse resulting princ! (%d)", _krb5_debug(context, 5, "Couldn't unparse resulting princ! (%d)",
ret); ret);
} else { } else {