git.samba.org / jra / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e7553ab)
Move rpccli_try_samr_connects out of rpcclient.
authorGünther Deschner <gd@samba.org>
Thu, 3 Apr 2008 23:40:29 +0000 (01:40 +0200)
committerGünther Deschner <gd@samba.org>
Thu, 3 Apr 2008 23:40:29 +0000 (01:40 +0200)
Guenther
(This used to be commit f550cdb6f240830ee1e3a2dfe5f4128bca0cf836)

source3/rpc_client/cli_samr.c patch | blob | history
source3/rpcclient/cmd_samr.c patch | blob | history

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index f0763cce1fec2d4f89ca2e545b36c2afcd27077d..fd4fbfc9f41e87977b2c90c2b33b704e2538380f 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -225,3 +225,47 @@ void get_query_dispinfo_params(int loop_count, uint32 *max_entries,
                break;
        }
 }
+
+NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli,
+                                 TALLOC_CTX *mem_ctx,
+                                 uint32_t access_mask,
+                                 POLICY_HND *connect_pol)
+{
+       NTSTATUS status;
+       union samr_ConnectInfo info_in, info_out;
+       struct samr_ConnectInfo1 info1;
+       uint32_t lvl_out = 0;
+
+       ZERO_STRUCT(info1);
+
+       info1.client_version = SAMR_CONNECT_W2K;
+       info_in.info1 = info1;
+
+       status = rpccli_samr_Connect5(cli, mem_ctx,
+                                     cli->cli->srv_name_slash,
+                                     access_mask,
+                                     1,
+                                     &info_in,
+                                     &lvl_out,
+                                     &info_out,
+                                     connect_pol);
+       if (NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = rpccli_samr_Connect4(cli, mem_ctx,
+                                     cli->cli->srv_name_slash,
+                                     SAMR_CONNECT_W2K,
+                                     access_mask,
+                                     connect_pol);
+       if (NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       status = rpccli_samr_Connect2(cli, mem_ctx,
+                                     cli->cli->srv_name_slash,
+                                     access_mask,
+                                     connect_pol);
+       return status;
+}
+
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 9cc47d121aae615d37e93fb19bb3e4a3d757af6b..a003a2e640a60e8d19201edbc387690397db28a0 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -264,28 +264,6 @@ static void display_sam_info_5(struct samr_DispEntryAscii *r)
        printf("Account: %s\n", r->account_name.string);
 }
 
-/****************************************************************************
- Try samr_connect4 first, then samr_connect2 if it fails
- ****************************************************************************/
-static NTSTATUS try_samr_connects(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                 uint32 access_mask, POLICY_HND *connect_pol)
-{
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       result = rpccli_samr_Connect4(cli, mem_ctx,
-                                     cli->cli->desthost,
-                                     SAMR_CONNECT_W2K,
-                                     access_mask,
-                                     connect_pol);
-       if (!NT_STATUS_IS_OK(result)) {
-               result = rpccli_samr_Connect2(cli, mem_ctx,
-                                             cli->cli->desthost,
-                                             access_mask,
-                                             connect_pol);
-       }
-       return result;
-}
-
 /**********************************************************************
  * Query user information
  */
@@ -318,8 +296,9 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
        strupper_m(server);
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -508,8 +487,9 @@ static NTSTATUS cmd_samr_query_group(struct rpc_pipe_client *cli,
        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
        strupper_m(server);
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -578,8 +558,9 @@ static NTSTATUS cmd_samr_query_usergroups(struct rpc_pipe_client *cli,
        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
        strupper_m(server);
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -677,8 +658,9 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
        strupper_m(server);
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -747,8 +729,9 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
        strupper_m(server);
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -822,8 +805,9 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -901,8 +885,9 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -978,8 +963,9 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1065,9 +1051,9 @@ static NTSTATUS cmd_samr_enum_domains(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx,
-                                  access_mask,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         access_mask,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -1131,8 +1117,9 @@ static NTSTATUS cmd_samr_query_aliasmem(struct rpc_pipe_client *cli,
 
        /* Open SAMR handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1219,9 +1206,9 @@ static NTSTATUS cmd_samr_query_aliasinfo(struct rpc_pipe_client *cli,
 
        /* Open SAMR handle */
 
-       result = try_samr_connects(cli, mem_ctx,
-                                  SEC_FLAG_MAXIMUM_ALLOWED,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         SEC_FLAG_MAXIMUM_ALLOWED,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -1317,8 +1304,9 @@ static NTSTATUS cmd_samr_delete_alias(struct rpc_pipe_client *cli,
 
        /* Open SAMR handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1428,8 +1416,9 @@ static NTSTATUS cmd_samr_query_dispinfo_internal(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1602,8 +1591,9 @@ static NTSTATUS cmd_samr_query_dominfo(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1705,8 +1695,9 @@ static NTSTATUS cmd_samr_create_dom_user(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1780,8 +1771,9 @@ static NTSTATUS cmd_samr_create_dom_group(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1845,8 +1837,9 @@ static NTSTATUS cmd_samr_create_dom_alias(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1909,8 +1902,9 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli,
 
        /* Get sam policy and domain handles */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1991,8 +1985,9 @@ static NTSTATUS cmd_samr_lookup_rids(struct rpc_pipe_client *cli,
 
        /* Get sam policy and domain handles */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2073,8 +2068,9 @@ static NTSTATUS cmd_samr_delete_dom_group(struct rpc_pipe_client *cli,
 
        /* Get sam policy and domain handles */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2153,8 +2149,9 @@ static NTSTATUS cmd_samr_delete_dom_user(struct rpc_pipe_client *cli,
 
        /* Get sam policy and domain handles */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2252,8 +2249,9 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli,
 
        slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
        strupper_m(server);
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2324,8 +2322,9 @@ static NTSTATUS cmd_samr_get_usrdom_pwinfo(struct rpc_pipe_client *cli,
 
        sscanf(argv[1], "%i", &rid);
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -2412,7 +2411,9 @@ static NTSTATUS cmd_samr_lookup_domain(struct rpc_pipe_client *cli,
 
        init_lsa_String(&domain_name, argv[1]);
 
-       result = try_samr_connects(cli, mem_ctx, access_mask, &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         access_mask,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2465,8 +2466,9 @@ static NTSTATUS cmd_samr_chgpasswd2(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2523,8 +2525,9 @@ static NTSTATUS cmd_samr_chgpasswd3(struct rpc_pipe_client *cli,
 
        /* Get sam policy handle */
 
-       result = try_samr_connects(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_try_samr_connects(cli, mem_ctx,
+                                         MAXIMUM_ALLOWED_ACCESS,
+                                         &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
Experimental branches for jra