summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-11-25 18:25:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:06:08 -0500
commit1814aad5617c5fcafb75cc4566618e98f5323554 (patch)
tree58b251fdfbb2cf274d97b941d5578ecf32321f06
parent4dc2599dad6a839c7aa8301c45b0583a2b14a3db (diff)
downloadsamba-1814aad5617c5fcafb75cc4566618e98f5323554.tar.gz
samba-1814aad5617c5fcafb75cc4566618e98f5323554.tar.bz2
samba-1814aad5617c5fcafb75cc4566618e98f5323554.zip
r3962: fix compiler warnings
metze (This used to be commit 3bfb732187211d450db842a7533e4c7e915b6ce4)
-rw-r--r--source4/ldap_server/ldap_rootdse.c2
-rw-r--r--source4/ntvfs/ipc/ipc_rap.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index 5780809c78..2e7c8bb71c 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 = str;
+ currentTime[0].data = (void *)str;
currentTime[0].length = strlen(str);
ATTR_SINGLE_NOVAL(mem_ctx, attrs, currentTime, num_currentTime, "currentTime");
return NT_STATUS_OK;
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index 4fc5e182ca..eeea7e24f7 100644
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -241,12 +241,12 @@ static NTSTATUS _rap_netshareenum(struct smbsrv_request *req,
switch(r.in.level) {
case 0:
NDR_OK(ndr_push_bytes(call->ndr_push_data,
- r.out.info[i].info0.name,
+ (const uint8_t *)r.out.info[i].info0.name,
sizeof(r.out.info[i].info0.name)));
break;
case 1:
NDR_OK(ndr_push_bytes(call->ndr_push_data,
- r.out.info[i].info1.name,
+ (const uint8_t *)r.out.info[i].info1.name,
sizeof(r.out.info[i].info1.name)));
NDR_OK(ndr_push_uint8(call->ndr_push_data,
r.out.info[i].info1.pad));
@@ -324,12 +324,12 @@ static NTSTATUS _rap_netserverenum2(struct smbsrv_request *req,
switch(r.in.level) {
case 0:
NDR_OK(ndr_push_bytes(call->ndr_push_data,
- r.out.info[i].info0.name,
+ (const uint8_t *)r.out.info[i].info0.name,
sizeof(r.out.info[i].info0.name)));
break;
case 1:
NDR_OK(ndr_push_bytes(call->ndr_push_data,
- r.out.info[i].info1.name,
+ (const uint8_t *)r.out.info[i].info1.name,
sizeof(r.out.info[i].info1.name)));
NDR_OK(ndr_push_uint8(call->ndr_push_data,
r.out.info[i].info1.version_major));