[PATCH] Fix the 32-bit build
Jeremy Allison
jra at samba.org
Tue Jul 17 22:03:04 UTC 2018
LGTM. RB+ and pushed !
Jeremy.
On Tue, Jul 17, 2018 at 05:55:10PM +0200, Volker Lendecke via samba-technical wrote:
> From e6e677b3557dbd2c22ea6a589f0756778e85bb56 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Fri, 13 Jul 2018 16:31:07 +0200
> Subject: [PATCH 1/2] kcc: Fix the 32-bit build
>
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
> source4/dsdb/kcc/scavenge_dns_records.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/source4/dsdb/kcc/scavenge_dns_records.c b/source4/dsdb/kcc/scavenge_dns_records.c
> index 2f4f482..6c0684b 100644
> --- a/source4/dsdb/kcc/scavenge_dns_records.c
> +++ b/source4/dsdb/kcc/scavenge_dns_records.c
> @@ -164,7 +164,7 @@ NTSTATUS dns_tombstone_records_zone(TALLOC_CTX *mem_ctx,
> "(&(objectClass=dnsNode)"
> "(&(!(dnsTombstoned=TRUE))"
> "(dnsRecord:" DSDB_MATCH_FOR_DNS_TO_TOMBSTONE_TIME
> - ":=%lu)))",
> + ":=%"PRIu64")))",
> t);
> if (ret != LDB_SUCCESS) {
> *error_string = talloc_asprintf(mem_ctx,
> --
> 1.9.1
>
>
> From 555c73faa8cda2b506b9b06ad0c712bbaa4c8897 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Fri, 13 Jul 2018 16:31:21 +0200
> Subject: [PATCH 2/2] dsdb: Fix the 32-bit build
>
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
> source4/dsdb/samdb/ldb_modules/audit_log.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/source4/dsdb/samdb/ldb_modules/audit_log.c b/source4/dsdb/samdb/ldb_modules/audit_log.c
> index 581f2f2..800f8e8 100644
> --- a/source4/dsdb/samdb/ldb_modules/audit_log.c
> +++ b/source4/dsdb/samdb/ldb_modules/audit_log.c
> @@ -754,7 +754,7 @@ static char *transaction_human_readable(
>
> log_entry = talloc_asprintf(
> mem_ctx,
> - "[%s] at [%s] duration [%ld]",
> + "[%s] at [%s] duration [%"PRIi64"]",
> action,
> timestamp,
> duration);
> @@ -791,7 +791,7 @@ static char *commit_failure_human_readable(
>
> log_entry = talloc_asprintf(
> mem_ctx,
> - "[%s] at [%s] duration [%ld] status [%d] reason [%s]",
> + "[%s] at [%s] duration [%"PRIi64"] status [%d] reason [%s]",
> action,
> timestamp,
> duration,
> --
> 1.9.1
>
More information about the samba-technical
mailing list