/**********************************************************************
* Query user information
*/
-static uint32 cmd_samr_query_user(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_samr_query_user(struct cli_state *cli, int argc, char **argv)
{
POLICY_HND connect_pol, domain_pol, user_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
if (argc != 2) {
printf("Usage: %s rid\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
sscanf(argv[1], "%i", &user_rid);
slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (server);
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol)) !=
- NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_connect_pol = True;
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_domain_pol = True;
- if ((result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- user_rid, &user_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ user_rid, &user_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
ZERO_STRUCT(user_ctr);
- if ((result = cli_samr_query_userinfo(cli, mem_ctx, &user_pol,
- info_level, &user_ctr))
- != NT_STATUS_OK) {
+ result = cli_samr_query_userinfo(cli, mem_ctx, &user_pol,
+ info_level, &user_ctr);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/***********************************************************************
* Query group information
*/
-static uint32 cmd_samr_query_group(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_samr_query_group(struct cli_state *cli, int argc, char **argv)
{
POLICY_HND connect_pol, domain_pol, group_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL, info_level = 1;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32 info_level = 1;
BOOL got_connect_pol = False, got_domain_pol = False,
got_group_pol = False;
GROUP_INFO_CTR group_ctr;
if (argc != 2) {
printf("Usage: %s rid\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
group_rid = atoi(argv[1]);
slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (server);
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol)) !=
- NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_connect_pol = True;
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_domain_pol = True;
- if ((result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- group_rid, &group_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ group_rid, &group_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
ZERO_STRUCT(group_ctr);
- if ((result = cli_samr_query_groupinfo(cli, mem_ctx, &group_pol,
- info_level, &group_ctr))
- != NT_STATUS_OK) {
+ result = cli_samr_query_groupinfo(cli, mem_ctx, &group_pol,
+ info_level, &group_ctr);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Query groups a user is a member of */
-static uint32 cmd_samr_query_usergroups(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_samr_query_usergroups(struct cli_state *cli, int argc, char **argv)
{
POLICY_HND connect_pol,
domain_pol,
user_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
BOOL got_connect_pol = False,
got_domain_pol = False,
got_user_pol = False;
if (argc != 2) {
printf("Usage: %s rid\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx=talloc_init()))
{
DEBUG(0,("cmd_samr_query_usergroups: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
sscanf(argv[1], "%i", &user_rid);
slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (server);
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol)) !=
- NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_connect_pol = True;
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_domain_pol = True;
- if ((result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- user_rid, &user_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ user_rid, &user_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_user_pol = True;
- if ((result = cli_samr_query_usergroups(cli, mem_ctx, &user_pol,
- &num_groups, &user_gids))
- != NT_STATUS_OK) {
+ result = cli_samr_query_usergroups(cli, mem_ctx, &user_pol,
+ &num_groups, &user_gids);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Query members of a group */
-static uint32 cmd_samr_query_groupmem(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_samr_query_groupmem(struct cli_state *cli, int argc, char **argv)
{
POLICY_HND connect_pol, domain_pol, group_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
BOOL got_connect_pol = False,
got_domain_pol = False,
got_group_pol = False;
if (argc != 2) {
printf("Usage: %s rid\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx=talloc_init()))
{
DEBUG(0,("cmd_samr_query_groupmem: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
sscanf(argv[1], "%i", &group_rid);
slprintf (server, sizeof(fstring)-1, "\\\\%s", cli->desthost);
strupper (server);
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol)) !=
- NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_connect_pol = True;
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_domain_pol = True;
- if ((result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- group_rid, &group_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ group_rid, &group_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_group_pol = True;
- if ((result = cli_samr_query_groupmem(cli, mem_ctx, &group_pol,
- &num_members, &group_rids,
- &group_attrs))
- != NT_STATUS_OK) {
+ result = cli_samr_query_groupmem(cli, mem_ctx, &group_pol,
+ &num_members, &group_rids,
+ &group_attrs);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Enumerate domain groups */
-static uint32 cmd_samr_enum_dom_groups(struct cli_state *cli, int argc,
+static NTSTATUS cmd_samr_enum_dom_groups(struct cli_state *cli, int argc,
char **argv)
{
POLICY_HND connect_pol, domain_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
BOOL got_connect_pol = False, got_domain_pol = False;
TALLOC_CTX *mem_ctx;
uint32 start_idx, size, num_dom_groups, i;
if (argc != 1) {
printf("Usage: %s\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx = talloc_init())) {
/* Get sam policy handle */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol)) !=
- NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Get domain policy handle */
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Query alias membership */
-static uint32 cmd_samr_query_aliasmem(struct cli_state *cli, int argc,
+static NTSTATUS cmd_samr_query_aliasmem(struct cli_state *cli, int argc,
char **argv)
{
POLICY_HND connect_pol, domain_pol, alias_pol;
BOOL got_connect_pol = False, got_domain_pol = False,
got_alias_pol = False;
TALLOC_CTX *mem_ctx;
- uint32 result = NT_STATUS_UNSUCCESSFUL, alias_rid, num_members, i;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32 alias_rid, num_members, i;
DOM_SID *alias_sids;
if (argc != 2) {
printf("Usage: %s rid\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx=talloc_init())) {
/* Open SAMR handle */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol)) !=
- NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Open handle on domain */
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Open handle on alias */
- if ((result = cli_samr_open_alias(cli, mem_ctx, &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- alias_rid, &alias_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_alias(cli, mem_ctx, &domain_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ alias_rid, &alias_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_alias_pol = True;
- if ((result = cli_samr_query_aliasmem(cli, mem_ctx, &alias_pol,
- &num_members, &alias_sids))
- != NT_STATUS_OK) {
+ result = cli_samr_query_aliasmem(cli, mem_ctx, &alias_pol,
+ &num_members, &alias_sids);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Query display info */
-static uint32 cmd_samr_query_dispinfo(struct cli_state *cli, int argc,
- char **argv)
+static NTSTATUS cmd_samr_query_dispinfo(struct cli_state *cli, int argc,
+ char **argv)
{
POLICY_HND connect_pol, domain_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
BOOL got_connect_pol = False, got_domain_pol = False;
TALLOC_CTX *mem_ctx;
uint32 start_idx, max_entries, num_entries, i;
if (argc != 1) {
printf("Usage: %s\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx = talloc_init())) {
DEBUG(0, ("cmd_samr_query_dispinfo: talloc_init returned "
"NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
fetch_domain_sid(cli);
/* Get sam policy handle */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Get domain policy handle */
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Query domain info */
-static uint32 cmd_samr_query_dominfo(struct cli_state *cli, int argc,
- char **argv)
+static NTSTATUS cmd_samr_query_dominfo(struct cli_state *cli, int argc,
+ char **argv)
{
POLICY_HND connect_pol, domain_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
BOOL got_connect_pol = False, got_domain_pol = False;
TALLOC_CTX *mem_ctx;
uint16 switch_value = 2;
if (argc > 2) {
printf("Usage: %s [infolevel]\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (argc == 2)
/* Get sam policy handle */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Get domain policy handle */
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Query domain info */
- if ((result = cli_samr_query_dom_info(cli, mem_ctx, &domain_pol,
- switch_value, &ctr))
- != NT_STATUS_OK) {
+ result = cli_samr_query_dom_info(cli, mem_ctx, &domain_pol,
+ switch_value, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Create domain user */
-static uint32 cmd_samr_create_dom_user(struct cli_state *cli, int argc,
- char **argv)
+static NTSTATUS cmd_samr_create_dom_user(struct cli_state *cli, int argc,
+ char **argv)
{
POLICY_HND connect_pol, domain_pol, user_pol;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
BOOL got_connect_pol = False, got_domain_pol = False,
got_user_pol = False;
TALLOC_CTX *mem_ctx;
if (argc != 2) {
printf("Usage: %s username\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
acct_name = argv[1];
/* Get sam policy handle */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Get domain policy handle */
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
acb_info = ACB_NORMAL;
unknown = 0xe005000b; /* No idea what this is - a permission mask? */
- if ((result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
- acct_name, acb_info, unknown,
- &user_pol, &user_rid))
- != NT_STATUS_OK) {
+ result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
+ acct_name, acb_info, unknown,
+ &user_pol, &user_rid);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Lookup sam names */
-static uint32 cmd_samr_lookup_names(struct cli_state *cli, int argc,
+static NTSTATUS cmd_samr_lookup_names(struct cli_state *cli, int argc,
char **argv)
{
TALLOC_CTX *mem_ctx;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
POLICY_HND connect_pol, domain_pol;
BOOL got_connect_pol = False, got_domain_pol = False;
uint32 flags = 0x000003e8;
if (argc < 2) {
printf("Usage: %s name1 [name2 [name3] [...]]\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx = talloc_init())) {
/* Get sam policy and domain handles */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_connect_pol = True;
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
for (i = 0; i < argc - 1; i++)
names[i] = argv[i + 1];
- if ((result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
- flags, num_names, names,
- &num_rids, &rids, &name_types))
- != NT_STATUS_OK) {
+ result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
+ flags, num_names, names,
+ &num_rids, &rids, &name_types);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Lookup sam rids */
-static uint32 cmd_samr_lookup_rids(struct cli_state *cli, int argc,
+static NTSTATUS cmd_samr_lookup_rids(struct cli_state *cli, int argc,
char **argv)
{
TALLOC_CTX *mem_ctx;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
POLICY_HND connect_pol, domain_pol;
BOOL got_connect_pol = False, got_domain_pol = False;
uint32 flags = 0x000003e8;
if (argc < 2) {
printf("Usage: %s rid1 [rid2 [rid3] [...]]\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx = talloc_init())) {
/* Get sam policy and domain handles */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
got_connect_pol = True;
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
for (i = 0; i < argc - 1; i++)
rids[i] = atoi(argv[i + 1]);
- if ((result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol,
- flags, num_rids, rids,
- &num_names, &names, &name_types))
- != NT_STATUS_OK) {
+ result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol,
+ flags, num_rids, rids,
+ &num_names, &names, &name_types);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Delete domain user */
-static uint32 cmd_samr_delete_dom_user(struct cli_state *cli, int argc,
+static NTSTATUS cmd_samr_delete_dom_user(struct cli_state *cli, int argc,
char **argv)
{
TALLOC_CTX *mem_ctx;
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
POLICY_HND connect_pol, domain_pol, user_pol;
if (argc != 2) {
printf("Usage: %s username\n", argv[0]);
- return 0;
+ return NT_STATUS_OK;
}
if (!(mem_ctx = talloc_init())) {
/* Get sam policy and domain handles */
- if ((result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
- &connect_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+ &connect_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
- if ((result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- &domain_sid, &domain_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ &domain_sid, &domain_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
uint32 *user_rids, num_rids, *name_types;
uint32 flags = 0x000003e8;
- if ((result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
- flags, 1, &argv[1],
- &num_rids, &user_rids,
- &name_types))
- != NT_STATUS_OK) {
+ result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
+ flags, 1, &argv[1],
+ &num_rids, &user_rids,
+ &name_types);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
- if ((result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- user_rids[0], &user_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
+ MAXIMUM_ALLOWED_ACCESS,
+ user_rids[0], &user_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
}
/* Delete user */
- if ((result = cli_samr_delete_dom_user(cli, mem_ctx, &user_pol))
- != NT_STATUS_OK) {
+ result = cli_samr_delete_dom_user(cli, mem_ctx, &user_pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/**********************************************************************
* dummy function -- placeholder
*/
-static uint32 cmd_spoolss_not_implemented (struct cli_state *cli,
+static NTSTATUS cmd_spoolss_not_implemented (struct cli_state *cli,
int argc, char **argv)
{
printf ("(*) This command is not currently implemented.\n");
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_open_printer_ex(struct cli_state *cli, int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
pstring printername;
fstring servername, user;
POLICY_HND hnd;
result = cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "",
MAXIMUM_ALLOWED_ACCESS, servername, user, &hnd);
- if (result == NT_STATUS_OK) {
+ if (NT_STATUS_IS_OK(result)) {
printf ("Printer %s opened successfully\n", printername);
result = cli_spoolss_close_printer (cli, mem_ctx, &hnd);
- if (result != NT_STATUS_OK) {
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Error closing printer handle! (%s)\n", get_nt_error_msg(result));
}
}
/* Enumerate printers */
-static uint32 cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_printers(struct cli_state *cli, int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL,
- info_level = 1;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32 info_level = 1;
PRINTER_INFO_CTR ctr;
int returned;
uint32 i = 0;
result = cli_spoolss_enum_printers(cli, mem_ctx, PRINTER_ENUM_LOCAL,
info_level, &returned, &ctr);
- if (result == NT_STATUS_OK)
+ if (NT_STATUS_IS_OK(result))
{
if (!returned)
printf ("No Printers printers returned.\n");
/* Enumerate ports */
-static uint32 cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_ports(struct cli_state *cli, int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL,
- info_level = 1;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ uint32 info_level = 1;
PORT_INFO_CTR ctr;
int returned;
TALLOC_CTX *mem_ctx;
result = cli_spoolss_enum_ports(cli, mem_ctx, info_level, &returned, &ctr);
- if (result == NT_STATUS_OK) {
+ if (NT_STATUS_IS_OK(result)) {
int i;
for (i = 0; i < returned; i++) {
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getprinter(struct cli_state *cli, int argc, char **argv)
{
POLICY_HND pol;
- uint32 result,
- info_level = 1;
+ NTSTATUS result;
+ uint32 info_level = 1;
BOOL opened_hnd = False;
PRINTER_INFO_CTR ctr;
fstring printername,
fstrcpy (user, cli->user_name);
/* get a printer handle */
- if ((result = cli_spoolss_open_printer_ex(
+ result = cli_spoolss_open_printer_ex(
cli, mem_ctx, printername, "", MAXIMUM_ALLOWED_ACCESS, servername,
- user, &pol)) != NT_STATUS_OK) {
+ user, &pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
opened_hnd = True;
/* Get printer info */
- if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr))
- != NT_STATUS_OK) {
+ result = cli_spoolss_getprinter(cli, mem_ctx, &pol, info_level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getdriver(struct cli_state *cli, int argc, char **argv)
{
POLICY_HND pol;
- uint32 result,
- info_level = 3;
+ NTSTATUS result;
+ uint32 info_level = 3;
BOOL opened_hnd = False;
PRINTER_DRIVER_CTR ctr;
fstring printername,
info_level = atoi(argv[2]);
/* Open a printer handle */
- if ((result=cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "",
- MAXIMUM_ALLOWED_ACCESS, servername, user, &pol)) != NT_STATUS_OK)
- {
+ result=cli_spoolss_open_printer_ex (cli, mem_ctx, printername, "",
+ MAXIMUM_ALLOWED_ACCESS, servername, user, &pol);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Error opening printer handle for %s!\n", printername);
return result;
}
/* loop through and print driver info level for each architecture */
for (i=0; archi_table[i].long_archi!=NULL; i++)
{
- result = cli_spoolss_getprinterdriver (cli, mem_ctx, &pol, info_level,
- archi_table[i].long_archi, &ctr);
-
- switch (result)
- {
- case NT_STATUS_OK:
- break;
-
- case WERR_UNKNOWN_PRINTER_DRIVER:
- continue;
-
- default:
- printf ("Error getting driver for %s [%s] - %s\n", printername,
- archi_table[i].long_archi, get_nt_error_msg(result));
+ result = cli_spoolss_getprinterdriver(cli, mem_ctx, &pol, info_level,
+ archi_table[i].long_archi, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
continue;
}
printf("unknown info level %d\n", info_level);
break;
}
-
-
}
cli_nt_session_close (cli);
talloc_destroy(mem_ctx);
- if (result==WERR_UNKNOWN_PRINTER_DRIVER)
- return NT_STATUS_OK;
- else
- return result;
+ return result;
}
/***********************************************************************
* Get printer information
*/
-static uint32 cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_enum_drivers(struct cli_state *cli, int argc, char **argv)
{
- uint32 result=0,
- info_level = 1;
+ NTSTATUS result = NT_STATUS_OK;
+ uint32 info_level = 1;
PRINTER_DRIVER_CTR ctr;
fstring servername;
uint32 i, j,
if (!(mem_ctx=talloc_init()))
{
DEBUG(0,("cmd_spoolss_enum_drivers: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
/* Initialise RPC connection */
continue;
- if (result != NT_STATUS_OK)
+ if (!NT_STATUS_IS_OK(result))
{
printf ("Error getting driver for environment [%s] - %s\n",
archi_table[i].long_archi, get_nt_error_msg(result));
cli_nt_session_close (cli);
talloc_destroy(mem_ctx);
- if (result==WERR_UNKNOWN_PRINTER_DRIVER)
- return NT_STATUS_OK;
- else
- return result;
-
+ return result;
}
/****************************************************************************
/***********************************************************************
* Get printer driver directory information
*/
-static uint32 cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_getdriverdir(struct cli_state *cli, int argc, char **argv)
{
- uint32 result;
+ NTSTATUS result;
fstring env;
DRIVER_DIRECTORY_CTR ctr;
TALLOC_CTX *mem_ctx;
fstrcpy (env, "Windows NT x86");
/* Get the directory. Only use Info level 1 */
- if ((result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr))
- != NT_STATUS_OK)
- {
+ result = cli_spoolss_getprinterdriverdir (cli, mem_ctx, 1, env, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
return result;
}
}
-static uint32 cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_addprinterdriver (struct cli_state *cli, int argc, char **argv)
{
- uint32 result,
- level = 3;
+ NTSTATUS result;
+ uint32 level = 3;
PRINTER_DRIVER_CTR ctr;
DRIVER_INFO_3 info3;
fstring arch;
if (!(mem_ctx=talloc_init()))
{
DEBUG(0,("cmd_spoolss_addprinterdriver: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
/* Initialise RPC connection */
ctr.info3 = &info3;
- if ((result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr))
- != NT_STATUS_OK)
- {
+ result = cli_spoolss_addprinterdriver (cli, mem_ctx, level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
return result;
}
}
-static uint32 cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_addprinterex (struct cli_state *cli, int argc, char **argv)
{
- uint32 result,
- level = 2;
+ NTSTATUS result;
+ uint32 level = 2;
PRINTER_INFO_CTR ctr;
PRINTER_INFO_2 info2;
fstring servername;
if (!(mem_ctx=talloc_init()))
{
DEBUG(0,("cmd_spoolss_addprinterex: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
*/
ctr.printers_2 = &info2;
- if ((result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr))
- != NT_STATUS_OK)
- {
+ result = cli_spoolss_addprinterex (cli, mem_ctx, level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
cli_nt_session_close (cli);
return result;
}
}
-static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **argv)
{
POLICY_HND pol;
- uint32 result,
- level = 2;
+ NTSTATUS result;
+ uint32 level = 2;
BOOL opened_hnd = False;
PRINTER_INFO_CTR ctr;
PRINTER_INFO_2 info2;
if (!(mem_ctx=talloc_init()))
{
DEBUG(0,("cmd_spoolss_setdriver: talloc_init returned NULL!\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ return NT_STATUS_NO_MEMORY;
}
slprintf (servername, sizeof(fstring)-1, "\\\\%s", cli->desthost);
/* get a printer handle */
- if ((result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
- MAXIMUM_ALLOWED_ACCESS, servername, user, &pol))
- != NT_STATUS_OK)
- {
+ result = cli_spoolss_open_printer_ex(cli, mem_ctx, printername, "",
+ MAXIMUM_ALLOWED_ACCESS, servername, user, &pol);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
/* Get printer info */
ZERO_STRUCT (info2);
ctr.printers_2 = &info2;
- if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr)) != NT_STATUS_OK)
- {
+ result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Unable to retrieve printer information!\n");
goto done;
}
/* set the printer driver */
init_unistr(&ctr.printers_2->drivername, argv[2]);
- if ((result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0)) != NT_STATUS_OK)
- {
+ result = cli_spoolss_setprinter(cli, mem_ctx, &pol, level, &ctr, 0);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("SetPrinter call failed!\n");
goto done;;
}
}
-static uint32 cmd_spoolss_deletedriver (struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_spoolss_deletedriver (struct cli_state *cli, int argc, char **argv)
{
- uint32 result = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
fstring servername;
TALLOC_CTX *mem_ctx = NULL;
int i;
for (i=0; archi_table[i].long_archi; i++)
{
/* make the call to remove the driver */
- if ((result = cli_spoolss_deleteprinterdriver(cli, mem_ctx,
- archi_table[i].long_archi, argv[1])) != NT_STATUS_OK)
- {
+ result = cli_spoolss_deleteprinterdriver(cli, mem_ctx,
+ archi_table[i].long_archi, argv[1]);
+ if (!NT_STATUS_IS_OK(result)) {
printf ("Failed to remove driver %s for arch [%s] - error %s!\n",
argv[1], archi_table[i].long_archi, get_nt_error_msg(result));
}