*domain_sid = info->account_domain.sid;
rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
- cli_rpc_pipe_close(lsa_pipe);
+ TALLOC_FREE(lsa_pipe);
return NT_STATUS_OK;
}
* @return A shell status integer (0 for success)
*/
-int run_rpc_command(struct cli_state *cli_arg,
+int run_rpc_command(struct net_context *c,
+ struct cli_state *cli_arg,
const int pipe_idx,
int conn_flags,
rpc_command_fn fn,
/* make use of cli_state handed over as an argument, if possible */
if (!cli_arg) {
- nt_status = net_make_ipc_connection(conn_flags, &cli);
+ nt_status = net_make_ipc_connection(c, conn_flags, &cli);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(1, ("failed to make ipc connection: %s\n",
nt_errstr(nt_status)));
}
}
- nt_status = fn(domain_sid, domain_name, cli, pipe_hnd, mem_ctx, argc, argv);
+ nt_status = fn(c, domain_sid, domain_name, cli, pipe_hnd, mem_ctx, argc, argv);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(1, ("rpc command function failed! (%s)\n", nt_errstr(nt_status)));
if (!(conn_flags & NET_FLAGS_NO_PIPE)) {
if (pipe_hnd) {
- cli_rpc_pipe_close(pipe_hnd);
+ TALLOC_FREE(pipe_hnd);
}
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_changetrustpw_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_changetrustpw_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
const char **argv)
{
- return trust_pw_find_change_and_store_it(pipe_hnd, mem_ctx, opt_target_workgroup);
+ return trust_pw_find_change_and_store_it(pipe_hnd, mem_ctx, c->opt_target_workgroup);
}
/**
* @return A shell status integer (0 for success)
**/
-int net_rpc_changetrustpw(int argc, const char **argv)
+int net_rpc_changetrustpw(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
+ return run_rpc_command(c, NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
rpc_changetrustpw_internals,
argc, argv);
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_oldjoin_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_oldjoin_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
E_md4hash(trust_passwd, orig_trust_passwd_hash);
- result = trust_pw_change_and_store_it(pipe_hnd, mem_ctx, opt_target_workgroup,
+ result = trust_pw_change_and_store_it(pipe_hnd, mem_ctx, c->opt_target_workgroup,
orig_trust_passwd_hash,
sec_channel_type);
if (NT_STATUS_IS_OK(result))
- printf("Joined domain %s.\n",opt_target_workgroup);
+ printf("Joined domain %s.\n", c->opt_target_workgroup);
- if (!secrets_store_domain_sid(opt_target_workgroup, domain_sid)) {
- DEBUG(0, ("error storing domain sid for %s\n", opt_target_workgroup));
+ if (!secrets_store_domain_sid(c->opt_target_workgroup, domain_sid)) {
+ DEBUG(0, ("error storing domain sid for %s\n", c->opt_target_workgroup));
result = NT_STATUS_UNSUCCESSFUL;
}
* @return A shell status integer (0 for success)
**/
-static int net_rpc_perform_oldjoin(int argc, const char **argv)
+static int net_rpc_perform_oldjoin(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_NETLOGON,
+ return run_rpc_command(c, NULL, PI_NETLOGON,
NET_FLAGS_NO_PIPE | NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
rpc_oldjoin_internals,
argc, argv);
* @return A shell status integer (0 for success)
**/
-static int net_rpc_oldjoin(int argc, const char **argv)
+static int net_rpc_oldjoin(struct net_context *c, int argc, const char **argv)
{
- int rc = net_rpc_perform_oldjoin(argc, argv);
+ int rc = net_rpc_perform_oldjoin(c, argc, argv);
if (rc) {
d_fprintf(stderr, "Failed to join domain\n");
* stripped
**/
-static int rpc_join_usage(int argc, const char **argv)
+static int rpc_join_usage(struct net_context *c, int argc, const char **argv)
{
d_printf("net rpc join -U <username>[%%password] <type>[options]\n"\
"\t to join a domain with admin username & password\n"\
"\t\t PDC - Join as a PDC\n"\
"\t\t MEMBER - Join as a MEMBER server\n");
- net_common_flags_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
* for a username/password.
**/
-int net_rpc_join(int argc, const char **argv)
+int net_rpc_join(struct net_context *c, int argc, const char **argv)
{
if (lp_server_role() == ROLE_STANDALONE) {
d_printf("cannot join as standalone machine\n");
return -1;
}
- if ((net_rpc_perform_oldjoin(argc, argv) == 0))
+ if ((net_rpc_perform_oldjoin(c, argc, argv) == 0))
return 0;
- return net_rpc_join_newstyle(argc, argv);
+ return net_rpc_join_newstyle(c, argc, argv);
}
/**
* @return Normal NTSTATUS return.
**/
-NTSTATUS rpc_info_internals(const DOM_SID *domain_sid,
+NTSTATUS rpc_info_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
* stripped
**/
-int net_rpc_info(int argc, const char **argv)
+int net_rpc_info(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, NET_FLAGS_PDC,
+ return run_rpc_command(c, NULL, PI_SAMR, NET_FLAGS_PDC,
rpc_info_internals,
argc, argv);
}
*
* @param domain_sid The domain sid acquired from the remote server
* @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param mem_ctx Talloc context, destoyed on completion of thea function.
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_getsid_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_getsid_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
* stripped
**/
-int net_rpc_getsid(int argc, const char **argv)
+int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
+ return run_rpc_command(c, NULL, PI_SAMR,
+ NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
rpc_getsid_internals,
argc, argv);
}
* stripped.
**/
-static int rpc_user_usage(int argc, const char **argv)
+static int rpc_user_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_user(argc, argv);
-}
-
-/**
- * Add a new user to a remote RPC server
- *
- * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
- *
- * @param domain_sid The domain sid acquired from the remote server
- * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on completion of the function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
- *
- * @return Normal NTSTATUS return.
- **/
-
-static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
- const char *domain_name,
- struct cli_state *cli,
- struct rpc_pipe_client *pipe_hnd,
- TALLOC_CTX *mem_ctx,
- int argc, const char **argv)
-{
-
- POLICY_HND connect_pol, domain_pol, user_pol;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- const char *acct_name;
- struct lsa_String lsa_acct_name;
- uint32 acb_info;
- uint32 acct_flags, user_rid;
- uint32_t access_granted = 0;
- struct samr_Ids user_rids, name_types;
-
- if (argc < 1) {
- d_printf("User must be specified\n");
- rpc_user_usage(argc, argv);
- return NT_STATUS_OK;
- }
-
- acct_name = argv[0];
- init_lsa_String(&lsa_acct_name, acct_name);
-
- /* Get sam policy handle */
-
- result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
- MAXIMUM_ALLOWED_ACCESS,
- &connect_pol);
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- /* Get domain policy handle */
-
- result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
- &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- CONST_DISCARD(struct dom_sid2 *, domain_sid),
- &domain_pol);
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- /* Create domain user */
-
- acb_info = ACB_NORMAL;
- acct_flags = SEC_GENERIC_READ | SEC_GENERIC_WRITE | SEC_GENERIC_EXECUTE |
- SEC_STD_WRITE_DAC | SEC_STD_DELETE |
- SAMR_USER_ACCESS_SET_PASSWORD |
- SAMR_USER_ACCESS_GET_ATTRIBUTES |
- SAMR_USER_ACCESS_SET_ATTRIBUTES;
-
- result = rpccli_samr_CreateUser2(pipe_hnd, mem_ctx,
- &domain_pol,
- &lsa_acct_name,
- acb_info,
- acct_flags,
- &user_pol,
- &access_granted,
- &user_rid);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- if (argc == 2) {
-
- union samr_UserInfo info;
- uchar pwbuf[516];
-
- result = rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
- &domain_pol,
- 1,
- &lsa_acct_name,
- &user_rids,
- &name_types);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
- &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- user_rids.ids[0],
- &user_pol);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- /* Set password on account */
-
- encode_pw_buffer(pwbuf, argv[1], STR_UNICODE);
-
- init_samr_user_info24(&info.info24, pwbuf, 24);
-
- SamOEMhashBlob(info.info24.password.data, 516,
- &cli->user_session_key);
-
- result = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
- &user_pol,
- 24,
- &info);
-
- if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "Failed to set password for user %s - %s\n",
- acct_name, nt_errstr(result));
-
- result = rpccli_samr_DeleteUser(pipe_hnd, mem_ctx,
- &user_pol);
-
- if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "Failed to delete user %s - %s\n",
- acct_name, nt_errstr(result));
- return result;
- }
- }
-
- }
- done:
- if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "Failed to add user '%s' with %s.\n",
- acct_name, nt_errstr(result));
- } else {
- d_printf("Added user '%s'.\n", acct_name);
- }
- return result;
+ return net_help_user(c, argc, argv);
}
/**
* @return A shell status integer (0 for success)
**/
-static int rpc_user_add(int argc, const char **argv)
-{
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_user_add_internals,
- argc, argv);
-}
-
-/**
- * Delete a user from a remote RPC server
- *
- * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
- *
- * @param domain_sid The domain sid acquired from the remote server
- * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on completion of the function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
- *
- * @return Normal NTSTATUS return.
- **/
-
-static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
- const char *domain_name,
- struct cli_state *cli,
- struct rpc_pipe_client *pipe_hnd,
- TALLOC_CTX *mem_ctx,
- int argc,
- const char **argv)
+static int rpc_user_add(struct net_context *c, int argc, const char **argv)
{
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- POLICY_HND connect_pol, domain_pol, user_pol;
- const char *acct_name;
+ NET_API_STATUS status;
+ struct USER_INFO_1 info1;
+ uint32_t parm_error = 0;
if (argc < 1) {
d_printf("User must be specified\n");
- rpc_user_usage(argc, argv);
- return NT_STATUS_OK;
- }
-
- acct_name = argv[0];
-
- /* Get sam policy and domain handles */
-
- result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
- MAXIMUM_ALLOWED_ACCESS,
- &connect_pol);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
- &connect_pol,
- MAXIMUM_ALLOWED_ACCESS,
- CONST_DISCARD(struct dom_sid2 *, domain_sid),
- &domain_pol);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
+ rpc_user_usage(c, argc, argv);
+ return 0;
}
- /* Get handle on user */
+ ZERO_STRUCT(info1);
- {
- struct samr_Ids user_rids, name_types;
- struct lsa_String lsa_acct_name;
-
- init_lsa_String(&lsa_acct_name, acct_name);
-
- result = rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
- &domain_pol,
- 1,
- &lsa_acct_name,
- &user_rids,
- &name_types);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
-
- result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
- &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- user_rids.ids[0],
- &user_pol);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
- }
+ info1.usri1_name = argv[0];
+ if (argc == 2) {
+ info1.usri1_password = argv[1];
}
- /* Delete user */
+ status = NetUserAdd(c->opt_host, 1, (uint8_t *)&info1, &parm_error);
- result = rpccli_samr_DeleteUser(pipe_hnd, mem_ctx,
- &user_pol);
-
- if (!NT_STATUS_IS_OK(result)) {
- goto done;
+ if (status != 0) {
+ d_fprintf(stderr, "Failed to add user '%s' with: %s.\n",
+ argv[0], libnetapi_get_error_string(c->netapi_ctx,
+ status));
+ return -1;
+ } else {
+ d_printf("Added user '%s'.\n", argv[0]);
}
- done:
- if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "Failed to delete user '%s' with %s.\n",
- acct_name, nt_errstr(result));
- } else {
- d_printf("Deleted user '%s'.\n", acct_name);
- }
-
- return result;
+ return 0;
}
/**
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_user_rename_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_user_rename_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
if (argc != 2) {
d_printf("Old and new username must be specified\n");
- rpc_user_usage(argc, argv);
+ rpc_user_usage(c, argc, argv);
return NT_STATUS_OK;
}
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
* @return A shell status integer (0 for success)
**/
-static int rpc_user_rename(int argc, const char **argv)
+static int rpc_user_rename(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_user_rename_internals,
+ return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_user_rename_internals,
argc, argv);
}
* @return A shell status integer (0 for success)
**/
-static int rpc_user_delete(int argc, const char **argv)
+static int rpc_user_delete(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_user_del_internals,
- argc, argv);
+ NET_API_STATUS status;
+
+ if (argc < 1) {
+ d_printf("User must be specified\n");
+ rpc_user_usage(c, argc, argv);
+ return 0;
+ }
+
+ status = NetUserDel(c->opt_host, argv[0]);
+
+ if (status != 0) {
+ d_fprintf(stderr, "Failed to delete user '%s' with: %s.\n",
+ argv[0],
+ libnetapi_get_error_string(c->netapi_ctx, status));
+ return -1;
+ } else {
+ d_printf("Deleted user '%s'.\n", argv[0]);
+ }
+
+ return 0;
}
/**
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_user_password_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
if (argc < 1) {
d_printf("User must be specified\n");
- rpc_user_usage(argc, argv);
+ rpc_user_usage(c, argc, argv);
return NT_STATUS_OK;
}
/* Get sam policy and domain handles */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
* @return A shell status integer (0 for success)
**/
-static int rpc_user_password(int argc, const char **argv)
+static int rpc_user_password(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_user_password_internals,
+ return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_user_password_internals,
argc, argv);
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_user_info_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_user_info_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
if (argc < 1) {
d_printf("User must be specified\n");
- rpc_user_usage(argc, argv);
+ rpc_user_usage(c, argc, argv);
return NT_STATUS_OK;
}
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) goto done;
* @return A shell status integer (0 for success)
**/
-static int rpc_user_info(int argc, const char **argv)
+static int rpc_user_info(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_user_info_internals,
+ return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_user_info_internals,
argc, argv);
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_user_list_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
}
/* Query domain users */
- if (opt_long_list_entries)
+ if (c->opt_long_list_entries)
d_printf("\nUser name Comment"\
"\n-----------------------------\n");
do {
for (i = 0; i < num_entries; i++) {
user = info.info1.entries[i].account_name.string;
- if (opt_long_list_entries)
+ if (c->opt_long_list_entries)
desc = info.info1.entries[i].description.string;
- if (opt_long_list_entries)
+ if (c->opt_long_list_entries)
printf("%-21.21s %s\n", user, desc);
else
printf("%s\n", user);
* stripped
**/
-int net_rpc_user(int argc, const char **argv)
+int net_rpc_user(struct net_context *c, int argc, const char **argv)
{
+ NET_API_STATUS status;
+
struct functable func[] = {
{"add", rpc_user_add},
{"info", rpc_user_info},
{"rename", rpc_user_rename},
{NULL, NULL}
};
-
+
+ status = libnetapi_init(&c->netapi_ctx);
+ if (status != 0) {
+ return -1;
+ }
+ libnetapi_set_username(c->netapi_ctx, c->opt_user_name);
+ libnetapi_set_password(c->netapi_ctx, c->opt_password);
+
if (argc == 0) {
- return run_rpc_command(NULL,PI_SAMR, 0,
+ return run_rpc_command(c, NULL,PI_SAMR, 0,
rpc_user_list_internals,
argc, argv);
}
- return net_run_function(argc, argv, func, rpc_user_usage);
+ return net_run_function(c, argc, argv, func, rpc_user_usage);
}
-static NTSTATUS rpc_sh_user_list(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_list(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_user_list_internals(ctx->domain_sid, ctx->domain_name,
+ return rpc_user_list_internals(c, ctx->domain_sid, ctx->domain_name,
ctx->cli, pipe_hnd, mem_ctx,
argc, argv);
}
-static NTSTATUS rpc_sh_user_info(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_info(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_user_info_internals(ctx->domain_sid, ctx->domain_name,
+ return rpc_user_info_internals(c, ctx->domain_sid, ctx->domain_name,
ctx->cli, pipe_hnd, mem_ctx,
argc, argv);
}
-static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_handle_user(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv,
NTSTATUS (*fn)(
+ struct net_context *c,
TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
ZERO_STRUCT(domain_pol);
ZERO_STRUCT(user_pol);
- result = net_rpc_lookup_name(mem_ctx, pipe_hnd->cli, argv[0],
- NULL, NULL, &sid, &type);
+ result = net_rpc_lookup_name(c, mem_ctx, rpc_pipe_np_smb_conn(pipe_hnd),
+ argv[0], NULL, NULL, &sid, &type);
if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, "Could not lookup %s: %s\n", argv[0],
nt_errstr(result));
}
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
goto done;
}
- result = fn(mem_ctx, ctx, pipe_hnd, &user_pol, argc-1, argv+1);
+ result = fn(c, mem_ctx, ctx, pipe_hnd, &user_pol, argc-1, argv+1);
done:
if (is_valid_policy_hnd(&user_pol)) {
return result;
}
-static NTSTATUS rpc_sh_user_show_internals(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_show_internals(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
POLICY_HND *user_hnd,
return result;
}
-static NTSTATUS rpc_sh_user_show(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_show(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_sh_handle_user(mem_ctx, ctx, pipe_hnd, argc, argv,
+ return rpc_sh_handle_user(c, mem_ctx, ctx, pipe_hnd, argc, argv,
rpc_sh_user_show_internals);
}
info->info21.fields_present |= SAMR_FIELD_##flag; } \
} while (0);
-static NTSTATUS rpc_sh_user_str_edit_internals(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_str_edit_internals(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
POLICY_HND *user_hnd,
newflags = oldflags & ~ACB_##rec; \
} } } while (0);
-static NTSTATUS rpc_sh_user_str_edit(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_str_edit(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_sh_handle_user(mem_ctx, ctx, pipe_hnd, argc, argv,
+ return rpc_sh_handle_user(c, mem_ctx, ctx, pipe_hnd, argc, argv,
rpc_sh_user_str_edit_internals);
}
-static NTSTATUS rpc_sh_user_flag_edit_internals(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_flag_edit_internals(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
POLICY_HND *user_hnd,
return result;
}
-static NTSTATUS rpc_sh_user_flag_edit(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_user_flag_edit(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_sh_handle_user(mem_ctx, ctx, pipe_hnd, argc, argv,
+ return rpc_sh_handle_user(c, mem_ctx, ctx, pipe_hnd, argc, argv,
rpc_sh_user_flag_edit_internals);
}
-struct rpc_sh_cmd *net_rpc_user_edit_cmds(TALLOC_CTX *mem_ctx,
+struct rpc_sh_cmd *net_rpc_user_edit_cmds(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx)
{
static struct rpc_sh_cmd cmds[] = {
return cmds;
}
-struct rpc_sh_cmd *net_rpc_user_cmds(TALLOC_CTX *mem_ctx,
+struct rpc_sh_cmd *net_rpc_user_cmds(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx)
{
static struct rpc_sh_cmd cmds[] = {
* stripped.
**/
-static int rpc_group_usage(int argc, const char **argv)
+static int rpc_group_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_group(argc, argv);
+ return net_help_group(c, argc, argv);
}
/**
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_delete_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
if (argc < 1) {
d_printf("specify group\n");
- rpc_group_usage(argc,argv);
+ rpc_group_usage(c, argc,argv);
return NT_STATUS_OK; /* ok? */
}
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
goto done;
}
- if (opt_verbose) {
+ if (c->opt_verbose) {
d_printf("Domain Group %s (rid: %d) has %d members\n",
argv[0],group_rid, rids->count);
}
}
if (info->info21.primary_gid == group_rid) {
- if (opt_verbose) {
+ if (c->opt_verbose) {
d_printf("Group is primary group of %s\n",
info->info21.account_name.string);
}
/* remove all group members */
for (i = 0; i < rids->count; i++)
{
- if (opt_verbose)
+ if (c->opt_verbose)
d_printf("Remove group member %d...",
rids->rids[i]);
result = rpccli_samr_DeleteGroupMember(pipe_hnd, mem_ctx,
rids->rids[i]);
if (NT_STATUS_IS_OK(result)) {
- if (opt_verbose)
+ if (c->opt_verbose)
d_printf("ok\n");
} else {
- if (opt_verbose)
+ if (c->opt_verbose)
d_printf("failed\n");
goto done;
}
goto done;
}
-
if (NT_STATUS_IS_OK(result)) {
- if (opt_verbose)
+ if (c->opt_verbose)
d_printf("Deleted %s '%s'\n",sid_type_lookup(name_types.ids[0]),argv[0]);
} else {
d_fprintf(stderr, "Deleting of %s failed: %s\n",argv[0],
}
-static int rpc_group_delete(int argc, const char **argv)
+static int rpc_group_delete(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_group_delete_internals,
+ return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_group_delete_internals,
argc,argv);
}
-static NTSTATUS rpc_group_add_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_add_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
if (argc != 1) {
d_printf("Group name must be specified\n");
- rpc_group_usage(argc, argv);
+ rpc_group_usage(c, argc, argv);
return NT_STATUS_OK;
}
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) goto done;
&rid);
if (!NT_STATUS_IS_OK(result)) goto done;
- if (strlen(opt_comment) == 0) goto done;
+ if (strlen(c->opt_comment) == 0) goto done;
/* We've got a comment to set */
- init_lsa_String(&group_info.description, opt_comment);
+ init_lsa_String(&group_info.description, c->opt_comment);
result = rpccli_samr_SetGroupInfo(pipe_hnd, mem_ctx,
&group_pol,
return result;
}
-static NTSTATUS rpc_alias_add_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_alias_add_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
if (argc != 1) {
d_printf("Alias name must be specified\n");
- rpc_group_usage(argc, argv);
+ rpc_group_usage(c, argc, argv);
return NT_STATUS_OK;
}
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) goto done;
&rid);
if (!NT_STATUS_IS_OK(result)) goto done;
- if (strlen(opt_comment) == 0) goto done;
+ if (strlen(c->opt_comment) == 0) goto done;
/* We've got a comment to set */
- init_lsa_String(&alias_info.description, opt_comment);
+ init_lsa_String(&alias_info.description, c->opt_comment);
result = rpccli_samr_SetAliasInfo(pipe_hnd, mem_ctx,
&alias_pol,
return result;
}
-static int rpc_group_add(int argc, const char **argv)
+static int rpc_group_add(struct net_context *c, int argc, const char **argv)
{
- if (opt_localgroup)
- return run_rpc_command(NULL, PI_SAMR, 0,
+ if (c->opt_localgroup)
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_alias_add_internals,
argc, argv);
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_add_internals,
argc, argv);
}
done:
if (pipe_hnd) {
- cli_rpc_pipe_close(pipe_hnd);
+ TALLOC_FREE(pipe_hnd);
}
if (!NT_STATUS_IS_OK(result) && (StrnCaseCmp(name, "S-", 2) == 0)) {
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
return NT_STATUS_UNSUCCESSFUL;
}
- result = get_sid_from_name(pipe_hnd->cli, mem_ctx, member,
- &member_sid, &member_type);
+ result = get_sid_from_name(rpc_pipe_np_smb_conn(pipe_hnd), mem_ctx,
+ member, &member_sid, &member_type);
if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, "Could not lookup up group member %s\n", member);
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
return result;
}
-static NTSTATUS rpc_group_addmem_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_addmem_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
return NT_STATUS_UNSUCCESSFUL;
}
-static int rpc_group_addmem(int argc, const char **argv)
+static int rpc_group_addmem(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_addmem_internals,
argc, argv);
}
-static NTSTATUS rpc_del_groupmem(struct rpc_pipe_client *pipe_hnd,
+static NTSTATUS rpc_del_groupmem(struct net_context *c,
+ struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *mem_ctx,
const DOM_SID *group_sid,
const char *member)
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result))
if (!sid_split_rid(&sid, &alias_rid))
return NT_STATUS_UNSUCCESSFUL;
- result = get_sid_from_name(pipe_hnd->cli, mem_ctx, member,
- &member_sid, &member_type);
+ result = get_sid_from_name(rpc_pipe_np_smb_conn(pipe_hnd), mem_ctx,
+ member, &member_sid, &member_type);
if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, "Could not lookup up group member %s\n", member);
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
return result;
}
-static NTSTATUS rpc_group_delmem_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_delmem_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
}
if (group_type == SID_NAME_DOM_GRP) {
- NTSTATUS result = rpc_del_groupmem(pipe_hnd, mem_ctx,
+ NTSTATUS result = rpc_del_groupmem(c, pipe_hnd, mem_ctx,
&group_sid, argv[1]);
if (!NT_STATUS_IS_OK(result)) {
return NT_STATUS_UNSUCCESSFUL;
}
-static int rpc_group_delmem(int argc, const char **argv)
+static int rpc_group_delmem(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_delmem_internals,
argc, argv);
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_list_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
}
/* Query domain groups */
- if (opt_long_list_entries)
+ if (c->opt_long_list_entries)
d_printf("\nGroup name Comment"\
"\n-----------------------------\n");
do {
group = info.info3.entries[i].account_name.string;
desc = info.info3.entries[i].description.string;
- if (opt_long_list_entries)
+ if (c->opt_long_list_entries)
printf("%-21.21s %-50.50s\n",
group, desc);
else
const char *description = NULL;
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
POLICY_HND alias_pol;
union samr_AliasInfo *info = NULL;
const char *description = NULL;
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
POLICY_HND alias_pol;
union samr_AliasInfo *info = NULL;
return result;
}
-static int rpc_group_list(int argc, const char **argv)
+static int rpc_group_list(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_list_internals,
argc, argv);
}
-static NTSTATUS rpc_list_group_members(struct rpc_pipe_client *pipe_hnd,
+static NTSTATUS rpc_list_group_members(struct net_context *c,
+ struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *mem_ctx,
const char *domain_name,
const DOM_SID *domain_sid,
for (i = 0; i < this_time; i++) {
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
printf("%s-%d %s\\%s %d\n", sid_str,
group_rids[i], domain_name,
names.names[i].string,
return NT_STATUS_OK;
}
-static NTSTATUS rpc_list_alias_members(struct rpc_pipe_client *pipe_hnd,
+static NTSTATUS rpc_list_alias_members(struct net_context *c,
+ struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *mem_ctx,
POLICY_HND *domain_pol,
uint32 rid)
return NT_STATUS_OK;
}
- lsa_pipe = cli_rpc_pipe_open_noauth(pipe_hnd->cli, PI_LSARPC, &result);
+ lsa_pipe = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(pipe_hnd),
+ PI_LSARPC, &result);
if (!lsa_pipe) {
d_fprintf(stderr, "Couldn't open LSA pipe. Error was %s\n",
nt_errstr(result) );
if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, "Couldn't open LSA policy handle\n");
- cli_rpc_pipe_close(lsa_pipe);
+ TALLOC_FREE(lsa_pipe);
return result;
}
alias_sids = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, num_members);
if (!alias_sids) {
d_fprintf(stderr, "Out of memory\n");
- cli_rpc_pipe_close(lsa_pipe);
+ TALLOC_FREE(lsa_pipe);
return NT_STATUS_NO_MEMORY;
}
sid_copy(&alias_sids[i], sid_array.sids[i].sid);
}
- result = rpccli_lsa_lookup_sids(lsa_pipe, mem_ctx, &lsa_pol, num_members,
- alias_sids,
+ result = rpccli_lsa_lookup_sids(lsa_pipe, mem_ctx, &lsa_pol,
+ num_members, alias_sids,
&domains, &names, &types);
if (!NT_STATUS_IS_OK(result) &&
!NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED)) {
d_fprintf(stderr, "Couldn't lookup SIDs\n");
- cli_rpc_pipe_close(lsa_pipe);
+ TALLOC_FREE(lsa_pipe);
return result;
}
fstring sid_str;
sid_to_fstring(sid_str, &alias_sids[i]);
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
printf("%s %s\\%s %d\n", sid_str,
domains[i] ? domains[i] : "*unknown*",
names[i] ? names[i] : "*unknown*", types[i]);
}
}
- cli_rpc_pipe_close(lsa_pipe);
+ TALLOC_FREE(lsa_pipe);
return NT_STATUS_OK;
}
-static NTSTATUS rpc_group_members_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_members_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
- string_to_sid(&sid_Builtin, "S-1-5-32");
+ sid_copy(&sid_Builtin, &global_sid_Builtin);
result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
&connect_pol,
}
if (rid_types.ids[0] == SID_NAME_DOM_GRP) {
- return rpc_list_group_members(pipe_hnd, mem_ctx, domain_name,
+ return rpc_list_group_members(c, pipe_hnd, mem_ctx, domain_name,
domain_sid, &domain_pol,
rids.ids[0]);
}
if (rid_types.ids[0] == SID_NAME_ALIAS) {
- return rpc_list_alias_members(pipe_hnd, mem_ctx, &domain_pol,
+ return rpc_list_alias_members(c, pipe_hnd, mem_ctx, &domain_pol,
rids.ids[0]);
}
return NT_STATUS_NO_SUCH_GROUP;
}
-static int rpc_group_members(int argc, const char **argv)
+static int rpc_group_members(struct net_context *c, int argc, const char **argv)
{
if (argc != 1) {
- return rpc_group_usage(argc, argv);
+ return rpc_group_usage(c, argc, argv);
}
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_members_internals,
argc, argv);
}
-static NTSTATUS rpc_group_rename_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_group_rename_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get sam policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
return NT_STATUS_NO_SUCH_GROUP;
}
-static int rpc_group_rename(int argc, const char **argv)
+static int rpc_group_rename(struct net_context *c, int argc, const char **argv)
{
if (argc != 2) {
- return rpc_group_usage(argc, argv);
+ return rpc_group_usage(c, argc, argv);
}
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_rename_internals,
argc, argv);
}
* stripped
**/
-int net_rpc_group(int argc, const char **argv)
+int net_rpc_group(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"add", rpc_group_add},
};
if (argc == 0) {
- return run_rpc_command(NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_group_list_internals,
argc, argv);
}
- return net_run_function(argc, argv, func, rpc_group_usage);
+ return net_run_function(c, argc, argv, func, rpc_group_usage);
}
/****************************************************************************/
-static int rpc_share_usage(int argc, const char **argv)
+static int rpc_share_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_share(argc, argv);
+ return net_help_share(c, argc, argv);
}
/**
*
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_add_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_add_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
const char **argv)
{
WERROR result;
+ NTSTATUS status;
char *sharename;
char *path;
uint32 type = STYPE_DISKTREE; /* only allow disk shares to be added */
uint32 num_users=0, perms=0;
char *password=NULL; /* don't allow a share password */
uint32 level = 2;
+ union srvsvc_NetShareInfo info;
+ struct srvsvc_NetShareInfo2 info2;
+ uint32_t parm_error = 0;
if ((sharename = talloc_strdup(mem_ctx, argv[0])) == NULL) {
return NT_STATUS_NO_MEMORY;
return NT_STATUS_UNSUCCESSFUL;
*path++ = '\0';
- result = rpccli_srvsvc_net_share_add(pipe_hnd, mem_ctx, sharename, type,
- opt_comment, perms, opt_maxusers,
- num_users, path, password,
- level, NULL);
- return werror_to_ntstatus(result);
+ info2.name = sharename;
+ info2.type = type;
+ info2.comment = c->opt_comment;
+ info2.permissions = perms;
+ info2.max_users = c->opt_maxusers;
+ info2.current_users = num_users;
+ info2.path = path;
+ info2.password = password;
+
+ info.info2 = &info2;
+
+ status = rpccli_srvsvc_NetShareAdd(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ level,
+ &info,
+ &parm_error,
+ &result);
+ return status;
}
-static int rpc_share_add(int argc, const char **argv)
+static int rpc_share_add(struct net_context *c, int argc, const char **argv)
{
if ((argc < 1) || !strchr(argv[0], '=')) {
DEBUG(1,("Sharename or path not specified on add\n"));
- return rpc_share_usage(argc, argv);
+ return rpc_share_usage(c, argc, argv);
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_add_internals,
argc, argv);
}
*
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_del_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_del_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
{
WERROR result;
- result = rpccli_srvsvc_net_share_del(pipe_hnd, mem_ctx, argv[0]);
- return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+ return rpccli_srvsvc_NetShareDel(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ argv[0],
+ 0,
+ &result);
}
/**
*
* @return A shell status integer (0 for success)
**/
-static int rpc_share_delete(int argc, const char **argv)
+static int rpc_share_delete(struct net_context *c, int argc, const char **argv)
{
if (argc < 1) {
DEBUG(1,("Sharename not specified on delete\n"));
- return rpc_share_usage(argc, argv);
+ return rpc_share_usage(c, argc, argv);
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_del_internals,
argc, argv);
}
*
* @param info1 pointer to SRV_SHARE_INFO_1 to format
**/
-
-static void display_share_info_1(SRV_SHARE_INFO_1 *info1)
-{
- fstring netname = "", remark = "";
- rpcstr_pull_unistr2_fstring(netname, &info1->info_1_str.uni_netname);
- rpcstr_pull_unistr2_fstring(remark, &info1->info_1_str.uni_remark);
-
- if (opt_long_list_entries) {
+static void display_share_info_1(struct net_context *c,
+ struct srvsvc_NetShareInfo1 *r)
+{
+ if (c->opt_long_list_entries) {
d_printf("%-12s %-8.8s %-50s\n",
- netname, share_type[info1->info_1.type & ~(STYPE_TEMPORARY|STYPE_HIDDEN)], remark);
+ r->name,
+ c->share_type[r->type & ~(STYPE_TEMPORARY|STYPE_HIDDEN)],
+ r->comment);
} else {
- d_printf("%s\n", netname);
+ d_printf("%s\n", r->name);
}
-
}
-static WERROR get_share_info(struct rpc_pipe_client *pipe_hnd,
- TALLOC_CTX *mem_ctx,
- uint32 level,
- int argc,
- const char **argv,
- SRV_SHARE_INFO_CTR *ctr)
+static WERROR get_share_info(struct net_context *c,
+ struct rpc_pipe_client *pipe_hnd,
+ TALLOC_CTX *mem_ctx,
+ uint32 level,
+ int argc,
+ const char **argv,
+ struct srvsvc_NetShareInfoCtr *info_ctr)
{
WERROR result;
- SRV_SHARE_INFO info;
+ NTSTATUS status;
+ union srvsvc_NetShareInfo info;
/* no specific share requested, enumerate all */
if (argc == 0) {
- ENUM_HND hnd;
- uint32 preferred_len = 0xffffffff;
+ uint32_t preferred_len = 0xffffffff;
+ uint32_t total_entries = 0;
+ uint32_t resume_handle = 0;
- init_enum_hnd(&hnd, 0);
+ info_ctr->level = level;
- return rpccli_srvsvc_net_share_enum(pipe_hnd, mem_ctx, level, ctr,
- preferred_len, &hnd);
+ status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ info_ctr,
+ preferred_len,
+ &total_entries,
+ &resume_handle,
+ &result);
+ return result;
}
/* request just one share */
- result = rpccli_srvsvc_net_share_get_info(pipe_hnd, mem_ctx, argv[0], level, &info);
-
- if (!W_ERROR_IS_OK(result))
+ status = rpccli_srvsvc_NetShareGetInfo(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ argv[0],
+ level,
+ &info,
+ &result);
+
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
goto done;
+ }
/* construct ctr */
- ZERO_STRUCTP(ctr);
+ ZERO_STRUCTP(info_ctr);
- ctr->info_level = ctr->switch_value = level;
- ctr->ptr_share_info = ctr->ptr_entries = 1;
- ctr->num_entries = ctr->num_entries2 = 1;
+ info_ctr->level = level;
switch (level) {
case 1:
{
- char *s;
- SRV_SHARE_INFO_1 *info1;
-
- ctr->share.info1 = TALLOC_ARRAY(mem_ctx, SRV_SHARE_INFO_1, 1);
- if (ctr->share.info1 == NULL) {
- result = WERR_NOMEM;
- goto done;
- }
- info1 = ctr->share.info1;
-
- memset(ctr->share.info1, 0, sizeof(SRV_SHARE_INFO_1));
+ struct srvsvc_NetShareCtr1 *ctr1;
- /* Copy pointer crap */
+ ctr1 = TALLOC_ZERO_P(mem_ctx, struct srvsvc_NetShareCtr1);
+ W_ERROR_HAVE_NO_MEMORY(ctr1);
- memcpy(&info1->info_1, &info.share.info1.info_1, sizeof(SH_INFO_1));
+ ctr1->count = 1;
+ ctr1->array = info.info1;
- /* Duplicate strings */
-
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info1.info_1_str.uni_netname);
- if (s)
- init_unistr2(&info1->info_1_str.uni_netname, s, UNI_STR_TERMINATE);
-
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info1.info_1_str.uni_remark);
- if (s)
- init_unistr2(&info1->info_1_str.uni_remark, s, UNI_STR_TERMINATE);
+ info_ctr->ctr.ctr1 = ctr1;
}
case 2:
{
- char *s;
- SRV_SHARE_INFO_2 *info2;
-
- ctr->share.info2 = TALLOC_ARRAY(mem_ctx, SRV_SHARE_INFO_2, 1);
- if (ctr->share.info2 == NULL) {
- result = WERR_NOMEM;
- goto done;
- }
- info2 = ctr->share.info2;
-
- memset(ctr->share.info2, 0, sizeof(SRV_SHARE_INFO_2));
-
- /* Copy pointer crap */
-
- memcpy(&info2->info_2, &info.share.info2.info_2, sizeof(SH_INFO_2));
+ struct srvsvc_NetShareCtr2 *ctr2;
- /* Duplicate strings */
+ ctr2 = TALLOC_ZERO_P(mem_ctx, struct srvsvc_NetShareCtr2);
+ W_ERROR_HAVE_NO_MEMORY(ctr2);
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info2.info_2_str.uni_netname);
- if (s)
- init_unistr2(&info2->info_2_str.uni_netname, s, UNI_STR_TERMINATE);
+ ctr2->count = 1;
+ ctr2->array = info.info2;
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info2.info_2_str.uni_remark);
- if (s)
- init_unistr2(&info2->info_2_str.uni_remark, s, UNI_STR_TERMINATE);
-
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info2.info_2_str.uni_path);
- if (s)
- init_unistr2(&info2->info_2_str.uni_path, s, UNI_STR_TERMINATE);
-
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info2.info_2_str.uni_passwd);
- if (s)
- init_unistr2(&info2->info_2_str.uni_passwd, s, UNI_STR_TERMINATE);
+ info_ctr->ctr.ctr2 = ctr2;
}
case 502:
{
- char *s;
- SRV_SHARE_INFO_502 *info502;
-
- ctr->share.info502 = TALLOC_ARRAY(mem_ctx, SRV_SHARE_INFO_502, 1);
- if (ctr->share.info502 == NULL) {
- result = WERR_NOMEM;
- goto done;
- }
- info502 = ctr->share.info502;
-
- memset(ctr->share.info502, 0, sizeof(SRV_SHARE_INFO_502));
-
- /* Copy pointer crap */
-
- memcpy(&info502->info_502, &info.share.info502.info_502, sizeof(SH_INFO_502));
-
- /* Duplicate strings */
+ struct srvsvc_NetShareCtr502 *ctr502;
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info502.info_502_str.uni_netname);
- if (s)
- init_unistr2(&info502->info_502_str.uni_netname, s, UNI_STR_TERMINATE);
+ ctr502 = TALLOC_ZERO_P(mem_ctx, struct srvsvc_NetShareCtr502);
+ W_ERROR_HAVE_NO_MEMORY(ctr502);
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info502.info_502_str.uni_remark);
- if (s)
- init_unistr2(&info502->info_502_str.uni_remark, s, UNI_STR_TERMINATE);
+ ctr502->count = 1;
+ ctr502->array = info.info502;
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info502.info_502_str.uni_path);
- if (s)
- init_unistr2(&info502->info_502_str.uni_path, s, UNI_STR_TERMINATE);
-
- s = unistr2_to_ascii_talloc(mem_ctx, &info.share.info502.info_502_str.uni_passwd);
- if (s)
- init_unistr2(&info502->info_502_str.uni_passwd, s, UNI_STR_TERMINATE);
-
- info502->info_502_str.sd = dup_sec_desc(mem_ctx, info.share.info502.info_502_str.sd);
-
+ info_ctr->ctr.ctr502 = ctr502;
}
-
} /* switch */
-
done:
return result;
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_list_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_list_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
int argc,
const char **argv)
{
- SRV_SHARE_INFO_CTR ctr;
+ struct srvsvc_NetShareInfoCtr info_ctr;
+ struct srvsvc_NetShareCtr1 ctr1;
WERROR result;
uint32 i, level = 1;
- result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr);
+ ZERO_STRUCT(info_ctr);
+ ZERO_STRUCT(ctr1);
+
+ info_ctr.level = 1;
+ info_ctr.ctr.ctr1 = &ctr1;
+
+ result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
+ &info_ctr);
if (!W_ERROR_IS_OK(result))
goto done;
/* Display results */
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
d_printf(
"\nEnumerating shared resources (exports) on remote server:\n\n"\
"\nShare name Type Description\n"\
"---------- ---- -----------\n");
}
- for (i = 0; i < ctr.num_entries; i++)
- display_share_info_1(&ctr.share.info1[i]);
+ for (i = 0; i < info_ctr.ctr.ctr1->count; i++)
+ display_share_info_1(c, &info_ctr.ctr.ctr1->array[i]);
done:
return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
}
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-static int rpc_share_list(int argc, const char **argv)
+static int rpc_share_list(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_list_internals, argc, argv);
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0, rpc_share_list_internals,
+ argc, argv);
}
static bool check_share_availability(struct cli_state *cli, const char *netname)
return True;
}
-static bool check_share_sanity(struct cli_state *cli, fstring netname, uint32 type)
+static bool check_share_sanity(struct net_context *c, struct cli_state *cli,
+ const char *netname, uint32 type)
{
/* only support disk shares */
if (! ( type == STYPE_DISKTREE || type == (STYPE_DISKTREE | STYPE_HIDDEN)) ) {
strequal(netname,"global"))
return False;
- if (opt_exclude && in_list(netname, opt_exclude, False)) {
+ if (c->opt_exclude && in_list(netname, c->opt_exclude, False)) {
printf("excluding [%s]\n", netname);
return False;
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_migrate_shares_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_migrate_shares_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
{
WERROR result;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- SRV_SHARE_INFO_CTR ctr_src;
- uint32 type = STYPE_DISKTREE; /* only allow disk shares to be added */
- char *password = NULL; /* don't allow a share password */
+ struct srvsvc_NetShareInfoCtr ctr_src;
uint32 i;
struct rpc_pipe_client *srvsvc_pipe = NULL;
struct cli_state *cli_dst = NULL;
uint32 level = 502; /* includes secdesc */
+ uint32_t parm_error = 0;
- result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
+ result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
+ &ctr_src);
if (!W_ERROR_IS_OK(result))
goto done;
/* connect destination PI_SRVSVC */
- nt_status = connect_dst_pipe(&cli_dst, &srvsvc_pipe, PI_SRVSVC);
+ nt_status = connect_dst_pipe(c, &cli_dst, &srvsvc_pipe, PI_SRVSVC);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
- for (i = 0; i < ctr_src.num_entries; i++) {
+ for (i = 0; i < ctr_src.ctr.ctr502->count; i++) {
+
+ union srvsvc_NetShareInfo info;
+ struct srvsvc_NetShareInfo502 info502 =
+ ctr_src.ctr.ctr502->array[i];
- fstring netname = "", remark = "", path = "";
/* reset error-code */
nt_status = NT_STATUS_UNSUCCESSFUL;
- rpcstr_pull_unistr2_fstring(
- netname, &ctr_src.share.info502[i].info_502_str.uni_netname);
- rpcstr_pull_unistr2_fstring(
- remark, &ctr_src.share.info502[i].info_502_str.uni_remark);
- rpcstr_pull_unistr2_fstring(
- path, &ctr_src.share.info502[i].info_502_str.uni_path);
-
- if (!check_share_sanity(cli, netname, ctr_src.share.info502[i].info_502.type))
+ if (!check_share_sanity(c, cli, info502.name, info502.type))
continue;
/* finally add the share on the dst server */
printf("migrating: [%s], path: %s, comment: %s, without share-ACLs\n",
- netname, path, remark);
-
- result = rpccli_srvsvc_net_share_add(srvsvc_pipe, mem_ctx, netname, type, remark,
- ctr_src.share.info502[i].info_502.perms,
- ctr_src.share.info502[i].info_502.max_uses,
- ctr_src.share.info502[i].info_502.num_uses,
- path, password, level,
- NULL);
-
+ info502.name, info502.path, info502.comment);
+
+ info.info502 = &info502;
+
+ nt_status = rpccli_srvsvc_NetShareAdd(srvsvc_pipe, mem_ctx,
+ srvsvc_pipe->desthost,
+ 502,
+ &info,
+ &parm_error,
+ &result);
+
if (W_ERROR_V(result) == W_ERROR_V(WERR_ALREADY_EXISTS)) {
- printf(" [%s] does already exist\n", netname);
+ printf(" [%s] does already exist\n",
+ info502.name);
continue;
}
- if (!W_ERROR_IS_OK(result)) {
+ if (!NT_STATUS_IS_OK(nt_status) || !W_ERROR_IS_OK(result)) {
printf("cannot add share: %s\n", dos_errstr(result));
goto done;
}
*
* @return A shell status integer (0 for success)
**/
-static int rpc_share_migrate_shares(int argc, const char **argv)
+static int rpc_share_migrate_shares(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_migrate_shares_internals,
argc, argv);
}
* @param state arg-pointer
*
**/
-static void copy_fn(const char *mnt, file_info *f, const char *mask, void *state)
+static void copy_fn(const char *mnt, file_info *f,
+ const char *mask, void *state)
{
static NTSTATUS nt_status;
static struct copy_clistate *local_state;
static fstring filename, new_mask;
fstring dir;
char *old_dir;
+ struct net_context *c;
local_state = (struct copy_clistate *)state;
nt_status = NT_STATUS_UNSUCCESSFUL;
+ c = local_state->c;
+
if (strequal(f->name, ".") || strequal(f->name, ".."))
return;
{
case NET_MODE_SHARE_MIGRATE:
/* create that directory */
- nt_status = net_copy_file(local_state->mem_ctx,
+ nt_status = net_copy_file(c, local_state->mem_ctx,
local_state->cli_share_src,
local_state->cli_share_dst,
dir, dir,
- opt_acls? True : False,
- opt_attrs? True : False,
- opt_timestamps? True : False,
- False);
+ c->opt_acls? true : false,
+ c->opt_attrs? true : false,
+ c->opt_timestamps? true:false,
+ false);
break;
default:
d_fprintf(stderr, "Unsupported mode %d\n", net_mode_share);
switch (net_mode_share)
{
case NET_MODE_SHARE_MIGRATE:
- nt_status = net_copy_file(local_state->mem_ctx,
+ nt_status = net_copy_file(c, local_state->mem_ctx,
local_state->cli_share_src,
local_state->cli_share_dst,
filename, filename,
- opt_acls? True : False,
- opt_attrs? True : False,
- opt_timestamps? True: False,
- True);
+ c->opt_acls? true : false,
+ c->opt_attrs? true : false,
+ c->opt_timestamps? true: false,
+ true);
break;
default:
d_fprintf(stderr, "Unsupported file mode %d\n", net_mode_share);
* Should set up ACL inheritance.
**/
-bool copy_top_level_perms(struct copy_clistate *cp_clistate,
+bool copy_top_level_perms(struct net_context *c,
+ struct copy_clistate *cp_clistate,
const char *sharename)
{
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
switch (net_mode_share) {
case NET_MODE_SHARE_MIGRATE:
DEBUG(3,("calling net_copy_fileattr for '.' directory in share %s\n", sharename));
- nt_status = net_copy_fileattr(cp_clistate->mem_ctx,
+ nt_status = net_copy_fileattr(c,
+ cp_clistate->mem_ctx,
cp_clistate->cli_share_src,
cp_clistate->cli_share_dst,
"\\", "\\",
- opt_acls? True : False,
- opt_attrs? True : False,
- opt_timestamps? True: False,
- False);
+ c->opt_acls? true : false,
+ c->opt_attrs? true : false,
+ c->opt_timestamps? true: false,
+ false);
break;
default:
d_fprintf(stderr, "Unsupported mode %d\n", net_mode_share);
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
{
WERROR result;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- SRV_SHARE_INFO_CTR ctr_src;
+ struct srvsvc_NetShareInfoCtr ctr_src;
uint32 i;
uint32 level = 502;
struct copy_clistate cp_clistate;
const char *mask = "\\*";
char *dst = NULL;
- dst = SMB_STRDUP(opt_destination?opt_destination:"127.0.0.1");
+ dst = SMB_STRDUP(c->opt_destination?c->opt_destination:"127.0.0.1");
- result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
+ result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
+ &ctr_src);
if (!W_ERROR_IS_OK(result))
goto done;
- for (i = 0; i < ctr_src.num_entries; i++) {
+ for (i = 0; i < ctr_src.ctr.ctr502->count; i++) {
- fstring netname = "";
+ struct srvsvc_NetShareInfo502 info502 =
+ ctr_src.ctr.ctr502->array[i];
- rpcstr_pull_unistr2_fstring(
- netname, &ctr_src.share.info502[i].info_502_str.uni_netname);
-
- if (!check_share_sanity(cli, netname, ctr_src.share.info502[i].info_502.type))
+ if (!check_share_sanity(c, cli, info502.name, info502.type))
continue;
/* one might not want to mirror whole discs :) */
- if (strequal(netname, "print$") || netname[1] == '$') {
- d_printf("skipping [%s]: builtin/hidden share\n", netname);
+ if (strequal(info502.name, "print$") || info502.name[1] == '$') {
+ d_printf("skipping [%s]: builtin/hidden share\n", info502.name);
continue;
}
break;
}
printf(" [%s] files and directories %s ACLs, %s DOS Attributes %s\n",
- netname,
- opt_acls ? "including" : "without",
- opt_attrs ? "including" : "without",
- opt_timestamps ? "(preserving timestamps)" : "");
+ info502.name,
+ c->opt_acls ? "including" : "without",
+ c->opt_attrs ? "including" : "without",
+ c->opt_timestamps ? "(preserving timestamps)" : "");
cp_clistate.mem_ctx = mem_ctx;
cp_clistate.cli_share_src = NULL;
cp_clistate.cli_share_dst = NULL;
cp_clistate.cwd = NULL;
cp_clistate.attribute = aSYSTEM | aHIDDEN | aDIR;
+ cp_clistate.c = c;
/* open share source */
- nt_status = connect_to_service(&cp_clistate.cli_share_src,
+ nt_status = connect_to_service(c, &cp_clistate.cli_share_src,
&cli->dest_ss, cli->desthost,
- netname, "A:");
+ info502.name, "A:");
if (!NT_STATUS_IS_OK(nt_status))
goto done;
if (net_mode_share == NET_MODE_SHARE_MIGRATE) {
/* open share destination */
- nt_status = connect_to_service(&cp_clistate.cli_share_dst,
- NULL, dst, netname, "A:");
+ nt_status = connect_to_service(c, &cp_clistate.cli_share_dst,
+ NULL, dst, info502.name, "A:");
if (!NT_STATUS_IS_OK(nt_status))
goto done;
got_dst_share = True;
}
- if (!copy_top_level_perms(&cp_clistate, netname)) {
- d_fprintf(stderr, "Could not handle the top level directory permissions for the share: %s\n", netname);
+ if (!copy_top_level_perms(c, &cp_clistate, info502.name)) {
+ d_fprintf(stderr, "Could not handle the top level directory permissions for the share: %s\n", info502.name);
nt_status = NT_STATUS_UNSUCCESSFUL;
goto done;
}
if (!sync_files(&cp_clistate, mask)) {
- d_fprintf(stderr, "could not handle files for share: %s\n", netname);
+ d_fprintf(stderr, "could not handle files for share: %s\n", info502.name);
nt_status = NT_STATUS_UNSUCCESSFUL;
goto done;
}
}
-static int rpc_share_migrate_files(int argc, const char **argv)
+static int rpc_share_migrate_files(struct net_context *c, int argc, const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_migrate_files_internals,
argc, argv);
}
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_migrate_security_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_migrate_security_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
{
WERROR result;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- SRV_SHARE_INFO_CTR ctr_src;
- SRV_SHARE_INFO info;
+ struct srvsvc_NetShareInfoCtr ctr_src;
+ union srvsvc_NetShareInfo info;
uint32 i;
struct rpc_pipe_client *srvsvc_pipe = NULL;
struct cli_state *cli_dst = NULL;
uint32 level = 502; /* includes secdesc */
+ uint32_t parm_error = 0;
- result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
+ result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
+ &ctr_src);
if (!W_ERROR_IS_OK(result))
goto done;
/* connect destination PI_SRVSVC */
- nt_status = connect_dst_pipe(&cli_dst, &srvsvc_pipe, PI_SRVSVC);
+ nt_status = connect_dst_pipe(c, &cli_dst, &srvsvc_pipe, PI_SRVSVC);
if (!NT_STATUS_IS_OK(nt_status))
return nt_status;
- for (i = 0; i < ctr_src.num_entries; i++) {
+ for (i = 0; i < ctr_src.ctr.ctr502->count; i++) {
+
+ struct srvsvc_NetShareInfo502 info502 =
+ ctr_src.ctr.ctr502->array[i];
- fstring netname = "", remark = "", path = "";
/* reset error-code */
nt_status = NT_STATUS_UNSUCCESSFUL;
- rpcstr_pull_unistr2_fstring(
- netname, &ctr_src.share.info502[i].info_502_str.uni_netname);
- rpcstr_pull_unistr2_fstring(
- remark, &ctr_src.share.info502[i].info_502_str.uni_remark);
- rpcstr_pull_unistr2_fstring(
- path, &ctr_src.share.info502[i].info_502_str.uni_path);
-
- if (!check_share_sanity(cli, netname, ctr_src.share.info502[i].info_502.type))
+ if (!check_share_sanity(c, cli, info502.name, info502.type))
continue;
printf("migrating: [%s], path: %s, comment: %s, including share-ACLs\n",
- netname, path, remark);
-
- if (opt_verbose)
- display_sec_desc(ctr_src.share.info502[i].info_502_str.sd);
-
- /* init info */
- ZERO_STRUCT(info);
+ info502.name, info502.path, info502.comment);
- info.switch_value = level;
- info.ptr_share_ctr = 1;
+ if (c->opt_verbose)
+ display_sec_desc(info502.sd_buf.sd);
/* FIXME: shouldn't we be able to just set the security descriptor ? */
- info.share.info502 = ctr_src.share.info502[i];
+ info.info502 = &info502;
/* finally modify the share on the dst server */
- result = rpccli_srvsvc_net_share_set_info(srvsvc_pipe, mem_ctx, netname, level, &info);
-
- if (!W_ERROR_IS_OK(result)) {
+ nt_status = rpccli_srvsvc_NetShareSetInfo(srvsvc_pipe, mem_ctx,
+ srvsvc_pipe->desthost,
+ info502.name,
+ level,
+ &info,
+ &parm_error,
+ &result);
+ if (!NT_STATUS_IS_OK(nt_status) || !W_ERROR_IS_OK(result)) {
printf("cannot set share-acl: %s\n", dos_errstr(result));
goto done;
}
*
* @return A shell status integer (0 for success)
**/
-static int rpc_share_migrate_security(int argc, const char **argv)
+static int rpc_share_migrate_security(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_migrate_security_internals,
argc, argv);
}
* @return A shell status integer (0 for success)
*
**/
-static int rpc_share_migrate_all(int argc, const char **argv)
+static int rpc_share_migrate_all(struct net_context *c, int argc,
+ const char **argv)
{
int ret;
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
/* order is important. we don't want to be locked out by the share-acl
* before copying files - gd */
- ret = run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_migrate_shares_internals, argc, argv);
+ ret = run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ rpc_share_migrate_shares_internals, argc, argv);
if (ret)
return ret;
- ret = run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_migrate_files_internals, argc, argv);
+ ret = run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ rpc_share_migrate_files_internals, argc, argv);
if (ret)
return ret;
- return run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_migrate_security_internals, argc, argv);
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ rpc_share_migrate_security_internals, argc,
+ argv);
}
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-static int rpc_share_migrate(int argc, const char **argv)
+static int rpc_share_migrate(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
net_mode_share = NET_MODE_SHARE_MIGRATE;
- return net_run_function(argc, argv, func, rpc_share_usage);
+ return net_run_function(c, argc, argv, func, rpc_share_usage);
}
struct full_alias {
* Dump server_aliases as names for debugging purposes.
*/
-static NTSTATUS rpc_aliaslist_dump(const DOM_SID *domain_sid,
+static NTSTATUS rpc_aliaslist_dump(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
* server_aliases.
*/
-static NTSTATUS rpc_aliaslist_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_aliaslist_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
POLICY_HND connect_pol;
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
static bool get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *token)
{
- struct winbindd_request request;
- struct winbindd_response response;
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ enum wbcSidType type;
fstring full_name;
- NSS_STATUS result;
-
+ struct wbcDomainSid wsid;
+ char *sid_str = NULL;
DOM_SID user_sid;
-
- int i;
+ uint32_t num_groups;
+ gid_t *groups = NULL;
+ uint32_t i;
fstr_sprintf(full_name, "%s%c%s",
domain, *lp_winbind_separator(), user);
/* First let's find out the user sid */
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- fstrcpy(request.data.name.dom_name, domain);
- fstrcpy(request.data.name.name, user);
+ wbc_status = wbcLookupName(domain, user, &wsid, &type);
- result = winbindd_request_response(WINBINDD_LOOKUPNAME, &request, &response);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ DEBUG(1, ("winbind could not find %s: %s\n",
+ full_name, wbcErrorString(wbc_status)));
+ return false;
+ }
- if (result != NSS_STATUS_SUCCESS) {
- DEBUG(1, ("winbind could not find %s\n", full_name));
- return False;
+ wbc_status = wbcSidToString(&wsid, &sid_str);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ return false;
}
- if (response.data.sid.type != SID_NAME_USER) {
+ if (type != SID_NAME_USER) {
+ wbcFreeMemory(sid_str);
DEBUG(1, ("%s is not a user\n", full_name));
- return False;
+ return false;
}
- string_to_sid(&user_sid, response.data.sid.sid);
+ string_to_sid(&user_sid, sid_str);
+ wbcFreeMemory(sid_str);
+ sid_str = NULL;
init_user_token(token, &user_sid);
/* And now the groups winbind knows about */
- ZERO_STRUCT(response);
-
- fstrcpy(request.data.username, full_name);
-
- result = winbindd_request_response(WINBINDD_GETGROUPS, &request, &response);
-
- if (result != NSS_STATUS_SUCCESS) {
- DEBUG(1, ("winbind could not get groups of %s\n", full_name));
- return False;
+ wbc_status = wbcGetGroups(full_name, &num_groups, &groups);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ DEBUG(1, ("winbind could not get groups of %s: %s\n",
+ full_name, wbcErrorString(wbc_status)));
+ return false;
}
- for (i = 0; i < response.data.num_entries; i++) {
- gid_t gid = ((gid_t *)response.extra_data.data)[i];
+ for (i = 0; i < num_groups; i++) {
+ gid_t gid = groups[i];
DOM_SID sid;
- struct winbindd_request sidrequest;
- struct winbindd_response sidresponse;
-
- ZERO_STRUCT(sidrequest);
- ZERO_STRUCT(sidresponse);
-
- sidrequest.data.gid = gid;
-
- result = winbindd_request_response(WINBINDD_GID_TO_SID,
- &sidrequest, &sidresponse);
+ wbc_status = wbcGidToSid(gid, &wsid);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ DEBUG(1, ("winbind could not find SID of gid %d: %s\n",
+ gid, wbcErrorString(wbc_status)));
+ wbcFreeMemory(groups);
+ return false;
+ }
- if (result != NSS_STATUS_SUCCESS) {
- DEBUG(1, ("winbind could not find SID of gid %d\n",
- gid));
- return False;
+ wbc_status = wbcSidToString(&wsid, &sid_str);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ wbcFreeMemory(groups);
+ return false;
}
- DEBUG(3, (" %s\n", sidresponse.data.sid.sid));
+ DEBUG(3, (" %s\n", sid_str));
+
+ string_to_sid(&sid, sid_str);
+ wbcFreeMemory(sid_str);
+ sid_str = NULL;
- string_to_sid(&sid, sidresponse.data.sid.sid);
add_sid_to_token(token, &sid);
}
+ wbcFreeMemory(groups);
- SAFE_FREE(response.extra_data.data);
-
- return True;
+ return true;
}
/**
* Get a list of all user tokens we want to look at
**/
-static bool get_user_tokens(int *num_tokens, struct user_token **user_tokens)
+static bool get_user_tokens(struct net_context *c, int *num_tokens,
+ struct user_token **user_tokens)
{
- struct winbindd_request request;
- struct winbindd_response response;
- const char *extra_data;
- char *name;
- int i;
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ uint32_t i, num_users;
+ const char **users;
struct user_token *result;
TALLOC_CTX *frame = NULL;
if (lp_winbind_use_default_domain() &&
- (opt_target_workgroup == NULL)) {
+ (c->opt_target_workgroup == NULL)) {
d_fprintf(stderr, "winbind use default domain = yes set, "
"please specify a workgroup\n");
- return False;
+ return false;
}
/* Send request to winbind daemon */
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- if (winbindd_request_response(WINBINDD_LIST_USERS, &request, &response) !=
- NSS_STATUS_SUCCESS)
- return False;
-
- /* Look through extra data */
-
- if (!response.extra_data.data)
- return False;
-
- extra_data = (const char *)response.extra_data.data;
- *num_tokens = 0;
-
- frame = talloc_stackframe();
- while(next_token_talloc(frame, &extra_data, &name, ",")) {
- *num_tokens += 1;
+ wbc_status = wbcListUsers(NULL, &num_users, &users);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ DEBUG(1, ("winbind could not list users: %s\n",
+ wbcErrorString(wbc_status)));
+ return false;
}
- result = SMB_MALLOC_ARRAY(struct user_token, *num_tokens);
+ result = SMB_MALLOC_ARRAY(struct user_token, num_users);
if (result == NULL) {
DEBUG(1, ("Could not malloc sid array\n"));
- TALLOC_FREE(frame);
- return False;
+ wbcFreeMemory(users);
+ return false;
}
- extra_data = (const char *)response.extra_data.data;
- i=0;
-
- while(next_token_talloc(frame, &extra_data, &name, ",")) {
+ frame = talloc_stackframe();
+ for (i=0; i < num_users; i++) {
fstring domain, user;
char *p;
- fstrcpy(result[i].name, name);
+ fstrcpy(result[i].name, users[i]);
- p = strchr(name, *lp_winbind_separator());
+ p = strchr(users[i], *lp_winbind_separator());
- DEBUG(3, ("%s\n", name));
+ DEBUG(3, ("%s\n", users[i]));
if (p == NULL) {
- fstrcpy(domain, opt_target_workgroup);
- fstrcpy(user, name);
+ fstrcpy(domain, c->opt_target_workgroup);
+ fstrcpy(user, users[i]);
} else {
*p++ = '\0';
- fstrcpy(domain, name);
+ fstrcpy(domain, users[i]);
strupper_m(domain);
fstrcpy(user, p);
}
i+=1;
}
TALLOC_FREE(frame);
- SAFE_FREE(response.extra_data.data);
+ wbcFreeMemory(users);
+ *num_tokens = num_users;
*user_tokens = result;
- return True;
+ return true;
}
static bool get_user_tokens_from_file(FILE *f,
int fnum;
SEC_DESC *share_sd = NULL;
SEC_DESC *root_sd = NULL;
- struct cli_state *cli = pipe_hnd->cli;
+ struct cli_state *cli = rpc_pipe_np_smb_conn(pipe_hnd);
int i;
- SRV_SHARE_INFO info;
+ union srvsvc_NetShareInfo info;
WERROR result;
+ NTSTATUS status;
uint16 cnum;
- result = rpccli_srvsvc_net_share_get_info(pipe_hnd, mem_ctx, netname,
- 502, &info);
+ status = rpccli_srvsvc_NetShareGetInfo(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ netname,
+ 502,
+ &info,
+ &result);
- if (!W_ERROR_IS_OK(result)) {
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
DEBUG(1, ("Coult not query secdesc for share %s\n",
netname));
return;
}
- share_sd = info.share.info502.info_502_str.sd;
+ share_sd = info.info502->sd_buf.sd;
if (share_sd == NULL) {
DEBUG(1, ("Got no secdesc for share %s\n",
netname));
for (i=0; i<num_tokens; i++) {
uint32 acc_granted;
- NTSTATUS status;
if (share_sd != NULL) {
if (!se_access_check(share_sd, &tokens[i].token,
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_share_allowedusers_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_share_allowedusers_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
return NT_STATUS_OK;
}
-static int rpc_share_allowedusers(int argc, const char **argv)
+static int rpc_share_allowedusers(struct net_context *c, int argc,
+ const char **argv)
{
int result;
- result = run_rpc_command(NULL, PI_SAMR, 0,
+ result = run_rpc_command(c, NULL, PI_SAMR, 0,
rpc_aliaslist_internals,
argc, argv);
if (result != 0)
return result;
- result = run_rpc_command(NULL, PI_LSARPC, 0,
+ result = run_rpc_command(c, NULL, PI_LSARPC, 0,
rpc_aliaslist_dump,
argc, argv);
if (result != 0)
return result;
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_allowedusers_internals,
argc, argv);
}
-int net_usersidlist(int argc, const char **argv)
+int net_usersidlist(struct net_context *c, int argc, const char **argv)
{
int num_tokens = 0;
struct user_token *tokens = NULL;
int i;
if (argc != 0) {
- net_usersidlist_usage(argc, argv);
+ net_usersidlist_usage(c, argc, argv);
return 0;
}
- if (!get_user_tokens(&num_tokens, &tokens)) {
+ if (!get_user_tokens(c, &num_tokens, &tokens)) {
DEBUG(0, ("Could not get the user/sid list\n"));
return 0;
}
return 1;
}
-int net_usersidlist_usage(int argc, const char **argv)
+int net_usersidlist_usage(struct net_context *c, int argc, const char **argv)
{
d_printf("net usersidlist\n"
"\tprints out a list of all users the running winbind knows\n"
"\tabout, together with all their SIDs. This is used as\n"
"\tinput to the 'net rpc share allowedusers' command.\n\n");
- net_common_flags_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
* stripped
**/
-int net_rpc_share(int argc, const char **argv)
+int net_rpc_share(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"add", rpc_share_add},
};
if (argc == 0)
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_share_list_internals,
argc, argv);
- return net_run_function(argc, argv, func, rpc_share_usage);
+ return net_run_function(c, argc, argv, func, rpc_share_usage);
}
-static NTSTATUS rpc_sh_share_list(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_share_list(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- return rpc_share_list_internals(ctx->domain_sid, ctx->domain_name,
+ return rpc_share_list_internals(c, ctx->domain_sid, ctx->domain_name,
ctx->cli, pipe_hnd, mem_ctx,
argc, argv);
}
-static NTSTATUS rpc_sh_share_add(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_share_add(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
WERROR result;
+ NTSTATUS status;
+ uint32_t parm_err = 0;
+ union srvsvc_NetShareInfo info;
+ struct srvsvc_NetShareInfo2 info2;
if ((argc < 2) || (argc > 3)) {
d_fprintf(stderr, "usage: %s <share> <path> [comment]\n",
return NT_STATUS_INVALID_PARAMETER;
}
- result = rpccli_srvsvc_net_share_add(
- pipe_hnd, mem_ctx, argv[0], STYPE_DISKTREE,
- (argc == 3) ? argv[2] : "",
- 0, 0, 0, argv[1], NULL, 2, NULL);
-
- return werror_to_ntstatus(result);
+ info2.name = argv[0];
+ info2.type = STYPE_DISKTREE;
+ info2.comment = (argc == 3) ? argv[2] : "";
+ info2.permissions = 0;
+ info2.max_users = 0;
+ info2.current_users = 0;
+ info2.path = argv[1];
+ info2.password = NULL;
+
+ info.info2 = &info2;
+
+ status = rpccli_srvsvc_NetShareAdd(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ 2,
+ &info,
+ &parm_err,
+ &result);
+
+ return status;
}
-static NTSTATUS rpc_sh_share_delete(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_share_delete(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
WERROR result;
+ NTSTATUS status;
if (argc != 1) {
d_fprintf(stderr, "usage: %s <share>\n", ctx->whoami);
return NT_STATUS_INVALID_PARAMETER;
}
- result = rpccli_srvsvc_net_share_del(pipe_hnd, mem_ctx, argv[0]);
- return werror_to_ntstatus(result);
+ status = rpccli_srvsvc_NetShareDel(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ argv[0],
+ 0,
+ &result);
+
+ return status;
}
-static NTSTATUS rpc_sh_share_info(TALLOC_CTX *mem_ctx,
+static NTSTATUS rpc_sh_share_info(struct net_context *c,
+ TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx,
struct rpc_pipe_client *pipe_hnd,
int argc, const char **argv)
{
- SRV_SHARE_INFO info;
- SRV_SHARE_INFO_2 *info2 = &info.share.info2;
+ union srvsvc_NetShareInfo info;
WERROR result;
+ NTSTATUS status;
if (argc != 1) {
d_fprintf(stderr, "usage: %s <share>\n", ctx->whoami);
return NT_STATUS_INVALID_PARAMETER;
}
- result = rpccli_srvsvc_net_share_get_info(
- pipe_hnd, mem_ctx, argv[0], 2, &info);
- if (!W_ERROR_IS_OK(result)) {
+ status = rpccli_srvsvc_NetShareGetInfo(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ argv[0],
+ 2,
+ &info,
+ &result);
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
goto done;
}
- d_printf("Name: %s\n",
- rpcstr_pull_unistr2_talloc(mem_ctx,
- &info2->info_2_str.uni_netname));
- d_printf("Comment: %s\n",
- rpcstr_pull_unistr2_talloc(mem_ctx,
- &info2->info_2_str.uni_remark));
-
- d_printf("Path: %s\n",
- rpcstr_pull_unistr2_talloc(mem_ctx,
- &info2->info_2_str.uni_path));
- d_printf("Password: %s\n",
- rpcstr_pull_unistr2_talloc(mem_ctx,
- &info2->info_2_str.uni_passwd));
+ d_printf("Name: %s\n", info.info2->name);
+ d_printf("Comment: %s\n", info.info2->comment);
+ d_printf("Path: %s\n", info.info2->path);
+ d_printf("Password: %s\n", info.info2->password);
done:
return werror_to_ntstatus(result);
}
-struct rpc_sh_cmd *net_rpc_share_cmds(TALLOC_CTX *mem_ctx,
+struct rpc_sh_cmd *net_rpc_share_cmds(struct net_context *c, TALLOC_CTX *mem_ctx,
struct rpc_sh_ctx *ctx)
{
static struct rpc_sh_cmd cmds[] = {
/****************************************************************************/
-static int rpc_file_usage(int argc, const char **argv)
+static int rpc_file_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_file(argc, argv);
+ return net_help_file(c, argc, argv);
}
/**
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passes through.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid acquired from the remote server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on completion of the function.
*
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_file_close_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_file_close_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
const char **argv)
{
return rpccli_srvsvc_NetFileClose(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
atoi(argv[0]), NULL);
}
*
* @return A shell status integer (0 for success)
**/
-static int rpc_file_close(int argc, const char **argv)
+static int rpc_file_close(struct net_context *c, int argc, const char **argv)
{
if (argc < 1) {
DEBUG(1, ("No fileid given on close\n"));
- return(rpc_file_usage(argc, argv));
+ return rpc_file_usage(c, argc, argv);
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_file_close_internals,
argc, argv);
}
/**
* Formatted print of open file info
*
- * @param info3 FILE_INFO_3 contents
- * @param str3 strings for FILE_INFO_3
+ * @param r struct srvsvc_NetFileInfo3 contents
**/
-static void display_file_info_3( FILE_INFO_3 *info3 )
+static void display_file_info_3(struct srvsvc_NetFileInfo3 *r)
{
- fstring user = "", path = "";
-
- rpcstr_pull_unistr2_fstring(user, info3->user);
- rpcstr_pull_unistr2_fstring(path, info3->path);
-
d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
- info3->id, user, info3->perms, info3->num_locks, path);
+ r->fid, r->user, r->permissions, r->num_locks, r->path);
}
/**
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passes through.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid acquired from the remote server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on completion of the function.
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_file_list_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_file_list_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
int argc,
const char **argv)
{
- SRV_FILE_INFO_CTR ctr;
+ struct srvsvc_NetFileInfoCtr info_ctr;
+ struct srvsvc_NetFileCtr3 ctr3;
WERROR result;
- ENUM_HND hnd;
+ NTSTATUS status;
uint32 preferred_len = 0xffffffff, i;
const char *username=NULL;
-
- init_enum_hnd(&hnd, 0);
+ uint32_t total_entries = 0;
+ uint32_t resume_handle = 0;
/* if argc > 0, must be user command */
if (argc > 0)
username = smb_xstrdup(argv[0]);
-
- result = rpccli_srvsvc_net_file_enum(pipe_hnd,
- mem_ctx, 3, username, &ctr, preferred_len, &hnd);
- if (!W_ERROR_IS_OK(result))
+ ZERO_STRUCT(info_ctr);
+ ZERO_STRUCT(ctr3);
+
+ info_ctr.level = 3;
+ info_ctr.ctr.ctr3 = &ctr3;
+
+ status = rpccli_srvsvc_NetFileEnum(pipe_hnd, mem_ctx,
+ pipe_hnd->desthost,
+ NULL,
+ username,
+ &info_ctr,
+ preferred_len,
+ &total_entries,
+ &resume_handle,
+ &result);
+
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result))
goto done;
/* Display results */
"\nEnumerating open files on remote server:\n\n"\
"\nFileId Opened by Perms Locks Path"\
"\n------ --------- ----- ----- ---- \n");
- for (i = 0; i < ctr.num_entries; i++)
- display_file_info_3(&ctr.file.info3[i]);
+ for (i = 0; i < total_entries; i++)
+ display_file_info_3(&info_ctr.ctr.ctr3->array[i]);
done:
return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
}
* @return A shell status integer (0 for success)
**/
-static int rpc_file_user(int argc, const char **argv)
+static int rpc_file_user(struct net_context *c, int argc, const char **argv)
{
if (argc < 1) {
DEBUG(1, ("No username given\n"));
- return(rpc_file_usage(argc, argv));
+ return rpc_file_usage(c, argc, argv);
}
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_file_list_internals,
argc, argv);
}
* stripped
**/
-int net_rpc_file(int argc, const char **argv)
+int net_rpc_file(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"close", rpc_file_close},
};
if (argc == 0)
- return run_rpc_command(NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, PI_SRVSVC, 0,
rpc_file_list_internals,
argc, argv);
- return net_run_function(argc, argv, func, rpc_file_usage);
+ return net_run_function(c, argc, argv, func, rpc_file_usage);
}
/**
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passed through.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid aquired from the remote server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on compleation of the function.
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_shutdown_abort_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_shutdown_abort_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passed through.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid aquired from the remote server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on compleation of the function.
* @return Normal NTSTATUS return.
**/
-static NTSTATUS rpc_reg_shutdown_abort_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_reg_shutdown_abort_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
* @return A shell status integer (0 for success)
**/
-static int rpc_shutdown_abort(int argc, const char **argv)
+static int rpc_shutdown_abort(struct net_context *c, int argc,
+ const char **argv)
{
- int rc = run_rpc_command(NULL, PI_INITSHUTDOWN, 0,
+ int rc = run_rpc_command(c, NULL, PI_INITSHUTDOWN, 0,
rpc_shutdown_abort_internals,
argc, argv);
DEBUG(1, ("initshutdown pipe didn't work, trying winreg pipe\n"));
- return run_rpc_command(NULL, PI_WINREG, 0,
+ return run_rpc_command(c, NULL, PI_WINREG, 0,
rpc_reg_shutdown_abort_internals,
argc, argv);
}
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passes through.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid aquired from the remote server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on compleation of the function.
* @return Normal NTSTATUS return.
**/
-NTSTATUS rpc_init_shutdown_internals(const DOM_SID *domain_sid,
+NTSTATUS rpc_init_shutdown_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
struct initshutdown_String msg_string;
struct initshutdown_String_sub s;
- if (opt_comment) {
- msg = opt_comment;
+ if (c->opt_comment) {
+ msg = c->opt_comment;
}
- if (opt_timeout) {
- timeout = opt_timeout;
+ if (c->opt_timeout) {
+ timeout = c->opt_timeout;
}
s.name = msg;
/* create an entry */
result = rpccli_initshutdown_Init(pipe_hnd, mem_ctx, NULL,
- &msg_string, timeout, opt_force, opt_reboot, NULL);
+ &msg_string, timeout, c->opt_force, c->opt_reboot,
+ NULL);
if (NT_STATUS_IS_OK(result)) {
d_printf("\nShutdown of remote machine succeeded\n");
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passes through.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid aquired from the remote server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on compleation of the function.
* @return Normal NTSTATUS return.
**/
-NTSTATUS rpc_reg_shutdown_internals(const DOM_SID *domain_sid,
+NTSTATUS rpc_reg_shutdown_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
NTSTATUS result;
WERROR werr;
- if (opt_comment) {
- msg = opt_comment;
+ if (c->opt_comment) {
+ msg = c->opt_comment;
}
s.name = msg;
msg_string.name = &s;
- if (opt_timeout) {
- timeout = opt_timeout;
+ if (c->opt_timeout) {
+ timeout = c->opt_timeout;
}
/* create an entry */
result = rpccli_winreg_InitiateSystemShutdown(pipe_hnd, mem_ctx, NULL,
- &msg_string, timeout, opt_force, opt_reboot, &werr);
+ &msg_string, timeout, c->opt_force, c->opt_reboot,
+ &werr);
if (NT_STATUS_IS_OK(result)) {
d_printf("\nShutdown of remote machine succeeded\n");
* @return A shell status integer (0 for success)
**/
-static int rpc_shutdown(int argc, const char **argv)
+static int rpc_shutdown(struct net_context *c, int argc, const char **argv)
{
- int rc = run_rpc_command(NULL, PI_INITSHUTDOWN, 0,
+ int rc = run_rpc_command(c, NULL, PI_INITSHUTDOWN, 0,
rpc_init_shutdown_internals,
argc, argv);
if (rc) {
DEBUG(1, ("initshutdown pipe failed, trying winreg pipe\n"));
- rc = run_rpc_command(NULL, PI_WINREG, 0,
+ rc = run_rpc_command(c, NULL, PI_WINREG, 0,
rpc_reg_shutdown_internals, argc, argv);
}
/***************************************************************************
NT Domain trusts code (i.e. 'net rpc trustdom' functionality)
-
***************************************************************************/
/**
* All parameters (except for argc and argv) are passed by run_rpc_command
* function.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid acquired from the server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on completion of the function.
* @return normal NTSTATUS return code
*/
-static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get samr policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
{
NTTIME notime;
struct samr_LogonHours hours;
+ struct lsa_BinaryString parameters;
const int units_per_week = 168;
uchar pwbuf[516];
encode_pw_buffer(pwbuf, argv[1], STR_UNICODE);
ZERO_STRUCT(notime);
-
ZERO_STRUCT(hours);
+ ZERO_STRUCT(parameters);
+
hours.bits = talloc_array(mem_ctx, uint8_t, units_per_week);
if (!hours.bits) {
result = NT_STATUS_NO_MEMORY;
notime, notime, notime,
notime, notime, notime,
NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, ¶meters,
0, 0, ACB_DOMTRUST, SAMR_FIELD_ACCT_FLAGS,
hours,
0, 0, 0, 0, 0, 0, 0,
* @return Integer status (0 means success)
**/
-static int rpc_trustdom_add(int argc, const char **argv)
+static int rpc_trustdom_add(struct net_context *c, int argc, const char **argv)
{
if (argc > 0) {
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_trustdom_add_internals,
- argc, argv);
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
+ rpc_trustdom_add_internals, argc, argv);
} else {
d_printf("Usage: net rpc trustdom add <domain>\n");
return -1;
* All parameters (except for argc and argv) are passed by run_rpc_command
* function.
*
+ * @param c A net_context structure
* @param domain_sid The domain sid acquired from the server
* @param cli A cli_state connected to the server.
* @param mem_ctx Talloc context, destoyed on completion of the function.
* @return normal NTSTATUS return code
*/
-static NTSTATUS rpc_trustdom_del_internals(const DOM_SID *domain_sid,
+static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
/* Get samr policy handle */
result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
MAXIMUM_ALLOWED_ACCESS,
&connect_pol);
if (!NT_STATUS_IS_OK(result)) {
* @return Integer status (0 means success)
**/
-static int rpc_trustdom_del(int argc, const char **argv)
+static int rpc_trustdom_del(struct net_context *c, int argc, const char **argv)
{
if (argc > 0) {
- return run_rpc_command(NULL, PI_SAMR, 0, rpc_trustdom_del_internals,
- argc, argv);
+ return run_rpc_command(c, NULL, PI_SAMR, 0,
+ rpc_trustdom_del_internals, argc, argv);
} else {
d_printf("Usage: net rpc trustdom del <domain>\n");
return -1;
}
}
-
+
+static NTSTATUS rpc_trustdom_get_pdc(struct net_context *c,
+ struct cli_state *cli,
+ TALLOC_CTX *mem_ctx,
+ const char *domain_name)
+{
+ char *dc_name = NULL;
+ const char *buffer = NULL;
+ struct rpc_pipe_client *netr;
+ NTSTATUS status;
+
+ /* Use NetServerEnum2 */
+
+ if (cli_get_pdc_name(cli, domain_name, &dc_name)) {
+ SAFE_FREE(dc_name);
+ return NT_STATUS_OK;
+ }
+
+ DEBUG(1,("NetServerEnum2 error: Couldn't find primary domain controller\
+ for domain %s\n", domain_name));
+
+ /* Try netr_GetDcName */
+
+ netr = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON, &status);
+ if (!netr) {
+ return status;
+ }
+
+ status = rpccli_netr_GetDcName(netr, mem_ctx,
+ cli->desthost,
+ domain_name,
+ &buffer,
+ NULL);
+ TALLOC_FREE(netr);
+
+ if (NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ DEBUG(1,("netr_GetDcName error: Couldn't find primary domain controller\
+ for domain %s\n", domain_name));
+
+ return status;
+}
/**
* Establish trust relationship to a trusting domain.
* Interdomain account must already be created on remote PDC.
*
+ * @param c A net_context structure
* @param argc standard argc
* @param argv standard argv without initial components
*
* @return Integer status (0 means success)
**/
-static int rpc_trustdom_establish(int argc, const char **argv)
+static int rpc_trustdom_establish(struct net_context *c, int argc,
+ const char **argv)
{
struct cli_state *cli = NULL;
struct sockaddr_storage server_ss;
char* domain_name;
char* acct_name;
fstring pdc_name;
- char *dc_name;
union lsa_PolicyInformation *info = NULL;
/*
* opt_workgroup will be used by connection functions further,
* hence it should be set to remote domain name instead of ours
*/
- if (opt_workgroup) {
- opt_workgroup = smb_xstrdup(domain_name);
+ if (c->opt_workgroup) {
+ c->opt_workgroup = smb_xstrdup(domain_name);
};
- opt_user_name = acct_name;
+ c->opt_user_name = acct_name;
/* find the domain controller */
if (!net_find_pdc(&server_ss, pdc_name, domain_name)) {
}
/* connect to ipc$ as username/password */
- nt_status = connect_to_ipc(&cli, &server_ss, pdc_name);
+ nt_status = connect_to_ipc(c, &cli, &server_ss, pdc_name);
if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT)) {
/* Is it trusting domain account for sure ? */
* Connect to \\server\ipc$ again (this time anonymously)
*/
- nt_status = connect_to_ipc_anonymous(&cli, &server_ss, (char*)pdc_name);
+ nt_status = connect_to_ipc_anonymous(c, &cli, &server_ss,
+ (char*)pdc_name);
if (NT_STATUS_IS_ERR(nt_status)) {
DEBUG(0, ("Couldn't connect to domain %s controller. Error was %s.\n",
return -1;
}
- /*
- * Use NetServerEnum2 to make sure we're talking to a proper server
- */
-
- if (!cli_get_pdc_name(cli, domain_name, &dc_name)) {
- DEBUG(0, ("NetServerEnum2 error: Couldn't find primary domain controller\
- for domain %s\n", domain_name));
- cli_shutdown(cli);
- return -1;
- }
- SAFE_FREE(dc_name);
-
if (!(mem_ctx = talloc_init("establishing trust relationship to "
"domain %s", domain_name))) {
DEBUG(0, ("talloc_init() failed\n"));
return -1;
}
+ /* Make sure we're talking to a proper server */
+
+ nt_status = rpc_trustdom_get_pdc(c, cli, mem_ctx, domain_name);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ cli_shutdown(cli);
+ talloc_destroy(mem_ctx);
+ return -1;
+ }
+
/*
* Call LsaOpenPolicy and LsaQueryInfo
*/
* Store the password in secrets db
*/
- if (!pdb_set_trusteddom_pw(domain_name, opt_password, domain_sid)) {
+ if (!pdb_set_trusteddom_pw(domain_name, c->opt_password, domain_sid)) {
DEBUG(0, ("Storing password for trusted domain failed.\n"));
cli_shutdown(cli);
talloc_destroy(mem_ctx);
/**
* Revoke trust relationship to the remote domain
*
+ * @param c A net_context structure
* @param argc standard argc
* @param argv standard argv without initial components
*
* @return Integer status (0 means success)
**/
-static int rpc_trustdom_revoke(int argc, const char **argv)
+static int rpc_trustdom_revoke(struct net_context *c, int argc,
+ const char **argv)
{
char* domain_name;
int rc = -1;
* @return Integer status returned to shell
**/
-static int rpc_trustdom_usage(int argc, const char **argv)
+static int rpc_trustdom_usage(struct net_context *c, int argc,
+ const char **argv)
{
d_printf(" net rpc trustdom add \t\t add trusting domain's account\n");
d_printf(" net rpc trustdom del \t\t delete trusting domain's account\n");
}
-static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid,
+static NTSTATUS rpc_query_domain_sid(struct net_context *c,
+ const DOM_SID *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
const char *trusted_dom_name)
{
NTSTATUS nt_status;
- union lsa_TrustedDomainInfo info;
+ union lsa_TrustedDomainInfo *info = NULL;
char *cleartextpwd = NULL;
+ uint8_t nt_hash[16];
DATA_BLOB data;
nt_status = rpccli_lsa_QueryTrustedDomainInfoBySid(pipe_hnd, mem_ctx,
goto done;
}
- data = data_blob(NULL, info.password.password->length);
+ data = data_blob(info->password.password->data,
+ info->password.password->length);
- memcpy(data.data,
- info.password.password->data,
- info.password.password->length);
- data.length = info.password.password->length;
+ if (!rpccli_get_pwd_hash(pipe_hnd, nt_hash)) {
+ DEBUG(0, ("Could not retrieve password hash\n"));
+ goto done;
+ }
- cleartextpwd = decrypt_trustdom_secret(pipe_hnd->cli->pwd.password,
- &data);
+ cleartextpwd = decrypt_trustdom_secret(nt_hash, &data);
if (cleartextpwd == NULL) {
DEBUG(0,("retrieved NULL password\n"));
}
#ifdef DEBUG_PASSWORD
- DEBUG(100,("sucessfully vampired trusted domain [%s], sid: [%s], "
+ DEBUG(100,("successfully vampired trusted domain [%s], sid: [%s], "
"password: [%s]\n", trusted_dom_name,
sid_string_dbg(&dom_sid), cleartextpwd));
#endif
return nt_status;
}
-static int rpc_trustdom_vampire(int argc, const char **argv)
+static int rpc_trustdom_vampire(struct net_context *c, int argc,
+ const char **argv)
{
/* common variables */
TALLOC_CTX* mem_ctx;
* or to remote one given in command line
*/
- if (StrCaseCmp(opt_workgroup, lp_workgroup())) {
- domain_name = opt_workgroup;
- opt_target_workgroup = opt_workgroup;
+ if (StrCaseCmp(c->opt_workgroup, lp_workgroup())) {
+ domain_name = c->opt_workgroup;
+ c->opt_target_workgroup = c->opt_workgroup;
} else {
fstrcpy(pdc_name, global_myname());
domain_name = talloc_strdup(mem_ctx, lp_workgroup());
- opt_target_workgroup = domain_name;
+ c->opt_target_workgroup = domain_name;
};
/* open \PIPE\lsarpc and open policy handle */
- nt_status = net_make_ipc_connection(NET_FLAGS_PDC, &cli);
+ nt_status = net_make_ipc_connection(c, NET_FLAGS_PDC, &cli);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Couldn't connect to domain controller: %s\n",
nt_errstr(nt_status)));
return 0;
}
-static int rpc_trustdom_list(int argc, const char **argv)
+static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
{
/* common variables */
TALLOC_CTX* mem_ctx;
* or to remote one given in command line
*/
- if (StrCaseCmp(opt_workgroup, lp_workgroup())) {
- domain_name = opt_workgroup;
- opt_target_workgroup = opt_workgroup;
+ if (StrCaseCmp(c->opt_workgroup, lp_workgroup())) {
+ domain_name = c->opt_workgroup;
+ c->opt_target_workgroup = c->opt_workgroup;
} else {
fstrcpy(pdc_name, global_myname());
domain_name = talloc_strdup(mem_ctx, lp_workgroup());
- opt_target_workgroup = domain_name;
+ c->opt_target_workgroup = domain_name;
};
/* open \PIPE\lsarpc and open policy handle */
- nt_status = net_make_ipc_connection(NET_FLAGS_PDC, &cli);
+ nt_status = net_make_ipc_connection(c, NET_FLAGS_PDC, &cli);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Couldn't connect to domain controller: %s\n",
nt_errstr(nt_status)));
return -1;
};
- cli_rpc_pipe_close(pipe_hnd);
+ TALLOC_FREE(pipe_hnd);
/*
* Listing trusting domains (stored in passdb backend, if local)
/* SamrConnect2 */
nt_status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->cli->desthost,
+ pipe_hnd->desthost,
SA_RIGHT_SAM_OPEN_DOMAIN,
&connect_hnd);
if (!NT_STATUS_IS_OK(nt_status)) {
/* set opt_* variables to remote domain */
strupper_m(str);
- opt_workgroup = talloc_strdup(mem_ctx, str);
- opt_target_workgroup = opt_workgroup;
+ c->opt_workgroup = talloc_strdup(mem_ctx, str);
+ c->opt_target_workgroup = c->opt_workgroup;
d_printf("%s%s", str, padding);
/* connect to remote domain controller */
- nt_status = net_make_ipc_connection(
+ nt_status = net_make_ipc_connection(c,
NET_FLAGS_PDC | NET_FLAGS_ANONYMOUS,
&remote_cli);
if (NT_STATUS_IS_OK(nt_status)) {
/* query for domain's sid */
- if (run_rpc_command(remote_cli, PI_LSARPC, 0, rpc_query_domain_sid, argc, argv))
+ if (run_rpc_command(c, remote_cli, PI_LSARPC, 0,
+ rpc_query_domain_sid, argc,
+ argv))
d_fprintf(stderr, "couldn't get domain's sid\n");
cli_shutdown(remote_cli);
* @return Integer status (0 means success)
*/
-static int rpc_trustdom(int argc, const char **argv)
+static int rpc_trustdom(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"add", rpc_trustdom_add},
};
if (argc == 0) {
- rpc_trustdom_usage(argc, argv);
+ rpc_trustdom_usage(c, argc, argv);
return -1;
}
- return (net_run_function(argc, argv, func, rpc_user_usage));
+ return net_run_function(c, argc, argv, func, rpc_user_usage);
}
/**
* if the host is not explicitly specified
* @return bool (true means rpc supported)
*/
-bool net_rpc_check(unsigned flags)
+bool net_rpc_check(struct net_context *c, unsigned flags)
{
struct cli_state *cli;
bool ret = False;
NTSTATUS status;
/* flags (i.e. server type) may depend on command */
- if (!net_find_server(NULL, flags, &server_ss, &server_name))
+ if (!net_find_server(c, NULL, flags, &server_ss, &server_name))
return False;
if ((cli = cli_initialise()) == NULL) {
}
/* dump sam database via samsync rpc calls */
-static int rpc_samdump(int argc, const char **argv) {
- return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS, rpc_samdump_internals,
- argc, argv);
+static int rpc_samdump(struct net_context *c, int argc, const char **argv) {
+ return run_rpc_command(c, NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS,
+ rpc_samdump_internals, argc, argv);
}
/* syncronise sam database via samsync rpc calls */
-static int rpc_vampire(int argc, const char **argv) {
- return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS, rpc_vampire_internals,
- argc, argv);
+static int rpc_vampire(struct net_context *c, int argc, const char **argv) {
+ return run_rpc_command(c, NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS,
+ rpc_vampire_internals, argc, argv);
}
/**
* Migrate everything from a print-server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
* Applying ACLs should be the last step, because you're easily locked out
*
**/
-static int rpc_printer_migrate_all(int argc, const char **argv)
+static int rpc_printer_migrate_all(struct net_context *c, int argc,
+ const char **argv)
{
int ret;
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_printers_internals, argc, argv);
+ ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ rpc_printer_migrate_printers_internals, argc,
+ argv);
if (ret)
return ret;
- ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_drivers_internals, argc, argv);
+ ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ rpc_printer_migrate_drivers_internals, argc,
+ argv);
if (ret)
return ret;
- ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_forms_internals, argc, argv);
+ ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ rpc_printer_migrate_forms_internals, argc, argv);
if (ret)
return ret;
- ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_settings_internals, argc, argv);
+ ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ rpc_printer_migrate_settings_internals, argc,
+ argv);
if (ret)
return ret;
- return run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_security_internals, argc, argv);
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ rpc_printer_migrate_security_internals, argc,
+ argv);
}
/**
* Migrate print-drivers from a print-server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_migrate_drivers(int argc, const char **argv)
+static int rpc_printer_migrate_drivers(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_migrate_drivers_internals,
argc, argv);
}
/**
* Migrate print-forms from a print-server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_migrate_forms(int argc, const char **argv)
+static int rpc_printer_migrate_forms(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_migrate_forms_internals,
argc, argv);
}
/**
* Migrate printers from a print-server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_migrate_printers(int argc, const char **argv)
+static int rpc_printer_migrate_printers(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_migrate_printers_internals,
argc, argv);
}
/**
* Migrate printer-ACLs from a print-server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_migrate_security(int argc, const char **argv)
+static int rpc_printer_migrate_security(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_migrate_security_internals,
argc, argv);
}
/**
* Migrate printer-settings from a print-server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_migrate_settings(int argc, const char **argv)
+static int rpc_printer_migrate_settings(struct net_context *c, int argc,
+ const char **argv)
{
- if (!opt_host) {
+ if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_migrate_settings_internals,
argc, argv);
}
/**
* 'net rpc printer' entrypoint.
+ *
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-int rpc_printer_migrate(int argc, const char **argv)
+int rpc_printer_migrate(struct net_context *c, int argc, const char **argv)
{
/* ouch: when addriver and setdriver are called from within
{NULL, NULL}
};
- return net_run_function(argc, argv, func, rpc_printer_usage);
+ return net_run_function(c, argc, argv, func, rpc_printer_usage);
}
/**
* List printers on a remote RPC server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_list(int argc, const char **argv)
+static int rpc_printer_list(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_list_internals,
argc, argv);
}
/**
* List printer-drivers on a remote RPC server
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_driver_list(int argc, const char **argv)
+static int rpc_printer_driver_list(struct net_context *c, int argc,
+ const char **argv)
{
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_driver_list_internals,
argc, argv);
}
/**
* Publish printer in ADS via MSRPC
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_publish_publish(int argc, const char **argv)
+static int rpc_printer_publish_publish(struct net_context *c, int argc,
+ const char **argv)
{
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_publish_publish_internals,
argc, argv);
}
/**
* Update printer in ADS via MSRPC
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_publish_update(int argc, const char **argv)
+static int rpc_printer_publish_update(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_publish_update_internals,
argc, argv);
}
/**
* UnPublish printer in ADS via MSRPC
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_publish_unpublish(int argc, const char **argv)
+static int rpc_printer_publish_unpublish(struct net_context *c, int argc,
+ const char **argv)
{
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_publish_unpublish_internals,
argc, argv);
}
/**
* List published printers via MSRPC
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_publish_list(int argc, const char **argv)
+static int rpc_printer_publish_list(struct net_context *c, int argc,
+ const char **argv)
{
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_publish_list_internals,
argc, argv);
}
/**
* Publish printer in ADS
*
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
*
* @return A shell status integer (0 for success)
**/
-static int rpc_printer_publish(int argc, const char **argv)
+static int rpc_printer_publish(struct net_context *c, int argc,
+ const char **argv)
{
struct functable func[] = {
};
if (argc == 0)
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_publish_list_internals,
argc, argv);
- return net_run_function(argc, argv, func, rpc_printer_usage);
+ return net_run_function(c, argc, argv, func, rpc_printer_usage);
}
/**
* Display rpc printer help page.
+ *
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-int rpc_printer_usage(int argc, const char **argv)
+int rpc_printer_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_printer(argc, argv);
+ return net_help_printer(c, argc, argv);
}
/**
* 'net rpc printer' entrypoint.
+ *
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-int net_rpc_printer(int argc, const char **argv)
+int net_rpc_printer(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"list", rpc_printer_list},
};
if (argc == 0)
- return run_rpc_command(NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
rpc_printer_list_internals,
argc, argv);
- return net_run_function(argc, argv, func, rpc_printer_usage);
+ return net_run_function(c, argc, argv, func, rpc_printer_usage);
}
/****************************************************************************/
/**
* Basic usage function for 'net rpc'
+ *
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-int net_rpc_usage(int argc, const char **argv)
+int net_rpc_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(" net rpc info \t\t\tshow basic info about a domain \n");
d_printf(" net rpc join \t\t\tto join a domain \n");
/**
* Help function for 'net rpc'. Calls command specific help if requested
* or displays usage of net rpc
+ *
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-int net_rpc_help(int argc, const char **argv)
+int net_rpc_help(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"join", rpc_join_usage},
};
if (argc == 0) {
- net_rpc_usage(argc, argv);
+ net_rpc_usage(c, argc, argv);
return -1;
}
- return (net_run_function(argc, argv, func, rpc_user_usage));
+ return net_run_function(c, argc, argv, func, rpc_user_usage);
}
/**
* 'net rpc' entrypoint.
+ *
+ * @param c A net_context structure
* @param argc Standard main() style argc
* @param argv Standard main() style argv. Initial components are already
* stripped
**/
-int net_rpc(int argc, const char **argv)
+int net_rpc(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
{"audit", net_rpc_audit},
{"help", net_rpc_help},
{NULL, NULL}
};
- return net_run_function(argc, argv, func, net_rpc_usage);
+ return net_run_function(c, argc, argv, func, net_rpc_usage);
}
git.samba.org / kamenim / samba.git / blobdiff