r4000: DATA_BLOB.data is uint8_t * not void * :-)

(thanks abartlet for telling me)

metze

diff --git a/source/auth/auth_winbind.c b/source/auth/auth_winbind.c
index 19c76595d38e35857223f0e8fcb6d9323560cb9e..8305bd1644804edde384c9555e2d9f3a741407bd 100644 (file)
--- a/source/auth/auth_winbind.c
+++ b/source/auth/auth_winbind.c
@@ -35,7 +35,7 @@ static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response
                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);

diff --git a/source/ldap_server/ldap_rootdse.c b/source/ldap_server/ldap_rootdse.c
index 2e7c8bb71c2f38d5f68c7172779928b64c724a00..fecb82ec4a59f5e024864741527919ac68e43eac 100644 (file)
--- a/source/ldap_server/ldap_rootdse.c
+++ b/source/ldap_server/ldap_rootdse.c
@@ -134,7 +134,7 @@ static NTSTATUS fill_dynamic_values(void *mem_ctx, struct ldap_attribute *attrs)
                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;

diff --git a/source/libcli/auth/ntlmssp_parse.c b/source/libcli/auth/ntlmssp_parse.c
index 39fe5a87128294ddc94a0f6746932df9bcaa3f72..a713b9896d47e323b80724f586878fb9e70e5099 100644 (file)
--- a/source/libcli/auth/ntlmssp_parse.c
+++ b/source/libcli/auth/ntlmssp_parse.c
@@ -115,7 +115,7 @@ BOOL msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
                        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;

diff --git a/source/rpc_server/dcerpc_server.c b/source/rpc_server/dcerpc_server.c
index 4a9465b9eb5b5bb317c7e3f9bb5140831e78f38e..3d34a7e1c0c1257ed175d5f8af2164100a91370f 100644 (file)
--- a/source/rpc_server/dcerpc_server.c
+++ b/source/rpc_server/dcerpc_server.c
@@ -243,7 +243,7 @@ NTSTATUS dcesrv_generic_session_key(struct dcesrv_connection *p,
                                    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;
 }

diff --git a/source/torture/local/messaging.c b/source/torture/local/messaging.c
index 1bf8de15fe301f36965225461297356d255e5473..9c6f55a6c458c13076d8494037ac75d9b6428485 100644 (file)
--- a/source/torture/local/messaging.c
+++ b/source/torture/local/messaging.c
@@ -91,7 +91,7 @@ static BOOL test_ping_speed(TALLOC_CTX *mem_ctx)
                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);