1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00

heimdal: Fix the 32-bit build on FreeBSD

REF: https://github.com/heimdal/heimdal/pull/1004
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15220

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit ab4c7bda8d)

Autobuild-User(v4-16-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-16-test): Tue Nov  8 14:09:47 UTC 2022 on sn-devel-184
This commit is contained in:
Volker Lendecke 2022-07-22 18:38:21 +02:00 committed by Jule Anger
parent eeea6587e9
commit b57c2bb472
5 changed files with 7 additions and 7 deletions

View File

@ -493,7 +493,7 @@ _kdc_gss_endtime(astgs_request_t r,
endtime = kdc_time + gcp->lifetime;
kdc_log(r->context, r->config, 10,
"GSS pre-authentication endtime is %ld", endtime);
"GSS pre-authentication endtime is %ld", (long)endtime);
return endtime;
}

View File

@ -552,7 +552,7 @@ encode_type (const char *name, const Type *t, const char *tmpstr)
* \
* +-- psave_<fieldName>
*/
"e = der_put_tag(psave_%s, %lu, %s, %s, %d, &l2_%s);\n"
"e = der_put_tag(psave_%s, %zu, %s, %s, %d, &l2_%s);\n"
"if (e) { free(pfree_%s); return e; }\n"
/* Restore `len' and adjust it (see `p' below) */
"len = lensave_%s - (l + %zu - asn1_tag_length_%s);\n"
@ -573,7 +573,7 @@ encode_type (const char *name, const Type *t, const char *tmpstr)
* \
* +-- p
*/
"p = psave_%s - (1 + %lu - asn1_tag_length_%s); }\n",
"p = psave_%s - (1 + %zu - asn1_tag_length_%s); }\n",
tmpstr, tmpstr, tmpstr, t->subtype->symbol->name,
tmpstr, t->subtype->symbol->name, t->subtype->symbol->name,
tmpstr, length_tag(t->tag.tagvalue),

View File

@ -830,7 +830,7 @@ template_object_set(IOSObjectSet *os, Field *typeidfield, Field *opentypefield)
}
free(objects);
tlist_header(tl, "{ 0, 0, ((void *)(uintptr_t)%lu) }", nobjs);
tlist_header(tl, "{ 0, 0, ((void *)(uintptr_t)%zu) }", nobjs);
tlist_print(tl);
tlist_add(tl);
os->symbol->emitted_template = 1;
@ -970,7 +970,7 @@ template_members(struct templatehead *temp,
"{ A1_OP_NAME, %d, \"%s\" }", (int)m->val, m->name);
nmemb++;
}
tlist_header(tl, "{ 0, 0, ((void *)(uintptr_t)%lu) }", nmemb);
tlist_header(tl, "{ 0, 0, ((void *)(uintptr_t)%zu) }", nmemb);
/* XXX Accidentally O(N^2)? */
if (!tlist_find_dup(tl)) {
tlist_print(tl);

View File

@ -849,7 +849,7 @@ heim_audit_addkv_timediff(heim_svc_req_desc r, const char *k,
sec -= 1;
}
heim_audit_addkv(r, 0, k, "%s%ld.%06d", sign, sec, usec);
heim_audit_addkv(r, 0, k, "%s%ld.%06d", sign, (long)sec, usec);
}
void

View File

@ -897,7 +897,7 @@ _krb5_extract_ticket(krb5_context context,
ret = KRB5KRB_AP_ERR_SKEW;
krb5_set_error_message (context, ret,
N_("time skew (%ld) larger than max (%ld)", ""),
krb5_time_abs(tmp_time, sec_now),
(long)krb5_time_abs(tmp_time, sec_now),
(long)context->max_skew);
goto out;
}