svn commit: samba r4000 - in branches/SAMBA_4_0/source: auth ldap_server libcli/auth rpc_server torture/local

[metze at samba.org]

Author: metze
Date: 2004-11-29 12:01:46 +0000 (Mon, 29 Nov 2004)
New Revision: 4000

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

Log:
DATA_BLOB.data is uint8_t * not void * :-)
(thanks abartlet for telling me)

metze

Modified:
   branches/SAMBA_4_0/source/auth/auth_winbind.c
   branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c
   branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
   branches/SAMBA_4_0/source/torture/local/messaging.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_winbind.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_winbind.c	2004-11-29 11:13:56 UTC (rev 3999)
+++ branches/SAMBA_4_0/source/auth/auth_winbind.c	2004-11-29 12:01:46 UTC (rev 4000)
@@ -35,7 +35,7 @@
 		NTSTATUS status;
 		DATA_BLOB blob;
 		blob.length = len - 4;
-		blob.data = (void *)(((char *)response->extra_data) + 4);
+		blob.data = (uint8_t *)(((char *)response->extra_data) + 4);
 		
 		status = ndr_pull_struct_blob(&blob, mem_ctx, info3,
 					      (ndr_pull_flags_fn_t)ndr_pull_netr_SamInfo3);

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c	2004-11-29 11:13:56 UTC (rev 3999)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c	2004-11-29 12:01:46 UTC (rev 4000)
@@ -134,7 +134,7 @@
 		DATA_BLOB *currentTime = talloc_array_p(mem_ctx, DATA_BLOB, num_currentTime);
 		char *str = ldap_timestring(mem_ctx, time(NULL));
 		ALLOC_CHECK(str);
-		currentTime[0].data = (void *)str;
+		currentTime[0].data = (uint8_t *)str;
 		currentTime[0].length = strlen(str);
 		ATTR_SINGLE_NOVAL(mem_ctx, attrs, currentTime, num_currentTime, "currentTime");
 		return NT_STATUS_OK;

Modified: branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c	2004-11-29 11:13:56 UTC (rev 3999)
+++ branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c	2004-11-29 12:01:46 UTC (rev 4000)
@@ -115,7 +115,7 @@
 			break;
 		case 'C':
 			s = va_arg(ap, char *);
-			pointers[i].data = (void *)s;
+			pointers[i].data = (uint8_t *)s;
 			pointers[i].length = strlen(s)+1;
 			head_size += pointers[i].length;
 			break;

Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c	2004-11-29 11:13:56 UTC (rev 3999)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c	2004-11-29 12:01:46 UTC (rev 4000)
@@ -243,7 +243,7 @@
 				    DATA_BLOB *session_key)
 {
 	/* this took quite a few CPU cycles to find ... */
-	session_key->data = discard_const_p(void, "SystemLibraryDTC");
+	session_key->data = discard_const_p(uint8_t, "SystemLibraryDTC");
 	session_key->length = 16;
 	return NT_STATUS_OK;
 }

Modified: branches/SAMBA_4_0/source/torture/local/messaging.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/messaging.c	2004-11-29 11:13:56 UTC (rev 3999)
+++ branches/SAMBA_4_0/source/torture/local/messaging.c	2004-11-29 12:01:46 UTC (rev 4000)
@@ -91,7 +91,7 @@
 		DATA_BLOB data;
 		NTSTATUS status1, status2;
 
-		data.data = discard_const_p(void, "testing");
+		data.data = discard_const_p(uint8_t, "testing");
 		data.length = strlen((const char *)data.data);
 
 		status1 = messaging_send(msg_ctx, 1, MY_PING, &data);