Remove some dead code in rpcclient.
authorGünther Deschner <gd@samba.org>
Thu, 3 Apr 2008 23:44:16 +0000 (01:44 +0200)
committerGünther Deschner <gd@samba.org>
Thu, 3 Apr 2008 23:44:16 +0000 (01:44 +0200)
Guenther
(This used to be commit c7ae1a9b53ef578cf4dfdf8e05915817c69896b5)

source3/rpcclient/cmd_samr.c

index a003a2e640a60e8d19201edbc387690397db28a0..e58354d0d3f4355a7b2efc54bbd25b04c16a891c 100644 (file)
@@ -276,7 +276,6 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
        uint32 info_level = 21;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        union samr_UserInfo *info = NULL;
-       fstring server;
        uint32 user_rid = 0;
 
        if ((argc < 2) || (argc > 4)) {
@@ -293,9 +292,6 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
                sscanf(argv[3], "%x", &access_mask);
 
 
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
-
        result = rpccli_try_samr_connects(cli, mem_ctx,
                                          MAXIMUM_ALLOWED_ACCESS,
                                          &connect_pol);
@@ -468,7 +464,6 @@ static NTSTATUS cmd_samr_query_group(struct rpc_pipe_client *cli,
        enum samr_GroupInfoEnum info_level = GROUPINFOALL;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        union samr_GroupInfo *group_info = NULL;
-       fstring                 server;
        uint32 group_rid;
 
        if ((argc < 2) || (argc > 4)) {
@@ -484,9 +479,6 @@ static NTSTATUS cmd_samr_query_group(struct rpc_pipe_client *cli,
        if (argc > 3)
                sscanf(argv[3], "%x", &access_mask);
 
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
-
        result = rpccli_try_samr_connects(cli, mem_ctx,
                                          MAXIMUM_ALLOWED_ACCESS,
                                          &connect_pol);
@@ -542,7 +534,6 @@ static NTSTATUS cmd_samr_query_usergroups(struct rpc_pipe_client *cli,
        uint32                  user_rid;
        uint32                  access_mask = MAXIMUM_ALLOWED_ACCESS;
        int                     i;
-       fstring                 server;
        struct samr_RidWithAttributeArray *rid_array = NULL;
 
        if ((argc < 2) || (argc > 3)) {
@@ -555,9 +546,6 @@ static NTSTATUS cmd_samr_query_usergroups(struct rpc_pipe_client *cli,
        if (argc > 2)
                sscanf(argv[2], "%x", &access_mask);
 
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
-
        result = rpccli_try_samr_connects(cli, mem_ctx,
                                          MAXIMUM_ALLOWED_ACCESS,
                                          &connect_pol);
@@ -614,7 +602,6 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
        size_t                     num_sids;
        uint32                  access_mask = MAXIMUM_ALLOWED_ACCESS;
        int                     i;
-       fstring                 server;
        struct lsa_SidArray sid_array;
        struct samr_Ids alias_rids;
 
@@ -655,9 +642,6 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
 
        sid_array.num_sids = num_sids;
 
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
-
        result = rpccli_try_samr_connects(cli, mem_ctx,
                                          MAXIMUM_ALLOWED_ACCESS,
                                          &connect_pol);
@@ -712,7 +696,6 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
        uint32 group_rid;
        uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
        int i;
-       fstring                 server;
        unsigned int old_timeout;
        struct samr_RidTypeArray *rids = NULL;
 
@@ -726,9 +709,6 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
        if (argc > 2)
                sscanf(argv[2], "%x", &access_mask);
 
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
-
        result = rpccli_try_samr_connects(cli, mem_ctx,
                                          MAXIMUM_ALLOWED_ACCESS,
                                          &connect_pol);
@@ -2221,7 +2201,6 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli,
        POLICY_HND connect_pol, domain_pol, user_pol, *pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        uint32 sec_info = DACL_SECURITY_INFORMATION;
-       fstring server;
        uint32 user_rid = 0;
        TALLOC_CTX *ctx = NULL;
        SEC_DESC_BUF *sec_desc_buf=NULL;
@@ -2247,8 +2226,6 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli,
                sec_info = atoi(argv[2]);
        }
 
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
        result = rpccli_try_samr_connects(cli, mem_ctx,
                                          MAXIMUM_ALLOWED_ACCESS,
                                          &connect_pol);