s3-lib Replace StrCaseCmp() with strcasecmp_m()

[ira/wip.git] / source3 / utils / net_rpc.c

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e0da66671acb756276e8ad0b6735933b508d6e59..2c35ae974b3fcca7b4f11995ae73bd6922cd9f22 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -39,8 +39,10 @@
 #include "lib/netapi/netapi_net.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
+#include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "passdb.h"
 
 static int net_mode_share;
 static NTSTATUS sync_files(struct copy_clistate *cp_clistate, const char *mask);
@@ -548,7 +550,7 @@ NTSTATUS rpc_info_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1621,7 +1623,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
         if (!NT_STATUS_IS_OK(status)) {
@@ -2583,7 +2585,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2709,7 +2711,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                       discard_const_p(struct dom_sid2, &global_sid_Builtin),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -3031,7 +3033,7 @@ static NTSTATUS rpc_group_members_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -3729,7 +3731,7 @@ static NTSTATUS copy_fn(const char *mnt, struct file_info *f,
        DEBUG(3,("got mask: %s, name: %s\n", mask, f->name));
 
        /* DIRECTORY */
-       if (f->mode & aDIR) {
+       if (f->mode & FILE_ATTRIBUTE_DIRECTORY) {
 
                DEBUG(3,("got dir: %s\n", f->name));
 
@@ -3762,8 +3764,8 @@ static NTSTATUS copy_fn(const char *mnt, struct file_info *f,
                }
 
                /* search below that directory */
-               fstrcpy(new_mask, dir);
-               fstrcat(new_mask, "\\*");
+               strlcpy(new_mask, dir, sizeof(new_mask));
+               strlcat(new_mask, "\\*", sizeof(new_mask));
 
                old_dir = local_state->cwd;
                local_state->cwd = dir;
@@ -3967,7 +3969,7 @@ static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
                cp_clistate.cli_share_src = NULL;
                cp_clistate.cli_share_dst = NULL;
                cp_clistate.cwd = NULL;
-               cp_clistate.attribute = aSYSTEM | aHIDDEN | aDIR;
+               cp_clistate.attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY;
                cp_clistate.c = c;
 
                /* open share source */
@@ -4317,7 +4319,7 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -4801,7 +4803,7 @@ static bool get_user_tokens_from_file(FILE *f,
 
                token = &((*tokens)[*num_tokens-1]);
 
-               fstrcpy(token->name, line);
+               strlcpy(token->name, line, sizeof(token->name));
                token->token.num_sids = 0;
                token->token.sids = NULL;
                continue;
@@ -5802,7 +5804,7 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -5976,7 +5978,7 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &connect_pol,
                                        MAXIMUM_ALLOWED_ACCESS,
-                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       discard_const_p(struct dom_sid2, domain_sid),
                                        &domain_pol,
                                        &result);
        if (!NT_STATUS_IS_OK(status)) {
@@ -6530,7 +6532,7 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
         * or to remote one given in command line
         */
 
-       if (StrCaseCmp(c->opt_workgroup, lp_workgroup())) {
+       if (strcasecmp_m(c->opt_workgroup, lp_workgroup())) {
                domain_name = c->opt_workgroup;
                c->opt_target_workgroup = c->opt_workgroup;
        } else {
@@ -6710,7 +6712,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
         * or to remote one given in command line
         */
 
-       if (StrCaseCmp(c->opt_workgroup, lp_workgroup())) {
+       if (strcasecmp_m(c->opt_workgroup, lp_workgroup())) {
                domain_name = c->opt_workgroup;
                c->opt_target_workgroup = c->opt_workgroup;
        } else {
@@ -6738,6 +6740,8 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
                return -1;
        };
 
+       b = pipe_hnd->binding_handle;
+
        nt_status = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, false, KEY_QUERY_VALUE,
                                        &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
@@ -6934,7 +6938,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
 
                for (i = 0; i < num_domains; i++) {
 
-                       char *str = CONST_DISCARD(char *, trusts->entries[i].name.string);
+                       char *str = discard_const_p(char, trusts->entries[i].name.string);
 
                        found_domain = true;
 
@@ -7994,6 +7998,14 @@ int net_rpc(struct net_context *c, int argc, const char **argv)
                        N_("net rpc shell\n"
                           "    Open interactive shell on remote server")
                },
+               {
+                       "trust",
+                       net_rpc_trust,
+                       NET_TRANSPORT_RPC,
+                       N_("Manage trusts"),
+                       N_("net rpc trust\n"
+                          "    Manage trusts")
+               },
                {NULL, NULL, 0, NULL, NULL}
        };