From 2b8abc030b1eca43f7c0c05dc96eebeb6c492030 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 28 Jun 2006 21:30:21 +0000 Subject: r16644: Fix bug #3887 reported by jason@ncac.gwu.edu by converting the lookup_XX functions to correctly return SID_NAME_TYPE enums. Jeremy. (This used to be commit ee2b2d96b60c668e37592c79e86c2fd851e15f69) --- source3/libmsrpc/cac_lsarpc.c | 16 ++++++++-------- source3/libsmb/libsmbclient.c | 4 ++-- source3/nsswitch/winbindd_rpc.c | 4 ++-- source3/python/py_lsa.c | 2 +- source3/rpc_client/cli_lsarpc.c | 14 ++++++++------ source3/rpcclient/cmd_lsarpc.c | 6 +++--- source3/utils/net_rpc.c | 6 +++--- source3/utils/net_rpc_rights.c | 4 ++-- source3/utils/net_util.c | 2 +- source3/utils/netlookup.c | 4 ++-- source3/utils/smbcacls.c | 4 ++-- source3/utils/smbcquotas.c | 4 ++-- 12 files changed, 36 insertions(+), 34 deletions(-) (limited to 'source3') diff --git a/source3/libmsrpc/cac_lsarpc.c b/source3/libmsrpc/cac_lsarpc.c index 72f22de5f2..7b62b4d462 100644 --- a/source3/libmsrpc/cac_lsarpc.c +++ b/source3/libmsrpc/cac_lsarpc.c @@ -144,7 +144,7 @@ int cac_LsaGetNamesFromSids(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct Ls /*buffers for outputs*/ char **domains = NULL; char **names = NULL; - uint32 *types = NULL; + enum SID_NAME_USE *types = NULL; CacSidInfo *sids_out = NULL; DOM_SID *unknown_out = NULL; @@ -267,7 +267,7 @@ int cac_LsaGetSidsFromNames(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct Ls /*buffers for outputs*/ DOM_SID *sids = NULL; - uint32 *types = NULL; + enum SID_NAME_USE *types = NULL; CacSidInfo *sids_out = NULL; char **unknown_out = NULL; @@ -579,7 +579,7 @@ int cac_LsaEnumAccountRights(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct L if(op->in.name && !op->in.sid) { DOM_SID *user_sid = NULL; - uint32 *type; + enum SID_NAME_USE *type; /*lookup the SID*/ hnd->status = rpccli_lsa_lookup_names( pipe_hnd, mem_ctx, op->in.pol, 1, (const char **)&(op->in.name), NULL, &user_sid, &type); @@ -806,7 +806,7 @@ int cac_LsaOpenAccount(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct LsaOpen /*look up the user's SID if we have to*/ if(op->in.name && !op->in.sid) { DOM_SID *user_sid = NULL; - uint32 *type; + enum SID_NAME_USE *type; /*lookup the SID*/ hnd->status = rpccli_lsa_lookup_names( pipe_hnd, mem_ctx, op->in.pol, 1, (const char **)&(op->in.name), NULL, &user_sid, &type); @@ -840,7 +840,7 @@ int cac_LsaAddPrivileges(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct LsaAd struct rpc_pipe_client *pipe_hnd = NULL; DOM_SID *user_sid = NULL; - uint32 *type = NULL; + enum SID_NAME_USE *type = NULL; if(!hnd) { return CAC_FAILURE; @@ -890,7 +890,7 @@ int cac_LsaRemovePrivileges(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct Ls struct rpc_pipe_client *pipe_hnd = NULL; DOM_SID *user_sid = NULL; - uint32 *type = NULL; + enum SID_NAME_USE *type = NULL; if(!hnd) { return CAC_FAILURE; @@ -940,7 +940,7 @@ int cac_LsaClearPrivileges(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct Lsa struct rpc_pipe_client *pipe_hnd = NULL; DOM_SID *user_sid = NULL; - uint32 *type = NULL; + enum SID_NAME_USE *type = NULL; if(!hnd) { return CAC_FAILURE; @@ -990,7 +990,7 @@ int cac_LsaSetPrivileges(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct LsaAd struct rpc_pipe_client *pipe_hnd = NULL; DOM_SID *user_sid = NULL; - uint32 *type = NULL; + enum SID_NAME_USE *type = NULL; if(!hnd) { return CAC_FAILURE; diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 240be50879..ca2624305e 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -3727,7 +3727,7 @@ convert_sid_to_string(struct cli_state *ipc_cli, { char **domains = NULL; char **names = NULL; - uint32 *types = NULL; + enum SID_NAME_USE *types = NULL; struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli); sid_to_string(str, sid); @@ -3763,7 +3763,7 @@ convert_string_to_sid(struct cli_state *ipc_cli, DOM_SID *sid, const char *str) { - uint32 *types = NULL; + enum SID_NAME_USE *types = NULL; DOM_SID *sids = NULL; BOOL result = True; struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli); diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c index 984c5cd841..5473af073d 100644 --- a/source3/nsswitch/winbindd_rpc.c +++ b/source3/nsswitch/winbindd_rpc.c @@ -245,7 +245,7 @@ NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain, { NTSTATUS result; DOM_SID *sids = NULL; - uint32 *types = NULL; + enum SID_NAME_USE *types = NULL; const char *full_name; struct rpc_pipe_client *cli; POLICY_HND lsa_policy; @@ -277,7 +277,7 @@ NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain, /* Return rid and type if lookup successful */ sid_copy(sid, &sids[0]); - *type = (enum SID_NAME_USE)types[0]; + *type = types[0]; return NT_STATUS_OK; } diff --git a/source3/python/py_lsa.c b/source3/python/py_lsa.c index 915223a5bb..711641828d 100644 --- a/source3/python/py_lsa.c +++ b/source3/python/py_lsa.c @@ -147,7 +147,7 @@ static PyObject *lsa_lookup_names(PyObject *self, PyObject *args) const char **names; DOM_SID *sids; TALLOC_CTX *mem_ctx = NULL; - uint32 *name_types; + enum SID_NAME_USE *name_types; if (!PyArg_ParseTuple(args, "O", &py_names)) return NULL; diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index deb97724a0..97d8eb621b 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/rpc_client/cli_lsarpc.c @@ -175,7 +175,9 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *pol, int num_sids, const DOM_SID *sids, - char ***domains, char ***names, uint32 **types) + char ***domains, + char ***names, + enum SID_NAME_USE **types) { prs_struct qbuf, rbuf; LSA_Q_LOOKUP_SIDS q; @@ -231,7 +233,7 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli, goto done; } - if (!((*types) = TALLOC_ARRAY(mem_ctx, uint32, num_sids))) { + if (!((*types) = TALLOC_ARRAY(mem_ctx, enum SID_NAME_USE, num_sids))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_NO_MEMORY; goto done; @@ -252,7 +254,7 @@ NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli, (*names)[i] = talloc_strdup(mem_ctx, name); (*domains)[i] = talloc_strdup(mem_ctx, dom_name); - (*types)[i] = t_names.name[i].sid_name_use; + (*types)[i] = (enum SID_NAME_USE)t_names.name[i].sid_name_use; if (((*names)[i] == NULL) || ((*domains)[i] == NULL)) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); @@ -280,7 +282,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli, const char **names, const char ***dom_names, DOM_SID **sids, - uint32 **types) + enum SID_NAME_USE **types) { prs_struct qbuf, rbuf; LSA_Q_LOOKUP_NAMES q; @@ -327,7 +329,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli, goto done; } - if (!((*types = TALLOC_ARRAY(mem_ctx, uint32, num_names)))) { + if (!((*types = TALLOC_ARRAY(mem_ctx, enum SID_NAME_USE, num_names)))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_NO_MEMORY; goto done; @@ -363,7 +365,7 @@ NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli, sid_append_rid(sid, dom_rid); } - (*types)[i] = t_rids[i].type; + (*types)[i] = (enum SID_NAME_USE)t_rids[i].type; if (dom_names == NULL) { continue; diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c index 97a707c020..3967ed6957 100644 --- a/source3/rpcclient/cmd_lsarpc.c +++ b/source3/rpcclient/cmd_lsarpc.c @@ -31,7 +31,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *cli, DOM_SID *sid, const char *name) { POLICY_HND pol; - uint32 *sid_types; + enum SID_NAME_USE *sid_types; NTSTATUS result; DOM_SID *sids; @@ -223,7 +223,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli, POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; DOM_SID *sids; - uint32 *types; + enum SID_NAME_USE *types; int i; if (argc == 1) { @@ -272,7 +272,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem DOM_SID *sids; char **domains; char **names; - uint32 *types; + enum SID_NAME_USE *types; int i; if (argc == 1) { diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 190992e374..f32348935f 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -2011,7 +2011,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli, enum SID_NAME_USE *type) { DOM_SID *sids = NULL; - uint32 *types = NULL; + enum SID_NAME_USE *types = NULL; struct rpc_pipe_client *pipe_hnd; POLICY_HND lsa_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -2717,7 +2717,7 @@ static NTSTATUS rpc_list_alias_members(struct rpc_pipe_client *pipe_hnd, DOM_SID *alias_sids; char **domains; char **names; - uint32 *types; + enum SID_NAME_USE *types; int i; result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, domain_pol, @@ -4075,7 +4075,7 @@ static NTSTATUS rpc_aliaslist_dump(const DOM_SID *domain_sid, for (i=0; i