summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-11-30 03:20:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:46:52 -0500
commitb9b59fa7984c4f800c177a235a984e05d59f1ef8 (patch)
tree3a8a66d1e136b8fc65d1d7a261473e9102389a26
parent03d301ead5f702872b8cb948b8cd01b0fa0db5f7 (diff)
downloadsamba-b9b59fa7984c4f800c177a235a984e05d59f1ef8.tar.gz
samba-b9b59fa7984c4f800c177a235a984e05d59f1ef8.tar.bz2
samba-b9b59fa7984c4f800c177a235a984e05d59f1ef8.zip
r11968: More warning fixes. We're on track to getting to double digits for
the number of warnings generated now. (This used to be commit d479f2d7607adc698d71c5ba26932c72a26dcaab)
-rw-r--r--source4/kdc/kdc.c8
-rw-r--r--source4/smb_server/smb/receive.c6
-rw-r--r--source4/smb_server/smb2/receive.c2
-rw-r--r--source4/torture/auth/pac.c2
-rw-r--r--source4/torture/rpc/dssync.c4
-rw-r--r--source4/torture/rpc/samsync.c2
-rw-r--r--source4/winbind/wb_samba3_protocol.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index f220357708..012ba9b589 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -143,8 +143,8 @@ static void kdc_recv_handler(struct kdc_socket *kdc_socket)
talloc_steal(tmp_ctx, src_addr);
blob.length = nread;
- DEBUG(2,("Received krb5 UDP packet of length %u from %s:%u\n",
- blob.length, src_addr, (uint16_t)src_port));
+ DEBUG(2,("Received krb5 UDP packet of length %lu from %s:%u\n",
+ (long)blob.length, src_addr, (uint16_t)src_port));
/* Call krb5 */
ret = kdc_socket->process(kdc_socket->kdc,
@@ -219,8 +219,8 @@ static NTSTATUS kdc_tcp_recv(void *private, DATA_BLOB blob)
if (!src_addr) goto nomem;
src_port = socket_get_peer_port(kdcconn->conn->socket);
- DEBUG(2,("Received krb5 TCP packet of length %u from %s:%u\n",
- blob.length - 4, src_addr, src_port));
+ DEBUG(2,("Received krb5 TCP packet of length %lu from %s:%u\n",
+ (long)blob.length - 4, src_addr, src_port));
/* Call krb5 */
input = data_blob_const(blob.data + 4, blob.length - 4);
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index a1f690a5fb..b77a166b9d 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -87,15 +87,15 @@ NTSTATUS smbsrv_recv_smb_request(void *private, DATA_BLOB blob)
}
if ((NBT_HDR_SIZE + MIN_SMB_SIZE) > blob.length) {
- DEBUG(2,("Invalid SMB packet: length %d\n", blob.length));
+ DEBUG(2,("Invalid SMB packet: length %ld\n", (long)blob.length));
smbsrv_terminate_connection(smb_conn, "Invalid SMB packet");
return NT_STATUS_OK;
}
/* Make sure this is an SMB packet */
if (IVAL(blob.data, NBT_HDR_SIZE) != SMB_MAGIC) {
- DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n",
- blob.length));
+ DEBUG(2,("Non-SMB packet of length %ld. Terminating connection\n",
+ (long)blob.length));
smbsrv_terminate_connection(smb_conn, "Non-SMB packet");
return NT_STATUS_OK;
}
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index 87b480ee64..9afa10463f 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -192,7 +192,7 @@ NTSTATUS smbsrv_recv_smb2_request(void *private, DATA_BLOB blob)
}
if (blob.length < (NBT_HDR_SIZE + SMB2_MIN_SIZE)) {
- DEBUG(2,("Invalid SMB2 packet length count %d\n", blob.length));
+ DEBUG(2,("Invalid SMB2 packet length count %ld\n", (long)blob.length));
smbsrv_terminate_connection(smb_conn, "Invalid SMB2 packet");
return NT_STATUS_OK;
}
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 0674d55574..7cf2c390c4 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -359,7 +359,7 @@ static BOOL torture_pac_saved_check(void)
pac_file = lp_parm_string(-1,"torture","pac_file");
if (pac_file) {
tmp_blob.data = (uint8_t *)file_load(pac_file, &tmp_blob.length, mem_ctx);
- printf("(saved test) Loaded pac of size %d from %s\n", tmp_blob.length, pac_file);
+ printf("(saved test) Loaded pac of size %ld from %s\n", (long)tmp_blob.length, pac_file);
} else {
tmp_blob = data_blob_talloc(mem_ctx, saved_pac, sizeof(saved_pac));
}
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 84d6c39b63..8daba2438b 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -351,8 +351,8 @@ static void test_analyse_objects(struct DsSyncTest *ctx,
DEBUG(0,("DN: %s\n", dn));
dn_printed = True;
}
- DEBUGADD(0,("ATTR: %s data_blob.length=%u\n",
- name, data->length));
+ DEBUGADD(0,("ATTR: %s data_blob.length=%lu\n",
+ name, (long)data->length));
dump_data(0,data->data, data->length);
}
}
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index ad29d96b71..7f77844459 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -1292,7 +1292,7 @@ static BOOL test_DatabaseDeltas(struct samsync_state *samsync_state, TALLOC_CTX
printf("Testing DatabaseDeltas of id %d at %llu\n",
- r.in.database_id, r.in.sequence_num);
+ r.in.database_id, (long long)r.in.sequence_num);
do {
loop_ctx = talloc_named(mem_ctx, 0, "test_DatabaseDeltas loop context");
diff --git a/source4/winbind/wb_samba3_protocol.c b/source4/winbind/wb_samba3_protocol.c
index 479920bf97..d335e1f74d 100644
--- a/source4/winbind/wb_samba3_protocol.c
+++ b/source4/winbind/wb_samba3_protocol.c
@@ -40,9 +40,9 @@ NTSTATUS wbsrv_samba3_pull_request(DATA_BLOB blob, TALLOC_CTX *mem_ctx,
struct wbsrv_samba3_call *s3_call;
if (blob.length != sizeof(s3_call->request)) {
- DEBUG(0,("wbsrv_samba3_pull_request: invalid blob length %u should be %u\n"
+ DEBUG(0,("wbsrv_samba3_pull_request: invalid blob length %lu should be %lu\n"
" make sure you use the correct winbind client tools!\n",
- blob.length, sizeof(s3_call->request)));
+ (long)blob.length, (long)sizeof(s3_call->request)));
return NT_STATUS_INVALID_PARAMETER;
}