wbclient: "ev" is no longer used in wbc_xids_to_sids

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c
index 1ff35c8eba5a305cd410d7b9b8e380cb535609a4..69d8b439ad9a33f7606d900edb9cf07e86adfe5c 100644 (file)
--- a/source4/libcli/wbclient/wbclient.c
+++ b/source4/libcli/wbclient/wbclient.c
@@ -102,8 +102,7 @@ NTSTATUS wbc_sids_to_xids(struct id_map *ids, uint32_t count)
        return NT_STATUS_OK;
 }
 
-NTSTATUS wbc_xids_to_sids(struct tevent_context *ev, struct id_map *ids,
-                         uint32_t count)
+NTSTATUS wbc_xids_to_sids(struct id_map *ids, uint32_t count)
 {
        TALLOC_CTX *mem_ctx;
        uint32_t i;

diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h
index 1300c73ad4ee905ede21ccf2312d3672cbc246c5..633442863cd98d1033880a860ef490d608e72ea3 100644 (file)
--- a/source4/libcli/wbclient/wbclient.h
+++ b/source4/libcli/wbclient/wbclient.h
@@ -22,5 +22,4 @@
 
 NTSTATUS wbc_sids_to_xids(struct id_map *ids, uint32_t count);
 
-NTSTATUS wbc_xids_to_sids(struct tevent_context *ev, struct id_map *ids,
-                         uint32_t count);
+NTSTATUS wbc_xids_to_sids(struct id_map *ids, uint32_t count);

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index be12ef246f4d9254a7b57a65c1f8b308fb0e0a05..b2987645128e90357b3dff72287672b68d13482e 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -169,7 +169,7 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs,
        ids[1].xid.type = ID_TYPE_GID;
        ids[1].sid = NULL;
 
-       status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, 2);
+       status = wbc_xids_to_sids(ids, 2);
        NT_STATUS_NOT_OK_RETURN(status);
 
        sd->owner_sid = talloc_steal(sd, ids[0].sid);
@@ -995,7 +995,7 @@ NTSTATUS pvfs_acl_inherited_sd(struct pvfs_state *pvfs,
        ids[1].sid = NULL;
        ids[1].status = ID_UNKNOWN;
 
-       status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, 2);
+       status = wbc_xids_to_sids(ids, 2);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(tmp_ctx);
                return status;

diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c
index 948ddb26905893aaa4bb237f48248bc0a453c273..bd00794763df196895e20f4e981501ee4cae93a1 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl_nfs4.c
+++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c
@@ -90,7 +90,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename
 
        /* Allocate memory for the sids from the security descriptor to be on
         * the safe side. */
-       status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, num_ids);
+       status = wbc_xids_to_sids(ids, num_ids);
        NT_STATUS_NOT_OK_RETURN(status);
 
        sd->owner_sid = talloc_steal(sd, ids[0].sid);

diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index 771e4fdede921cbc0e2083961d4e51b84c01888e..848c11fab2f9b5f205bf649ab7e1db5500b15402 100644 (file)
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -77,7 +77,7 @@ static NTSTATUS dcesrv_unixinfo_UidToSid(struct dcesrv_call_state *dce_call,
        ids->xid.id = uid;
        ids->xid.type = ID_TYPE_UID;
 
-       status = wbc_xids_to_sids(dce_call->event_ctx, ids, 1);
+       status = wbc_xids_to_sids(ids, 1);
        NT_STATUS_NOT_OK_RETURN(status);
 
        r->out.sid = ids->sid;
@@ -136,7 +136,7 @@ static NTSTATUS dcesrv_unixinfo_GidToSid(struct dcesrv_call_state *dce_call,
        ids->xid.id = gid;
        ids->xid.type = ID_TYPE_GID;
 
-       status = wbc_xids_to_sids(dce_call->event_ctx, ids, 1);
+       status = wbc_xids_to_sids(ids, 1);
        NT_STATUS_NOT_OK_RETURN(status);
 
        r->out.sid = ids->sid;