The branch, v3-2-test has been updated
via ecc4e5fb3852a9966b5184482d573268d8bd0cd7 (commit)
via 03101f253f140c9bb26eab3c940504f128278495 (commit)
via bd27cdaaf3148e5ec7b40da65dda3524be116a9d (commit)
from 3984581564a44d631b9385c9e7be9751baf641d5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit ecc4e5fb3852a9966b5184482d573268d8bd0cd7
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed Feb 6 20:18:11 2008 +0100
Add cmd_samr_query_aliasinfo command to rpcclient.
Guenther
commit 03101f253f140c9bb26eab3c940504f128278495
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 10:02:17 2008 +0100
Re-run make idl.
Guenther
commit bd27cdaaf3148e5ec7b40da65dda3524be116a9d
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Feb 7 09:59:59 2008 +0100
Fix IDL for samr_QueryAliasInfo().
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_samr.c | 2 +-
source/librpc/gen_ndr/cli_samr.h | 2 +-
source/librpc/gen_ndr/ndr_samr.c | 33 +++++++++--
source/librpc/gen_ndr/samr.h | 2 +-
source/librpc/gen_ndr/srv_samr.c | 2 +-
source/librpc/idl/samr.idl | 2 +-
source/rpcclient/cmd_samr.c | 110 ++++++++++++++++++++++++++++++++++++++
7 files changed, 142 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_samr.c b/source/librpc/gen_ndr/cli_samr.c
index a0441fc..339f02b 100644
--- a/source/librpc/gen_ndr/cli_samr.c
+++ b/source/librpc/gen_ndr/cli_samr.c
@@ -1250,7 +1250,7 @@ NTSTATUS rpccli_samr_QueryAliasInfo(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *alias_handle,
enum samr_AliasInfoEnum level,
- union samr_AliasInfo *info)
+ union samr_AliasInfo **info)
{
struct samr_QueryAliasInfo r;
NTSTATUS status;
diff --git a/source/librpc/gen_ndr/cli_samr.h b/source/librpc/gen_ndr/cli_samr.h
index 52e6b13..9a89578 100644
--- a/source/librpc/gen_ndr/cli_samr.h
+++ b/source/librpc/gen_ndr/cli_samr.h
@@ -159,7 +159,7 @@ NTSTATUS rpccli_samr_QueryAliasInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *alias_handle,
enum samr_AliasInfoEnum level,
- union samr_AliasInfo *info);
+ union samr_AliasInfo **info);
NTSTATUS rpccli_samr_SetAliasInfo(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *alias_handle,
diff --git a/source/librpc/gen_ndr/ndr_samr.c b/source/librpc/gen_ndr/ndr_samr.c
index a7d9a9d..a531515 100644
--- a/source/librpc/gen_ndr/ndr_samr.c
+++ b/source/librpc/gen_ndr/ndr_samr.c
@@ -7944,8 +7944,11 @@ static enum ndr_err_code
ndr_push_samr_QueryAliasInfo(struct ndr_push *ndr, int
if (r->out.info == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info,
r->in.level));
- NDR_CHECK(ndr_push_samr_AliasInfo(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.info));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.info));
+ if (*r->out.info) {
+ NDR_CHECK(ndr_push_set_switch_value(ndr, *r->out.info,
r->in.level));
+ NDR_CHECK(ndr_push_samr_AliasInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+ }
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
return NDR_ERR_SUCCESS;
@@ -7953,8 +7956,10 @@ static enum ndr_err_code
ndr_push_samr_QueryAliasInfo(struct ndr_push *ndr, int
static enum ndr_err_code ndr_pull_samr_QueryAliasInfo(struct ndr_pull *ndr,
int flags, struct samr_QueryAliasInfo *r)
{
+ uint32_t _ptr_info;
TALLOC_CTX *_mem_save_alias_handle_0;
TALLOC_CTX *_mem_save_info_0;
+ TALLOC_CTX *_mem_save_info_1;
if (flags & NDR_IN) {
ZERO_STRUCT(r->out);
@@ -7975,8 +7980,19 @@ static enum ndr_err_code
ndr_pull_samr_QueryAliasInfo(struct ndr_pull *ndr, int
}
_mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.info, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.info,
r->in.level));
- NDR_CHECK(ndr_pull_samr_AliasInfo(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.info));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
+ if (_ptr_info) {
+ NDR_PULL_ALLOC(ndr, *r->out.info);
+ } else {
+ *r->out.info = NULL;
+ }
+ if (*r->out.info) {
+ _mem_save_info_1 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, *r->out.info, 0);
+ NDR_CHECK(ndr_pull_set_switch_value(ndr, *r->out.info,
r->in.level));
+ NDR_CHECK(ndr_pull_samr_AliasInfo(ndr,
NDR_SCALARS|NDR_BUFFERS, *r->out.info));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_1, 0);
+ }
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
}
@@ -8005,8 +8021,13 @@ _PUBLIC_ void ndr_print_samr_QueryAliasInfo(struct
ndr_print *ndr, const char *n
ndr->depth++;
ndr_print_ptr(ndr, "info", r->out.info);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->out.info, r->in.level);
- ndr_print_samr_AliasInfo(ndr, "info", r->out.info);
+ ndr_print_ptr(ndr, "info", *r->out.info);
+ ndr->depth++;
+ if (*r->out.info) {
+ ndr_print_set_switch_value(ndr, *r->out.info,
r->in.level);
+ ndr_print_samr_AliasInfo(ndr, "info", *r->out.info);
+ }
+ ndr->depth--;
ndr->depth--;
ndr_print_NTSTATUS(ndr, "result", r->out.result);
ndr->depth--;
diff --git a/source/librpc/gen_ndr/samr.h b/source/librpc/gen_ndr/samr.h
index d0e758d..64e1733 100644
--- a/source/librpc/gen_ndr/samr.h
+++ b/source/librpc/gen_ndr/samr.h
@@ -1159,7 +1159,7 @@ struct samr_QueryAliasInfo {
} in;
struct {
- union samr_AliasInfo *info;/* [ref,switch_is(level)] */
+ union samr_AliasInfo **info;/* [ref,switch_is(level)] */
NTSTATUS result;
} out;
diff --git a/source/librpc/gen_ndr/srv_samr.c b/source/librpc/gen_ndr/srv_samr.c
index 38cc599..0d7b47c 100644
--- a/source/librpc/gen_ndr/srv_samr.c
+++ b/source/librpc/gen_ndr/srv_samr.c
@@ -2284,7 +2284,7 @@ static bool api_samr_QueryAliasInfo(pipes_struct *p)
}
ZERO_STRUCT(r->out);
- r->out.info = talloc_zero(r, union samr_AliasInfo);
+ r->out.info = talloc_zero(r, union samr_AliasInfo *);
if (r->out.info == NULL) {
talloc_free(r);
return false;
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 46d5e49..113b66c 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -562,7 +562,7 @@ import "misc.idl", "lsa.idl", "security.idl";
NTSTATUS samr_QueryAliasInfo(
[in,ref] policy_handle *alias_handle,
[in] samr_AliasInfoEnum level,
- [out,ref,switch_is(level)] samr_AliasInfo *info
+ [out,ref,switch_is(level)] samr_AliasInfo **info
);
/************************/
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index b8bcd61..3429f92 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -1170,6 +1170,115 @@ static NTSTATUS cmd_samr_query_aliasmem(struct
rpc_pipe_client *cli,
return result;
}
+/* Query alias info */
+
+static NTSTATUS cmd_samr_query_aliasinfo(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, const char **argv)
+{
+ POLICY_HND connect_pol, domain_pol, alias_pol;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32_t alias_rid;
+ uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ union samr_AliasInfo *info = NULL;
+ enum samr_AliasInfoEnum level = ALIASINFOALL;
+
+ if ((argc < 3) || (argc > 4)) {
+ printf("Usage: %s builtin|domain rid [level] [access mask]\n",
+ argv[0]);
+ return NT_STATUS_OK;
+ }
+
+ sscanf(argv[2], "%i", &alias_rid);
+
+ if (argc > 3) {
+ level = atoi(argv[3]);
+ }
+
+ if (argc > 4) {
+ sscanf(argv[4], "%x", &access_mask);
+ }
+
+ /* Open SAMR handle */
+
+ result = try_samr_connects(cli, mem_ctx,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &connect_pol);
+
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
+
+ /* Open handle on domain */
+
+ if (strequal(argv[1], "domain")) {
+
+ result = rpccli_samr_OpenDomain(cli, mem_ctx,
+ &connect_pol,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &domain_sid,
+ &domain_pol);
+
+ } else if (strequal(argv[1], "builtin")) {
+
+ result = rpccli_samr_OpenDomain(cli, mem_ctx,
+ &connect_pol,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ CONST_DISCARD(struct dom_sid2
*, &global_sid_Builtin),
+ &domain_pol);
+
+ } else {
+ return NT_STATUS_OK;
+ }
+
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
+
+ /* Open handle on alias */
+
+ result = rpccli_samr_OpenAlias(cli, mem_ctx,
+ &domain_pol,
+ access_mask,
+ alias_rid,
+ &alias_pol);
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
+
+ result = rpccli_samr_QueryAliasInfo(cli, mem_ctx,
+ &alias_pol,
+ level,
+ &info);
+
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
+
+ switch (level) {
+ case ALIASINFOALL:
+ printf("Name: %s\n", info->all.name.string);
+ printf("Description: %s\n",
info->all.description.string);
+ printf("Num Members: %d\n", info->all.num_members);
+ break;
+ case ALIASINFONAME:
+ printf("Name: %s\n", info->name.string);
+ break;
+ case ALIASINFODESCRIPTION:
+ printf("Description: %s\n", info->description.string);
+ break;
+ default:
+ break;
+ }
+
+ rpccli_samr_Close(cli, mem_ctx, &alias_pol);
+ rpccli_samr_Close(cli, mem_ctx, &domain_pol);
+ rpccli_samr_Close(cli, mem_ctx, &connect_pol);
+ done:
+ return result;
+}
+
+
/* Query delete an alias membership */
static NTSTATUS cmd_samr_delete_alias(struct rpc_pipe_client *cli,
@@ -2387,6 +2496,7 @@ struct cmd_set samr_commands[] = {
{ "queryuseraliases", RPC_RTYPE_NTSTATUS, cmd_samr_query_useraliases,
NULL, PI_SAMR, NULL, "Query user aliases", "" },
{ "querygroupmem", RPC_RTYPE_NTSTATUS, cmd_samr_query_groupmem,
NULL, PI_SAMR, NULL, "Query group membership", "" },
{ "queryaliasmem", RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasmem,
NULL, PI_SAMR, NULL, "Query alias membership", "" },
+ { "queryaliasinfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_aliasinfo,
NULL, PI_SAMR, NULL, "Query alias info", "" },
{ "deletealias", RPC_RTYPE_NTSTATUS, cmd_samr_delete_alias,
NULL, PI_SAMR, NULL, "Delete an alias", "" },
{ "querydispinfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_dispinfo,
NULL, PI_SAMR, NULL, "Query display info", "" },
{ "querydominfo", RPC_RTYPE_NTSTATUS, cmd_samr_query_dominfo,
NULL, PI_SAMR, NULL, "Query domain info", "" },
--
Samba Shared Repository
