diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-11-29 12:01:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:13 -0500 |
| commit | 15543f18acc9040fd3213e826147fe5604bb1ae1 (patch) | |
| tree | cf01bc8014db4d7c6419597b03da587e5b880114 | |
| parent | 114b43a167e8470666125ff0b2ac08c4b5c4f14d (diff) | |
| download | samba-15543f18acc9040fd3213e826147fe5604bb1ae1.tar.gz samba-15543f18acc9040fd3213e826147fe5604bb1ae1.tar.bz2 samba-15543f18acc9040fd3213e826147fe5604bb1ae1.zip | |
r4000: DATA_BLOB.data is uint8_t * not void * :-)
(thanks abartlet for telling me)
metze
(This used to be commit 2783bf393f6310f9d827538329d619dad5b02dd0)
| -rw-r--r-- | source4/auth/auth_winbind.c | 2 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_rootdse.c | 2 | ||||
| -rw-r--r-- | source4/libcli/auth/ntlmssp_parse.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/dcerpc_server.c | 2 | ||||
| -rw-r--r-- | source4/torture/local/messaging.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/auth_winbind.c b/source4/auth/auth_winbind.c index 19c76595d3..8305bd1644 100644 --- a/source4/auth/auth_winbind.c +++ b/source4/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/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c index 2e7c8bb71c..fecb82ec4a 100644 --- a/source4/ldap_server/ldap_rootdse.c +++ b/source4/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/source4/libcli/auth/ntlmssp_parse.c b/source4/libcli/auth/ntlmssp_parse.c index 39fe5a8712..a713b9896d 100644 --- a/source4/libcli/auth/ntlmssp_parse.c +++ b/source4/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/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 4a9465b9eb..3d34a7e1c0 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/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/source4/torture/local/messaging.c b/source4/torture/local/messaging.c index 1bf8de15fe..9c6f55a6c4 100644 --- a/source4/torture/local/messaging.c +++ b/source4/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); |