s3-spoolss: fix rpcclient after setprinter IDL fixes.

[kai/samba-autobuild/.git] / source3 / rpcclient / cmd_samr.c

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 83cec723181363498a63375b4172b27fd57357ef..e21a57fba7a3137cf9693d7bbda265d25862fd29 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_samr.h"
 
 extern DOM_SID domain_sid;
 
@@ -786,21 +787,28 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli,
 {
        struct policy_handle connect_pol, domain_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32 start_idx, size, num_dom_users, i;
+       uint32 start_idx, num_dom_users, i;
        struct samr_SamArray *dom_users = NULL;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        uint32 acb_mask = ACB_NORMAL;
+       uint32_t size = 0xffff;
 
-       if ((argc < 1) || (argc > 3)) {
-               printf("Usage: %s [access_mask] [acb_mask]\n", argv[0]);
+       if ((argc < 1) || (argc > 4)) {
+               printf("Usage: %s [access_mask] [acb_mask] [size]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       if (argc > 1)
+       if (argc > 1) {
                sscanf(argv[1], "%x", &access_mask);
+       }
 
-       if (argc > 2)
+       if (argc > 2) {
                sscanf(argv[2], "%x", &acb_mask);
+       }
+
+       if (argc > 3) {
+               sscanf(argv[3], "%x", &size);
+       }
 
        /* Get sam policy handle */
 
@@ -813,19 +821,17 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_OpenDomain(cli, mem_ctx,
-                                       &connect_pol,
-                                       access_mask,
-                                       &domain_sid,
-                                       &domain_pol);
-
+       result = get_domain_handle(cli, mem_ctx, "domain",
+                                  &connect_pol,
+                                  access_mask,
+                                  &domain_sid,
+                                  &domain_pol);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
        /* Enumerate domain users */
 
        start_idx = 0;
-       size = 0xffff;
 
        do {
                result = rpccli_samr_EnumDomainUsers(cli, mem_ctx,
@@ -865,17 +871,23 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli,
 {
        struct policy_handle connect_pol, domain_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32 start_idx, size, num_dom_groups, i;
+       uint32 start_idx, num_dom_groups, i;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        struct samr_SamArray *dom_groups = NULL;
+       uint32_t size = 0xffff;
 
-       if ((argc < 1) || (argc > 2)) {
-               printf("Usage: %s [access_mask]\n", argv[0]);
+       if ((argc < 1) || (argc > 3)) {
+               printf("Usage: %s [access_mask] [max_size]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       if (argc > 1)
+       if (argc > 1) {
                sscanf(argv[1], "%x", &access_mask);
+       }
+
+       if (argc > 2) {
+               sscanf(argv[2], "%x", &size);
+       }
 
        /* Get sam policy handle */
 
@@ -888,19 +900,17 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_OpenDomain(cli, mem_ctx,
-                                       &connect_pol,
-                                       access_mask,
-                                       &domain_sid,
-                                       &domain_pol);
-
+       result = get_domain_handle(cli, mem_ctx, "domain",
+                                  &connect_pol,
+                                  access_mask,
+                                  &domain_sid,
+                                  &domain_pol);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
        /* Enumerate domain groups */
 
        start_idx = 0;
-       size = 0xffff;
 
        do {
                result = rpccli_samr_EnumDomainGroups(cli, mem_ctx,
@@ -938,17 +948,23 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli,
 {
        struct policy_handle connect_pol, domain_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32 start_idx, size, num_als_groups, i;
+       uint32 start_idx, num_als_groups, i;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        struct samr_SamArray *als_groups = NULL;
+       uint32_t size = 0xffff;
 
-       if ((argc < 2) || (argc > 3)) {
-               printf("Usage: %s builtin|domain [access mask]\n", argv[0]);
+       if ((argc < 2) || (argc > 4)) {
+               printf("Usage: %s builtin|domain [access mask] [max_size]\n", argv[0]);
                return NT_STATUS_OK;
        }
 
-       if (argc > 2)
+       if (argc > 2) {
                sscanf(argv[2], "%x", &access_mask);
+       }
+
+       if (argc > 3) {
+               sscanf(argv[3], "%x", &size);
+       }
 
        /* Get sam policy handle */
 
@@ -973,7 +989,6 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli,
        /* Enumerate alias groups */
 
        start_idx = 0;
-       size = 0xffff;          /* Number of groups to retrieve */
 
        do {
                result = rpccli_samr_EnumDomainAliases(cli, mem_ctx,
@@ -2524,7 +2539,7 @@ static NTSTATUS cmd_samr_chgpasswd3(struct rpc_pipe_client *cli,
        const char *user, *oldpass, *newpass;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        struct samr_DomInfo1 *info = NULL;
-       struct samr_ChangeReject *reject = NULL;
+       struct userPwdChangeFailureInformation *reject = NULL;
 
        if (argc < 3) {
                printf("Usage: %s username oldpass newpass\n", argv[0]);
@@ -2567,22 +2582,19 @@ static NTSTATUS cmd_samr_chgpasswd3(struct rpc_pipe_client *cli,
 
                display_sam_dom_info_1(info);
 
-               switch (reject->reason) {
-                       case SAMR_REJECT_TOO_SHORT:
-                               d_printf("SAMR_REJECT_TOO_SHORT\n");
-                               break;
-                       case SAMR_REJECT_IN_HISTORY:
-                               d_printf("SAMR_REJECT_IN_HISTORY\n");
+               switch (reject->extendedFailureReason) {
+                       case SAM_PWD_CHANGE_PASSWORD_TOO_SHORT:
+                               d_printf("SAM_PWD_CHANGE_PASSWORD_TOO_SHORT\n");
                                break;
-                       case SAMR_REJECT_COMPLEXITY:
-                               d_printf("SAMR_REJECT_COMPLEXITY\n");
+                       case SAM_PWD_CHANGE_PWD_IN_HISTORY:
+                               d_printf("SAM_PWD_CHANGE_PWD_IN_HISTORY\n");
                                break;
-                       case SAMR_REJECT_OTHER:
-                               d_printf("SAMR_REJECT_OTHER\n");
+                       case SAM_PWD_CHANGE_NOT_COMPLEX:
+                               d_printf("SAM_PWD_CHANGE_NOT_COMPLEX\n");
                                break;
                        default:
                                d_printf("unknown reject reason: %d\n",
-                                       reject->reason);
+                                       reject->extendedFailureReason);
                                break;
                }
        }
@@ -2860,7 +2872,7 @@ static NTSTATUS cmd_samr_get_dispinfo_idx(struct rpc_pipe_client *cli,
        }
 
        status = rpccli_try_samr_connects(cli, mem_ctx,
-                                         SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                         SEC_FLAG_MAXIMUM_ALLOWED,
                                          &connect_handle);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -2869,7 +2881,7 @@ static NTSTATUS cmd_samr_get_dispinfo_idx(struct rpc_pipe_client *cli,
 
        status = rpccli_samr_OpenDomain(cli, mem_ctx,
                                        &connect_handle,
-                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       SEC_FLAG_MAXIMUM_ALLOWED,
                                        &domain_sid,
                                        &domain_handle);