svn commit: samba r11968 - in branches/SAMBA_4_0/source: kdc smb_server/smb smb_server/smb2 torture/auth torture/rpc winbind

tpot at samba.org tpot at samba.org
Wed Nov 30 03:20:26 GMT 2005


Author: tpot
Date: 2005-11-30 03:20:25 +0000 (Wed, 30 Nov 2005)
New Revision: 11968

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11968

Log:
More warning fixes.  We're on track to getting to double digits for
the number of warnings generated now.

Modified:
   branches/SAMBA_4_0/source/kdc/kdc.c
   branches/SAMBA_4_0/source/smb_server/smb/receive.c
   branches/SAMBA_4_0/source/smb_server/smb2/receive.c
   branches/SAMBA_4_0/source/torture/auth/pac.c
   branches/SAMBA_4_0/source/torture/rpc/dssync.c
   branches/SAMBA_4_0/source/torture/rpc/samsync.c
   branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c


Changeset:
Modified: branches/SAMBA_4_0/source/kdc/kdc.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/kdc.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/kdc/kdc.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -143,8 +143,8 @@
 	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 @@
 	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); 

Modified: branches/SAMBA_4_0/source/smb_server/smb/receive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/receive.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/smb_server/smb/receive.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -87,15 +87,15 @@
 	}
 
 	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;
 	}

Modified: branches/SAMBA_4_0/source/smb_server/smb2/receive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/receive.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/smb_server/smb2/receive.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -192,7 +192,7 @@
 	}
 
 	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;
 	}

Modified: branches/SAMBA_4_0/source/torture/auth/pac.c
===================================================================
--- branches/SAMBA_4_0/source/torture/auth/pac.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/torture/auth/pac.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -359,7 +359,7 @@
 	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));
 	}

Modified: branches/SAMBA_4_0/source/torture/rpc/dssync.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/dssync.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/torture/rpc/dssync.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -351,8 +351,8 @@
 				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);
 		}
 	}

Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -1292,7 +1292,7 @@
 
 
 		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");

Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c	2005-11-30 02:08:15 UTC (rev 11967)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c	2005-11-30 03:20:25 UTC (rev 11968)
@@ -40,9 +40,9 @@
 	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;
 	}
 



More information about the samba-cvs mailing list