summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-22 06:53:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:02:24 -0500
commit6e8867bff5ac95a7f509e3fdc60183cc64d921eb (patch)
tree864324cc617bef5a0dd2519f425644c21a70f5cf
parent651f3903f0a380a951bfe5bf80322f1ab2330705 (diff)
downloadsamba-6e8867bff5ac95a7f509e3fdc60183cc64d921eb.tar.gz
samba-6e8867bff5ac95a7f509e3fdc60183cc64d921eb.tar.bz2
samba-6e8867bff5ac95a7f509e3fdc60183cc64d921eb.zip
r3132: - fixed a type conflict found by talloc_array_p()
- use struct idr_context * in ipc code (This used to be commit c33cdd0d550fcaf78573e73b50ffe530ea6d9b17)
-rw-r--r--source4/ntvfs/ipc/vfs_ipc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index dc50f1671e..2109fb829e 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -31,7 +31,7 @@
ipc$ connection. It needs to keep information about all open
pipes */
struct ipc_private {
- void *idtree_fnum;
+ struct idr_context *idtree_fnum;
/* a list of open pipes */
struct pipe_state {
@@ -212,7 +212,7 @@ static NTSTATUS ipc_open_generic(struct ntvfs_module_context *ntvfs,
finalised for Samba4
*/
ep_description.transport = NCACN_NP;
- ep_description.options = talloc_array_p(req, char *, 2);
+ ep_description.options = talloc_array_p(req, const char *, 2);
ep_description.options[0] = p->pipe_name;
ep_description.options[1] = NULL;