[GLUE] Rsync SAMBA_3_0 SVN r25598 in order to create the v3-0-test branch.

[gd/samba/.git] / source / rpcclient / cmd_lsarpc.c

diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index ebde4b873f8c38f3e489ab7e5bc350e0dd3360d6..a130def4f577aee12eb881d5017a68d3071aad3b 100644 (file)
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -47,11 +47,11 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, NULL, 1, &sids, &sid_types);
+       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, NULL, &sids, &sid_types);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
 
        *sid = sids[0];
 
@@ -208,7 +208,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
 
        display_lsa_query_info(&dom, mem_ctx);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
 
  done:
        return result;
@@ -239,7 +239,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
                goto done;
 
        result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, 
-                                     (const char**)(argv + 1), NULL, 1, &sids, &types);
+                                     (const char**)(argv + 1), NULL, &sids, &types);
 
        if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
            NT_STATUS_V(STATUS_SOME_UNMAPPED))
@@ -256,63 +256,12 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
                       sid_type_lookup(types[i]), types[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
 
  done:
        return result;
 }
 
-/* Resolve a list of names to a list of sids */
-
-static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli, 
-                                          TALLOC_CTX *mem_ctx, int argc, 
-                                          const char **argv)
-{
-       POLICY_HND pol;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       DOM_SID *sids;
-       enum lsa_SidType *types;
-       int i, level;
-
-       if (argc < 3) {
-               printf("Usage: %s [level] [name1 [name2 [...]]]\n", argv[0]);
-               return NT_STATUS_OK;
-       }
-
-       result = rpccli_lsa_open_policy(cli, mem_ctx, True, 
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                    &pol);
-
-       if (!NT_STATUS_IS_OK(result))
-               goto done;
-
-       level = atoi(argv[1]);
-
-       result = rpccli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 2, 
-                                     (const char**)(argv + 2), NULL, level, &sids, &types);
-
-       if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != 
-           NT_STATUS_V(STATUS_SOME_UNMAPPED))
-               goto done;
-
-       result = NT_STATUS_OK;
-
-       /* Print results */
-
-       for (i = 0; i < (argc - 2); i++) {
-               fstring sid_str;
-               sid_to_string(sid_str, &sids[i]);
-               printf("%s %s (%s: %d)\n", argv[i + 2], sid_str,
-                      sid_type_lookup(types[i]), types[i]);
-       }
-
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
-
- done:
-       return result;
-}
-
-
 /* Resolve a list of SIDs to a list of names */
 
 static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
@@ -375,7 +324,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
                       names[i] ? names[i] : "*unknown*", types[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
 
  done:
        return result;
@@ -438,7 +387,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
                }
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -492,7 +441,7 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
                       privs_high[i], privs_low[i], privs_high[i], privs_low[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -531,7 +480,7 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
        /* Print results */
        printf("%s -> %s (language: 0x%x)\n", argv[1], description, lang_id_desc);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -585,7 +534,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
                printf("%s\n", sid_str);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -627,7 +576,7 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
        printf("Account for SID %s successfully created\n\n", argv[1]);
        result = NT_STATUS_OK;
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -683,7 +632,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
                printf("%u\t%u\t%u\n", set[i].luid.high, set[i].luid.low, set[i].attr);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -731,7 +680,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                printf("\t%s\n", rights[i]);
        }
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -770,7 +719,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -809,7 +758,7 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
 
  done:
        return result;
@@ -847,7 +796,7 @@ static NTSTATUS cmd_lsa_lookup_priv_value(struct rpc_pipe_client *cli,
 
        printf("%u:%u (0x%x:0x%x)\n", luid.high, luid.low, luid.high, luid.low);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -885,9 +834,9 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
 
        /* Print results */
 
-       display_sec_desc(sdb->sd);
+       display_sec_desc(sdb->sec);
 
-       rpccli_lsa_Close(cli, mem_ctx, &pol);
+       rpccli_lsa_close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -995,7 +944,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
 
  done:
        if (&pol)
-               rpccli_lsa_Close(cli, mem_ctx, &pol);
+               rpccli_lsa_close(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -1033,7 +982,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
 
  done:
        if (&pol)
-               rpccli_lsa_Close(cli, mem_ctx, &pol);
+               rpccli_lsa_close(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -1082,7 +1031,7 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
 
  done:
        if (&pol)
-               rpccli_lsa_Close(cli, mem_ctx, &pol);
+               rpccli_lsa_close(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -1098,7 +1047,6 @@ struct cmd_set lsarpc_commands[] = {
        { "lsaquery",            RPC_RTYPE_NTSTATUS, cmd_lsa_query_info_policy,  NULL, PI_LSARPC, NULL, "Query info policy",                    "" },
        { "lookupsids",          RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_sids,        NULL, PI_LSARPC, NULL, "Convert SIDs to names",                "" },
        { "lookupnames",         RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names,       NULL, PI_LSARPC, NULL, "Convert names to SIDs",                "" },
-       { "lookupnames_level",   RPC_RTYPE_NTSTATUS, cmd_lsa_lookup_names_level, NULL, PI_LSARPC, NULL, "Convert names to SIDs",                "" },
        { "enumtrust",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_trust_dom,     NULL, PI_LSARPC, NULL, "Enumerate trusted domains",            "Usage: [preferred max number] [enum context (0)]" },
        { "enumprivs",           RPC_RTYPE_NTSTATUS, cmd_lsa_enum_privilege,     NULL, PI_LSARPC, NULL, "Enumerate privileges",                 "" },
        { "getdispname",         RPC_RTYPE_NTSTATUS, cmd_lsa_get_dispname,       NULL, PI_LSARPC, NULL, "Get the privilege name",               "" },