wbclient: "ev" is no longer used in wbc_sids_to_xids

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

diff --git a/source4/auth/unix_token.c b/source4/auth/unix_token.c
index efc9a9db4a67ff7ee10d40ae64b86678f542793e..385109b96efcfbad8f58c35768ba7fc63c829199 100644 (file)
--- a/source4/auth/unix_token.c
+++ b/source4/auth/unix_token.c
@@ -55,7 +55,7 @@ NTSTATUS security_token_to_unix_token(TALLOC_CTX *mem_ctx,
                ids[s].status = ID_UNKNOWN;
        }
 
-       status = wbc_sids_to_xids(ev, ids, token->num_sids);
+       status = wbc_sids_to_xids(ids, token->num_sids);
        NT_STATUS_NOT_OK_RETURN(status);
 
        g = token->num_sids;

diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c
index f306556ff40ad8168492327a9551d24fb45f8f64..1ff35c8eba5a305cd410d7b9b8e380cb535609a4 100644 (file)
--- a/source4/libcli/wbclient/wbclient.c
+++ b/source4/libcli/wbclient/wbclient.c
@@ -26,8 +26,7 @@
 #include "libcli/security/dom_sid.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
-NTSTATUS wbc_sids_to_xids(struct tevent_context *ev, struct id_map *ids,
-                         uint32_t count)
+NTSTATUS wbc_sids_to_xids(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 fc096cc7c764f33ea47e0dd2404d0d43d364c25b..1300c73ad4ee905ede21ccf2312d3672cbc246c5 100644 (file)
--- a/source4/libcli/wbclient/wbclient.h
+++ b/source4/libcli/wbclient/wbclient.h
@@ -20,8 +20,7 @@
 */
 #include "librpc/gen_ndr/idmap.h"
 
-NTSTATUS wbc_sids_to_xids(struct tevent_context *ev, struct id_map *ids,
-                         uint32_t count);
+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);

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 269b5ecd098a450851872f84ea85a2b13a1667d4..be12ef246f4d9254a7b57a65c1f8b308fb0e0a05 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -330,8 +330,7 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
                }
                if (!dom_sid_equal(sd->owner_sid, new_sd->owner_sid)) {
                        ids->sid = new_sd->owner_sid;
-                       status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx,
-                                                 ids, 1);
+                       status = wbc_sids_to_xids(ids, 1);
                        NT_STATUS_NOT_OK_RETURN(status);
 
                        if (ids->xid.type == ID_TYPE_BOTH ||
@@ -348,8 +347,7 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
                }
                if (!dom_sid_equal(sd->group_sid, new_sd->group_sid)) {
                        ids->sid = new_sd->group_sid;
-                       status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx,
-                                                 ids, 1);
+                       status = wbc_sids_to_xids(ids, 1);
                        NT_STATUS_NOT_OK_RETURN(status);
 
                        if (ids->xid.type == ID_TYPE_BOTH ||

diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c
index dbb43e2bae5bab56e01b0018d6fbcc856c014043..948ddb26905893aaa4bb237f48248bc0a453c273 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl_nfs4.c
+++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c
@@ -155,8 +155,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename
                ids[i].status = ID_UNKNOWN;
        }
 
-       status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx, ids,
-                                 acl.a_count);
+       status = wbc_sids_to_xids(ids, acl.a_count);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(tmp_ctx);
                return status;

diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index 10eda452d3f1e167c38865b9e4c37094833d7f0f..771e4fdede921cbc0e2083961d4e51b84c01888e 100644 (file)
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -40,7 +40,7 @@ static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call,
        ids->sid = &r->in.sid;
        ids->status = ID_UNKNOWN;
        ZERO_STRUCT(ids->xid);
-       status = wbc_sids_to_xids(dce_call->event_ctx, ids, 1);
+       status = wbc_sids_to_xids(ids, 1);
        NT_STATUS_NOT_OK_RETURN(status);
 
        if (ids->xid.type == ID_TYPE_BOTH ||
@@ -99,7 +99,7 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call,
        ids->sid = &r->in.sid;
        ids->status = ID_UNKNOWN;
        ZERO_STRUCT(ids->xid);
-       status = wbc_sids_to_xids(dce_call->event_ctx, ids, 1);
+       status = wbc_sids_to_xids(ids, 1);
        NT_STATUS_NOT_OK_RETURN(status);
 
        if (ids->xid.type == ID_TYPE_BOTH ||