Fix size_t compilation failures on i386

Douglas Bagnall douglas.bagnall at catalyst.net.nz
Thu Jun 25 22:43:48 MDT 2015


hi Metze,

Some recent changes broke autobuilds on i386 with -WError because
size_t's %zu format is not the same as uint_max_t's %ju.
Here are fixes.

cheers,
Douglas
-------------- next part --------------
From 02b0a1039cfc63512447810751a353502ba83548 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri, 26 Jun 2015 15:05:48 +1200
Subject: [PATCH 1/5] Fix gensec_gssapi compilation for i386
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes this:

../source4/auth/gensec/gensec_gssapi.c:1017:3: error: format ‘%ju’ expects argument of type ‘uintmax_t’, but argument 3 has type ‘size_t’ [-Werror=format=]

Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
 source4/auth/gensec/gensec_gssapi.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index 899dcfd..a12447a 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -1014,8 +1014,8 @@ static NTSTATUS gensec_gssapi_seal_packet(struct gensec_security *gensec_securit
 				    whole_pdu, pdu_length,
 				    mem_ctx, sig);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("gssapi_seal_packet(hdr_signing=%u,sig_size=%ju,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+		DEBUG(0, ("gssapi_seal_packet(hdr_signing=%u,sig_size=%zu,"
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, sig_size, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
@@ -1045,8 +1045,8 @@ static NTSTATUS gensec_gssapi_unseal_packet(struct gensec_security *gensec_secur
 				      whole_pdu, pdu_length,
 				      sig);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("gssapi_unseal_packet(hdr_signing=%u,sig_size=%ju,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+		DEBUG(0, ("gssapi_unseal_packet(hdr_signing=%u,sig_size=%zu,"
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, sig->length, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
@@ -1078,7 +1078,7 @@ static NTSTATUS gensec_gssapi_sign_packet(struct gensec_security *gensec_securit
 				    mem_ctx, sig);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("gssapi_sign_packet(hdr_signing=%u,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
@@ -1108,8 +1108,8 @@ static NTSTATUS gensec_gssapi_check_packet(struct gensec_security *gensec_securi
 				     whole_pdu, pdu_length,
 				     sig);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("gssapi_check_packet(hdr_signing=%u,sig_size=%ju,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+		DEBUG(0, ("gssapi_check_packet(hdr_signing=%u,sig_size=%zu,"
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, sig->length, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
-- 
1.9.1

From f6015a69436c6f5e0157513637e525f101c9d62e Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri, 26 Jun 2015 15:25:55 +1200
Subject: [PATCH 2/5] Fix ldap_bind compilation for i386
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

More size_t != uintmax_t issues:

../source4/libcli/ldap/ldap_bind.c: In function ‘ldap_bind_sasl’:
../source4/libcli/ldap/ldap_bind.c:237:3: error: format ‘%ju’ expects argument of type ‘uintmax_t’, but argument 2 has type ‘size_t’ [-Werror=format=]

   DEBUG(1, ("SASL bind triggered with non empty send_queue[%ju]: %s\n",
      ^
      cc1: all warnings being treated as errors

Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
 source4/libcli/ldap/ldap_bind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index daa7662..0da49f3 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -234,7 +234,7 @@ _PUBLIC_ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn,
 	queue_length = tevent_queue_length(conn->sockets.send_queue);
 	if (queue_length != 0) {
 		status = NT_STATUS_INVALID_PARAMETER_MIX;
-		DEBUG(1, ("SASL bind triggered with non empty send_queue[%ju]: %s\n",
+		DEBUG(1, ("SASL bind triggered with non empty send_queue[%zu]: %s\n",
 			  queue_length, nt_errstr(status)));
 		goto failed;
 	}
-- 
1.9.1

From e04e3dd2c59fb472abdc4692afe8fdaaaddc3eeb Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri, 26 Jun 2015 16:01:10 +1200
Subject: [PATCH 5/5] Fix format size errors for i386 in
 source3/librpc/crypto/gse.c

Again, sizeof(size_t) != sizeof(uintmax_t).

Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
 source3/librpc/crypto/gse.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 46b5c6d..33a32c3 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -755,8 +755,8 @@ static NTSTATUS gensec_gse_seal_packet(struct gensec_security *gensec_security,
 				    whole_pdu, pdu_length,
 				    mem_ctx, sig);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("gssapi_seal_packet(hdr_signing=%u,sig_size=%ju,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+		DEBUG(0, ("gssapi_seal_packet(hdr_signing=%u,sig_size=%zu,"
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, sig_size, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
@@ -787,8 +787,8 @@ static NTSTATUS gensec_gse_unseal_packet(struct gensec_security *gensec_security
 				      whole_pdu, pdu_length,
 				      sig);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("gssapi_unseal_packet(hdr_signing=%u,sig_size=%ju,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+		DEBUG(0, ("gssapi_unseal_packet(hdr_signing=%u,sig_size=%zu,"
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, sig->length, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
@@ -821,7 +821,7 @@ static NTSTATUS gensec_gse_sign_packet(struct gensec_security *gensec_security,
 				    mem_ctx, sig);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("gssapi_sign_packet(hdr_signing=%u,"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
@@ -852,8 +852,8 @@ static NTSTATUS gensec_gse_check_packet(struct gensec_security *gensec_security,
 				     whole_pdu, pdu_length,
 				     sig);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("gssapi_check_packet(hdr_signing=%u,sig_size=%ju"
-			  "data=%ju,pdu=%ju) failed: %s\n",
+		DEBUG(0, ("gssapi_check_packet(hdr_signing=%u,sig_size=%zu"
+			  "data=%zu,pdu=%zu) failed: %s\n",
 			  hdr_signing, sig->length, length, pdu_length,
 			  nt_errstr(status)));
 		return status;
-- 
1.9.1


More information about the samba-technical mailing list