r3132: - fixed a type conflict found by talloc_array_p()

- use struct idr_context * in ipc code
(This used to be commit c33cdd0d550fcaf78573e73b50ffe530ea6d9b17)

diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index dc50f1671e6ec22b59d3c7421c0de770694f164f..2109fb829e7248aae0e01c435f974145bd09be86 100644 (file)
--- 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 {
    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 {
 
        /* 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;
          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;
 
        ep_description.options[0] = p->pipe_name;
        ep_description.options[1] = NULL;