NTSTATUS result = NT_STATUS_OK;
union lsa_PolicyInformation *info = NULL;
- lsa_pipe = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &result);
- if (!lsa_pipe) {
+ result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+ &lsa_pipe);
+ if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, "Could not initialise lsa pipe\n");
return result;
}
* @param pipe_name the pipe to connect to (usually a PIPE_ constant)
* @param conn_flag a NET_FLAG_ combination. Passed to
* net_make_ipc_connection.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
- * @return A shell status integer (0 for success)
+ * @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).
*/
int run_rpc_command(struct net_context *c,
struct cli_state *cli_arg,
- const int pipe_idx,
+ const struct ndr_syntax_id *interface,
int conn_flags,
rpc_command_fn fn,
int argc,
}
if (!(conn_flags & NET_FLAGS_NO_PIPE)) {
- if (lp_client_schannel() && (pipe_idx == PI_NETLOGON)) {
+ if (lp_client_schannel()
+ && (ndr_syntax_id_equal(interface,
+ &ndr_table_netlogon.syntax_id))) {
/* Always try and create an schannel netlogon pipe. */
- pipe_hnd = cli_rpc_pipe_open_schannel(cli, pipe_idx,
- PIPE_AUTH_LEVEL_PRIVACY,
- domain_name,
- &nt_status);
- if (!pipe_hnd) {
+ nt_status = cli_rpc_pipe_open_schannel(
+ cli, interface,
+ PIPE_AUTH_LEVEL_PRIVACY, domain_name,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Could not initialise schannel netlogon pipe. Error was %s\n",
nt_errstr(nt_status) ));
cli_shutdown(cli);
return -1;
}
} else {
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, pipe_idx, &nt_status);
- if (!pipe_hnd) {
+ if (conn_flags & NET_FLAGS_SEAL) {
+ nt_status = cli_rpc_pipe_open_ntlmssp(
+ cli, interface,
+ PIPE_AUTH_LEVEL_PRIVACY,
+ lp_workgroup(), c->opt_user_name,
+ c->opt_password, &pipe_hnd);
+ } else {
+ nt_status = cli_rpc_pipe_open_noauth(
+ cli, interface,
+ &pipe_hnd);
+ }
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Could not initialise pipe %s. Error was %s\n",
- cli_get_pipe_name(pipe_idx),
+ cli_get_pipe_name_from_iface(
+ debug_ctx(), cli, interface),
nt_errstr(nt_status) ));
cli_shutdown(cli);
return -1;
* Force a change of the trust acccount password.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid aquired from the remote server
+ * @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 compleation of the function.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
/**
* Force a change of the trust acccount password.
*
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
int net_rpc_changetrustpw(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc changetrustpw\n"
+ " Change the machine trust password\n");
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id,
+ NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
rpc_changetrustpw_internals,
argc, argv);
}
* The password should be created with 'server manager' or equiv first.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid aquired from the remote server
+ * @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 compleation of the function.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
NTSTATUS result;
uint32 sec_channel_type;
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON, &result);
- if (!pipe_hnd) {
+ result = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(result)) {
DEBUG(0,("rpc_oldjoin_internals: netlogon pipe open to machine %s failed. "
"error was %s\n",
cli->desthost,
/**
* Join a domain, the old way.
*
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int net_rpc_perform_oldjoin(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_NETLOGON,
+ return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id,
NET_FLAGS_NO_PIPE | NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
rpc_oldjoin_internals,
argc, argv);
/**
* Join a domain, the old way. This function exists to allow
* the message to be displayed when oldjoin was explicitly
- * requested, but not when it was implied by "net rpc join"
+ * requested, but not when it was implied by "net rpc join".
*
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int net_rpc_oldjoin(struct net_context *c, int argc, const char **argv)
{
- int rc = net_rpc_perform_oldjoin(c, argc, argv);
+ int rc = -1;
+
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc oldjoin\n"
+ " Join a domain the old way\n");
+ return 0;
+ }
+
+ rc = net_rpc_perform_oldjoin(c, argc, argv);
if (rc) {
d_fprintf(stderr, "Failed to join domain\n");
return rc;
}
-/**
- * Basic usage function for 'net rpc join'
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
- **/
-
-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 password will be prompted if needed and none is specified\n"\
- "\t <type> can be (default MEMBER)\n"\
- "\t\t BDC - Join as a BDC\n"\
- "\t\t PDC - Join as a PDC\n"\
- "\t\t MEMBER - Join as a MEMBER server\n");
-
- net_common_flags_usage(c, argc, argv);
- return -1;
-}
-
/**
* 'net rpc join' entrypoint.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
* stripped
*
* Main 'net_rpc_join()' (where the admin username/password is used) is
- * in net_rpc_join.c
+ * in net_rpc_join.c.
* Try to just change the password, but if that doesn't work, use/prompt
* for a username/password.
**/
int net_rpc_join(struct net_context *c, int argc, const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc join -U <username>[%%password] <type>\n"
+ " Join a domain\n"
+ " username\tName of the admin user"
+ " password\tPassword of the admin user, will "
+ "prompt if not specified\n"
+ " type\tCan be one of the following:\n"
+ "\t\tMEMBER\tJoin as member server (default)\n"
+ "\t\tBDC\tJoin as BDC\n"
+ "\t\tPDC\tJoin as PDC\n");
+ return 0;
+ }
+
if (lp_server_role() == ROLE_STANDALONE) {
d_printf("cannot join as standalone machine\n");
return -1;
*
* @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
/**
* 'net rpc info' entrypoint.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
int net_rpc_info(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, NET_FLAGS_PDC,
- rpc_info_internals,
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc info\n"
+ " Display information about the domain\n");
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id,
+ NET_FLAGS_PDC, rpc_info_internals,
argc, argv);
}
/**
- * Fetch domain SID into the local secrets.tdb
+ * Fetch domain SID into the local secrets.tdb.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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 thea function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
/**
* 'net rpc getsid' entrypoint.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR,
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc getsid\n"
+ " Fetch domain SID into local secrets.tdb\n");
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id,
NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
rpc_getsid_internals,
argc, argv);
/****************************************************************************/
/**
- * Basic usage function for 'net rpc user'
+ * Basic usage function for 'net rpc user'.
* @param argc Standard main() style argc.
- * @param argv Standard main() style argv. Initial components are already
+ * @param argv Standard main() style argv. Initial components are already
* stripped.
**/
}
/**
- * Add a new user to a remote RPC server
+ * Add a new user to a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_user_add(struct net_context *c, int argc, const char **argv)
struct USER_INFO_1 info1;
uint32_t parm_error = 0;
- if (argc < 1) {
- d_printf("User must be specified\n");
+ if (argc < 1 || c->display_usage) {
rpc_user_usage(c, argc, argv);
return 0;
}
}
/**
- * Rename a user on a remote RPC server
+ * Rename a user on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
struct lsa_String lsa_acct_name;
union samr_UserInfo *info = NULL;
- if (argc != 2) {
- d_printf("Old and new username must be specified\n");
+ if (argc != 2 || c->display_usage) {
rpc_user_usage(c, argc, argv);
return NT_STATUS_OK;
}
}
/**
- * Rename a user on a remote RPC server
+ * Rename a user on a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_user_rename(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_user_rename_internals,
- argc, argv);
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
+ rpc_user_rename_internals, argc, argv);
}
/**
- * Delete a user from a remote RPC server
+ * Delete a user from a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_user_delete(struct net_context *c, int argc, const char **argv)
{
NET_API_STATUS status;
- if (argc < 1) {
- d_printf("User must be specified\n");
+ if (argc < 1 || c->display_usage) {
rpc_user_usage(c, argc, argv);
return 0;
}
}
/**
- * Set a password for a user on a remote RPC server
+ * Set a password for a user on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
char *prompt = NULL;
union samr_UserInfo info;
- if (argc < 1) {
- d_printf("User must be specified\n");
+ if (argc < 1 || c->display_usage) {
rpc_user_usage(c, argc, argv);
return NT_STATUS_OK;
}
}
/**
- * Set a user's password on a remote RPC server
+ * Set a user's password on a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_user_password(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_user_password_internals,
- argc, argv);
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
+ rpc_user_password_internals, argc, argv);
}
/**
- * List user's groups on a remote RPC server
+ * List user's groups on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
struct lsa_String lsa_acct_name;
- if (argc < 1) {
- d_printf("User must be specified\n");
+ if (argc < 1 || c->display_usage) {
rpc_user_usage(c, argc, argv);
return NT_STATUS_OK;
}
}
/**
- * List a user's groups from a remote RPC server
+ * List a user's groups from a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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_user_info(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_user_info_internals,
- argc, argv);
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
+ rpc_user_info_internals, argc, argv);
}
/**
- * List users on a remote RPC server
+ * List users on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
/* Query domain users */
if (c->opt_long_list_entries)
- d_printf("\nUser name Comment"\
+ d_printf("\nUser name Comment"
"\n-----------------------------\n");
do {
const char *user = NULL;
/**
* 'net rpc user' entrypoint.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
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},
- {"delete", rpc_user_delete},
- {"password", rpc_user_password},
- {"rename", rpc_user_rename},
- {NULL, NULL}
+ {
+ "add",
+ rpc_user_add,
+ NET_TRANSPORT_RPC,
+ "Add specified user",
+ "net rpc user add\n"
+ " Add specified user"
+ },
+ {
+ "info",
+ rpc_user_info,
+ NET_TRANSPORT_RPC,
+ "List domain groups of user",
+ "net rpc user info\n"
+ " Lis domain groups of user"
+ },
+ {
+ "delete",
+ rpc_user_delete,
+ NET_TRANSPORT_RPC,
+ "Remove specified user",
+ "net rpc user delete\n"
+ " Remove specified user"
+ },
+ {
+ "password",
+ rpc_user_password,
+ NET_TRANSPORT_RPC,
+ "Change user password",
+ "net rpc user password\n"
+ " Change user password"
+ },
+ {
+ "rename",
+ rpc_user_rename,
+ NET_TRANSPORT_RPC,
+ "Rename specified user",
+ "net rpc user rename\n"
+ " Rename specified user"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
status = libnetapi_init(&c->netapi_ctx);
libnetapi_set_password(c->netapi_ctx, c->opt_password);
if (argc == 0) {
- return run_rpc_command(c, NULL,PI_SAMR, 0,
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rpc user\n"
+ " List all users\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_user_list_internals,
argc, argv);
}
- return net_run_function(c, argc, argv, func, rpc_user_usage);
+ return net_run_function(c, argc, argv, "net rpc user", func);
}
static NTSTATUS rpc_sh_user_list(struct net_context *c,
{
static struct rpc_sh_cmd cmds[] = {
- { "fullname", NULL, PI_SAMR, rpc_sh_user_str_edit,
+ { "fullname", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit,
"Show/Set a user's full name" },
- { "homedir", NULL, PI_SAMR, rpc_sh_user_str_edit,
+ { "homedir", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit,
"Show/Set a user's home directory" },
- { "homedrive", NULL, PI_SAMR, rpc_sh_user_str_edit,
+ { "homedrive", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit,
"Show/Set a user's home drive" },
- { "logonscript", NULL, PI_SAMR, rpc_sh_user_str_edit,
+ { "logonscript", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit,
"Show/Set a user's logon script" },
- { "profilepath", NULL, PI_SAMR, rpc_sh_user_str_edit,
+ { "profilepath", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit,
"Show/Set a user's profile path" },
- { "description", NULL, PI_SAMR, rpc_sh_user_str_edit,
+ { "description", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_str_edit,
"Show/Set a user's description" },
- { "disabled", NULL, PI_SAMR, rpc_sh_user_flag_edit,
+ { "disabled", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit,
"Show/Set whether a user is disabled" },
- { "autolock", NULL, PI_SAMR, rpc_sh_user_flag_edit,
+ { "autolock", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit,
"Show/Set whether a user locked out" },
- { "pwnotreq", NULL, PI_SAMR, rpc_sh_user_flag_edit,
+ { "pwnotreq", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit,
"Show/Set whether a user does not need a password" },
- { "pwnoexp", NULL, PI_SAMR, rpc_sh_user_flag_edit,
+ { "pwnoexp", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_flag_edit,
"Show/Set whether a user's password does not expire" },
{ NULL, NULL, 0, NULL, NULL }
{
static struct rpc_sh_cmd cmds[] = {
- { "list", NULL, PI_SAMR, rpc_sh_user_list,
+ { "list", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_list,
"List available users" },
- { "info", NULL, PI_SAMR, rpc_sh_user_info,
+ { "info", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_info,
"List the domain groups a user is member of" },
- { "show", NULL, PI_SAMR, rpc_sh_user_show,
+ { "show", NULL, &ndr_table_samr.syntax_id, rpc_sh_user_show,
"Show info about a user" },
{ "edit", net_rpc_user_edit_cmds, 0, NULL,
/****************************************************************************/
/**
- * Basic usage function for 'net rpc group'
+ * Basic usage function for 'net rpc group'.
* @param argc Standard main() style argc.
- * @param argv Standard main() style argv. Initial components are already
+ * @param argv Standard main() style argv. Initial components are already
* stripped.
**/
}
/**
- * Delete group on a remote RPC server
+ * Delete group on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
struct lsa_String lsa_acct_name;
union samr_UserInfo *info = NULL;
- if (argc < 1) {
- d_printf("specify group\n");
+ if (argc < 1 || c->display_usage) {
rpc_group_usage(c, argc,argv);
return NT_STATUS_OK; /* ok? */
}
static int rpc_group_delete(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0, rpc_group_delete_internals,
- argc,argv);
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
+ rpc_group_delete_internals, argc,argv);
}
-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,
- TALLOC_CTX *mem_ctx,
- int argc,
- const char **argv)
+static int rpc_group_add_internals(struct net_context *c, int argc, const char **argv)
{
- POLICY_HND connect_pol, domain_pol, group_pol;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- union samr_GroupInfo group_info;
- struct lsa_String grp_name;
- uint32_t rid = 0;
+ NET_API_STATUS status;
+ struct GROUP_INFO_1 info1;
+ uint32_t parm_error = 0;
- if (argc != 1) {
- d_printf("Group name must be specified\n");
+ if (argc != 1 || c->display_usage) {
rpc_group_usage(c, argc, argv);
- return NT_STATUS_OK;
+ return 0;
}
- init_lsa_String(&grp_name, argv[0]);
-
- /* Get sam policy handle */
-
- result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->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 the group */
-
- result = rpccli_samr_CreateDomainGroup(pipe_hnd, mem_ctx,
- &domain_pol,
- &grp_name,
- MAXIMUM_ALLOWED_ACCESS,
- &group_pol,
- &rid);
- if (!NT_STATUS_IS_OK(result)) goto done;
-
- if (strlen(c->opt_comment) == 0) goto done;
-
- /* We've got a comment to set */
+ ZERO_STRUCT(info1);
- init_lsa_String(&group_info.description, c->opt_comment);
+ info1.grpi1_name = argv[0];
+ if (c->opt_comment && strlen(c->opt_comment) > 0) {
+ info1.grpi1_comment = c->opt_comment;
+ }
- result = rpccli_samr_SetGroupInfo(pipe_hnd, mem_ctx,
- &group_pol,
- 4,
- &group_info);
- if (!NT_STATUS_IS_OK(result)) goto done;
+ status = NetGroupAdd(c->opt_host, 1, (uint8_t *)&info1, &parm_error);
- done:
- if (NT_STATUS_IS_OK(result))
- DEBUG(5, ("add group succeeded\n"));
- else
- d_fprintf(stderr, "add group failed: %s\n", nt_errstr(result));
+ if (status != 0) {
+ d_fprintf(stderr, "Failed to add group '%s' with: %s.\n",
+ argv[0], libnetapi_get_error_string(c->netapi_ctx,
+ status));
+ return -1;
+ } else {
+ d_printf("Added group '%s'.\n", argv[0]);
+ }
- return result;
+ return 0;
}
static NTSTATUS rpc_alias_add_internals(struct net_context *c,
struct lsa_String alias_name;
uint32_t rid = 0;
- if (argc != 1) {
- d_printf("Alias name must be specified\n");
+ if (argc != 1 || c->display_usage) {
rpc_group_usage(c, argc, argv);
return NT_STATUS_OK;
}
static int rpc_group_add(struct net_context *c, int argc, const char **argv)
{
if (c->opt_localgroup)
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_alias_add_internals,
argc, argv);
- return run_rpc_command(c, NULL, PI_SAMR, 0,
- rpc_group_add_internals,
- argc, argv);
+ return rpc_group_add_internals(c, argc, argv);
}
static NTSTATUS get_sid_from_name(struct cli_state *cli,
POLICY_HND lsa_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &result);
- if (!pipe_hnd) {
+ result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(result)) {
goto done;
}
DOM_SID group_sid;
enum lsa_SidType group_type;
- if (argc != 2) {
- d_printf("Usage: 'net rpc group addmem <group> <member>\n");
+ if (argc != 2 || c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc group addmem <group> <member>\n"
+ " Add a member to a group\n"
+ " group\tGroup to add member to\n"
+ " member\tMember to add to group\n");
return NT_STATUS_UNSUCCESSFUL;
}
static int rpc_group_addmem(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_group_addmem_internals,
argc, argv);
}
DOM_SID group_sid;
enum lsa_SidType group_type;
- if (argc != 2) {
- d_printf("Usage: 'net rpc group delmem <group> <member>\n");
+ if (argc != 2 || c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc group delmem <group> <member>\n"
+ " Delete a member from a group\n"
+ " group\tGroup to delete member from\n"
+ " member\tMember to delete from group\n");
return NT_STATUS_UNSUCCESSFUL;
}
static int rpc_group_delmem(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_group_delmem_internals,
argc, argv);
}
/**
- * List groups on a remote RPC server
+ * List groups on 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 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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
bool local = false;
bool builtin = false;
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc group list [global] [local] [builtin]\n"
+ " List groups on RPC server\n"
+ " global\tList global groups\n"
+ " local\tList local groups\n"
+ " builtin\tList builtin groups\n"
+ " If none of global, local or builtin is "
+ "specified, all three options are considered set\n");
+ return NT_STATUS_OK;
+ }
+
if (argc == 0) {
global = true;
local = true;
/* Query domain groups */
if (c->opt_long_list_entries)
- d_printf("\nGroup name Comment"\
+ d_printf("\nGroup name Comment"
"\n-----------------------------\n");
do {
uint32_t max_size, total_size, returned_size;
static int rpc_group_list(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_group_list_internals,
argc, argv);
}
return NT_STATUS_OK;
}
- lsa_pipe = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(pipe_hnd),
- PI_LSARPC, &result);
- if (!lsa_pipe) {
+ result = cli_rpc_pipe_open_noauth(rpc_pipe_np_smb_conn(pipe_hnd),
+ &ndr_table_lsarpc.syntax_id,
+ &lsa_pipe);
+ if (!NT_STATUS_IS_OK(result)) {
d_fprintf(stderr, "Couldn't open LSA pipe. Error was %s\n",
nt_errstr(result) );
return result;
static int rpc_group_members(struct net_context *c, int argc, const char **argv)
{
- if (argc != 1) {
+ if (argc != 1 || c->display_usage) {
return rpc_group_usage(c, argc, argv);
}
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_group_members_internals,
argc, argv);
}
-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,
- TALLOC_CTX *mem_ctx,
- int argc,
- const char **argv)
+static int rpc_group_rename_internals(struct net_context *c, int argc, const char **argv)
{
- NTSTATUS result;
- POLICY_HND connect_pol, domain_pol, group_pol;
- union samr_GroupInfo group_info;
- struct samr_Ids rids, rid_types;
- struct lsa_String lsa_acct_name;
+ NET_API_STATUS status;
+ struct GROUP_INFO_0 g0;
+ uint32_t parm_err;
if (argc != 2) {
d_printf("Usage: 'net rpc group rename group newname'\n");
- return NT_STATUS_UNSUCCESSFUL;
+ return -1;
}
- /* Get sam policy handle */
-
- result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
- pipe_hnd->desthost,
- MAXIMUM_ALLOWED_ACCESS,
- &connect_pol);
-
- if (!NT_STATUS_IS_OK(result))
- return result;
-
- /* 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))
- return result;
-
- init_lsa_String(&lsa_acct_name, argv[0]);
-
- result = rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
- &domain_pol,
- 1,
- &lsa_acct_name,
- &rids,
- &rid_types);
+ g0.grpi0_name = argv[1];
- if (rids.count != 1) {
- d_fprintf(stderr, "Couldn't find group %s\n", argv[0]);
- return result;
- }
+ status = NetGroupSetInfo(c->opt_host,
+ argv[0],
+ 0,
+ (uint8_t *)&g0,
+ &parm_err);
- if (rid_types.ids[0] != SID_NAME_DOM_GRP) {
- d_fprintf(stderr, "Can only rename domain groups\n");
- return NT_STATUS_UNSUCCESSFUL;
+ if (status != 0) {
+ d_fprintf(stderr, "Renaming group %s failed with: %s\n",
+ argv[0], libnetapi_get_error_string(c->netapi_ctx,
+ status));
+ return -1;
}
- result = rpccli_samr_OpenGroup(pipe_hnd, mem_ctx,
- &domain_pol,
- MAXIMUM_ALLOWED_ACCESS,
- rids.ids[0],
- &group_pol);
-
- if (!NT_STATUS_IS_OK(result))
- return result;
-
- init_lsa_String(&group_info.name, argv[1]);
-
- result = rpccli_samr_SetGroupInfo(pipe_hnd, mem_ctx,
- &group_pol,
- 2,
- &group_info);
-
- if (!NT_STATUS_IS_OK(result))
- return result;
-
- return NT_STATUS_NO_SUCH_GROUP;
+ return 0;
}
static int rpc_group_rename(struct net_context *c, int argc, const char **argv)
{
- if (argc != 2) {
+ if (argc != 2 || c->display_usage) {
return rpc_group_usage(c, argc, argv);
}
- return run_rpc_command(c, NULL, PI_SAMR, 0,
- rpc_group_rename_internals,
- argc, argv);
+ return rpc_group_rename_internals(c, argc, argv);
}
/**
* 'net rpc group' entrypoint.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
int net_rpc_group(struct net_context *c, int argc, const char **argv)
{
+ NET_API_STATUS status;
+
struct functable func[] = {
- {"add", rpc_group_add},
- {"delete", rpc_group_delete},
- {"addmem", rpc_group_addmem},
- {"delmem", rpc_group_delmem},
- {"list", rpc_group_list},
- {"members", rpc_group_members},
- {"rename", rpc_group_rename},
- {NULL, NULL}
+ {
+ "add",
+ rpc_group_add,
+ NET_TRANSPORT_RPC,
+ "Create specified group",
+ "net rpc group add\n"
+ " Create specified group"
+ },
+ {
+ "delete",
+ rpc_group_delete,
+ NET_TRANSPORT_RPC,
+ "Delete specified group",
+ "net rpc group delete\n"
+ " Delete specified group"
+ },
+ {
+ "addmem",
+ rpc_group_addmem,
+ NET_TRANSPORT_RPC,
+ "Add member to group",
+ "net rpc group addmem\n"
+ " Add member to group"
+ },
+ {
+ "delmem",
+ rpc_group_delmem,
+ NET_TRANSPORT_RPC,
+ "Remove member from group",
+ "net rpc group delmem\n"
+ " Remove member from group"
+ },
+ {
+ "list",
+ rpc_group_list,
+ NET_TRANSPORT_RPC,
+ "List groups",
+ "net rpc group list\n"
+ " List groups"
+ },
+ {
+ "members",
+ rpc_group_members,
+ NET_TRANSPORT_RPC,
+ "List group members",
+ "net rpc group members\n"
+ " List group members"
+ },
+ {
+ "rename",
+ rpc_group_rename,
+ NET_TRANSPORT_RPC,
+ "Rename group",
+ "net rpc group rename\n"
+ " Rename group"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if (argc == 0) {
- return run_rpc_command(c, NULL, PI_SAMR, 0,
- rpc_group_list_internals,
- argc, argv);
- }
-
- return net_run_function(c, argc, argv, func, rpc_group_usage);
+ 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) {
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rpc group\n"
+ " Alias for net rpc group list global local "
+ "builtin\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
+ rpc_group_list_internals,
+ argc, argv);
+ }
+
+ return net_run_function(c, argc, argv, "net rpc group", func);
}
/****************************************************************************/
static int rpc_share_usage(struct net_context *c, int argc, const char **argv)
{
- return net_help_share(c, argc, argv);
+ return net_share_usage(c, argc, argv);
}
/**
- * Add a share on a remote RPC server
+ * Add a share on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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 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"));
+ if ((argc < 1) || !strchr(argv[0], '=') || c->display_usage) {
return rpc_share_usage(c, argc, argv);
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_add_internals,
argc, argv);
}
/**
- * Delete a share on a remote RPC server
+ * Delete a share on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * Delete a share on a remote RPC server
+ * Delete a share on a remote RPC server.
*
- * @param domain_sid The domain sid acquired from the remote server
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param domain_sid The domain sid acquired from the remote server.
+ * @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)
+ * @return A shell status integer (0 for success).
**/
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"));
+ if (argc < 1 || c->display_usage) {
return rpc_share_usage(c, argc, argv);
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_del_internals,
argc, argv);
}
}
/**
- * List shares on a remote RPC server
+ * List shares on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
if (c->opt_long_list_entries) {
d_printf(
- "\nEnumerating shared resources (exports) on remote server:\n\n"\
- "\nShare name Type Description\n"\
+ "\nEnumerating shared resources (exports) on remote server:\n\n"
+ "\nShare name Type Description\n"
"---------- ---- -----------\n");
}
for (i = 0; i < info_ctr.ctr.ctr1->count; i++)
/***
* 'net rpc share list' entrypoint.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
static int rpc_share_list(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_SRVSVC, 0, rpc_share_list_internals,
- argc, argv);
+ if (c->display_usage) {
+ d_printf("Usage\n"
+ "net rpc share list\n"
+ " List shares on remote server\n");
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
+ rpc_share_list_internals, argc, argv);
}
static bool check_share_availability(struct cli_state *cli, const char *netname)
}
/**
- * Migrate shares from a remote RPC server to the local RPC server
+ * Migrate shares from a remote RPC server to the local RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
* argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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, destroyed on completion of the function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
*
* @return Normal NTSTATUS return.
**/
}
/**
- * Migrate shares from a rpc-server to another
+ * Migrate shares from a RPC server to another.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_share_migrate_shares(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc share migrate shares\n"
+ " Migrate shares to local server\n");
+ return 0;
+ }
if (!c->opt_host) {
printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_migrate_shares_internals,
argc, argv);
}
}
/**
- * Sync all files inside a remote share to another share (over smb)
+ * Sync all files inside a remote share to another share (over smb).
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
char *dst = NULL;
dst = SMB_STRDUP(c->opt_destination?c->opt_destination:"127.0.0.1");
+ if (dst == NULL) {
+ nt_status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
&ctr_src);
if (got_dst_share)
cli_shutdown(cp_clistate.cli_share_dst);
+ SAFE_FREE(dst);
return nt_status;
}
static int rpc_share_migrate_files(struct net_context *c, int argc, const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net share migrate files\n"
+ " Migrate files to local server\n");
+ return 0;
+ }
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_migrate_files_internals,
argc, argv);
}
/**
- * Migrate share-ACLs from a remote RPC server to the local RPC srever
+ * Migrate share-ACLs from a remote RPC server to the local RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * Migrate share-acls from a rpc-server to another
+ * Migrate share-acls from a RPC server to another.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_share_migrate_security(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc share migrate security\n"
+ " Migrate share-acls to local server\n");
+ return 0;
+ }
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_migrate_security_internals,
argc, argv);
}
/**
* Migrate shares (including share-definitions, share-acls and files with acls/attrs)
- * from one server to another
+ * from one server to another.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
*
**/
static int rpc_share_migrate_all(struct net_context *c, int argc,
{
int ret;
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc share migrate all\n"
+ " Migrates shares including all share settings\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_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(c, NULL, PI_SRVSVC, 0,
+ ret = run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_migrate_shares_internals, argc, argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ ret = run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_migrate_files_internals, argc, argv);
if (ret)
return ret;
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_migrate_security_internals, argc,
argv);
}
/**
* 'net rpc share migrate' entrypoint.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
static int rpc_share_migrate(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"all", rpc_share_migrate_all},
- {"files", rpc_share_migrate_files},
- {"help", rpc_share_usage},
- {"security", rpc_share_migrate_security},
- {"shares", rpc_share_migrate_shares},
- {NULL, NULL}
+ {
+ "all",
+ rpc_share_migrate_all,
+ NET_TRANSPORT_RPC,
+ "Migrate shares from remote to local server",
+ "net rpc share migrate all\n"
+ " Migrate shares from remote to local server"
+ },
+ {
+ "files",
+ rpc_share_migrate_files,
+ NET_TRANSPORT_RPC,
+ "Migrate files from remote to local server",
+ "net rpc share migrate files\n"
+ " Migrate files from remote to local server"
+ },
+ {
+ "security",
+ rpc_share_migrate_security,
+ NET_TRANSPORT_RPC,
+ "Migrate share-ACLs from remote to local server",
+ "net rpc share migrate security\n"
+ " Migrate share-ACLs from remote to local server"
+ },
+ {
+ "shares",
+ rpc_share_migrate_shares,
+ NET_TRANSPORT_RPC,
+ "Migrate shares from remote to local server",
+ "net rpc share migrate shares\n"
+ " Migrate shares from remote to local server"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
net_mode_share = NET_MODE_SHARE_MIGRATE;
- return net_run_function(c, argc, argv, func, rpc_share_usage);
+ return net_run_function(c, argc, argv, "net rpc share migrate", func);
}
struct full_alias {
share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
}
-static void rpc_share_userlist_usage(void)
-{
- return;
-}
-
/**
- * List shares on a remote RPC server, including the security descriptors
+ * List shares on a remote RPC server, including the security descriptors.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param domain_sid The domain sid acquired from the remote server
+ * @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
+ * @param mem_ctx Talloc context, destroyed 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.
**/
struct share_list share_list;
- if (argc > 1) {
- rpc_share_userlist_usage();
- return NT_STATUS_UNSUCCESSFUL;
- }
-
if (argc == 0) {
f = stdin;
} else {
{
int result;
- result = run_rpc_command(c, NULL, PI_SAMR, 0,
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc share allowedusers\n"
+ " List allowed users\n");
+ return 0;
+ }
+
+ result = run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_aliaslist_internals,
argc, argv);
if (result != 0)
return result;
- result = run_rpc_command(c, NULL, PI_LSARPC, 0,
+ result = run_rpc_command(c, NULL, &ndr_table_lsarpc.syntax_id, 0,
rpc_aliaslist_dump,
argc, argv);
if (result != 0)
return result;
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_allowedusers_internals,
argc, argv);
}
/**
* 'net rpc share' entrypoint.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
int net_rpc_share(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"add", rpc_share_add},
- {"delete", rpc_share_delete},
- {"allowedusers", rpc_share_allowedusers},
- {"migrate", rpc_share_migrate},
- {"list", rpc_share_list},
- {NULL, NULL}
+ {
+ "add",
+ rpc_share_add,
+ NET_TRANSPORT_RPC,
+ "Add share",
+ "net rpc share add\n"
+ " Add share"
+ },
+ {
+ "delete",
+ rpc_share_delete,
+ NET_TRANSPORT_RPC,
+ "Remove share",
+ "net rpc share delete\n"
+ " Remove share"
+ },
+ {
+ "allowedusers",
+ rpc_share_allowedusers,
+ NET_TRANSPORT_RPC,
+ "Modify allowed users",
+ "net rpc share allowedusers\n"
+ " Modify allowed users"
+ },
+ {
+ "migrate",
+ rpc_share_migrate,
+ NET_TRANSPORT_RPC,
+ "Migrate share to local server",
+ "net rpc share migrate\n"
+ " Migrate share to local server"
+ },
+ {
+ "list",
+ rpc_share_list,
+ NET_TRANSPORT_RPC,
+ "List shares",
+ "net rpc share list\n"
+ " List shares"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if (argc == 0)
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+
+ if (argc == 0) {
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc share\n"
+ " List shares\n"
+ " Alias for net rpc share list\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_share_list_internals,
argc, argv);
+ }
- return net_run_function(c, argc, argv, func, rpc_share_usage);
+ return net_run_function(c, argc, argv, "net rpc share", func);
}
static NTSTATUS rpc_sh_share_list(struct net_context *c,
{
static struct rpc_sh_cmd cmds[] = {
- { "list", NULL, PI_SRVSVC, rpc_sh_share_list,
+ { "list", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_list,
"List available shares" },
- { "add", NULL, PI_SRVSVC, rpc_sh_share_add,
+ { "add", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_add,
"Add a share" },
- { "delete", NULL, PI_SRVSVC, rpc_sh_share_delete,
+ { "delete", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_delete,
"Delete a share" },
- { "info", NULL, PI_SRVSVC, rpc_sh_share_info,
+ { "info", NULL, &ndr_table_srvsvc.syntax_id, rpc_sh_share_info,
"Get information about a share" },
{ NULL, NULL, 0, NULL, NULL }
}
/**
- * Close a file on a remote RPC server
+ * Close a file on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param c A net_context structure
- * @param domain_sid The domain sid acquired from the remote server
+ * @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.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * Close a file on a remote RPC server
+ * Close a file on a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
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"));
+ if (argc < 1 || c->display_usage) {
return rpc_file_usage(c, argc, argv);
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_file_close_internals,
argc, argv);
}
}
/**
- * List open files on a remote RPC server
+ * List open files on a remote RPC server.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param c A net_context structure
- * @param domain_sid The domain sid acquired from the remote server
+ * @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.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
/* Display results */
d_printf(
- "\nEnumerating open files on remote server:\n\n"\
- "\nFileId Opened by Perms Locks Path"\
+ "\nEnumerating open files on remote server:\n\n"
+ "\nFileId Opened by Perms Locks Path"
"\n------ --------- ----- ----- ---- \n");
for (i = 0; i < total_entries; i++)
display_file_info_3(&info_ctr.ctr.ctr3->array[i]);
}
/**
- * List files for a user on a remote RPC server
+ * List files for a user on a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success)..
**/
static int rpc_file_user(struct net_context *c, int argc, const char **argv)
{
- if (argc < 1) {
- DEBUG(1, ("No username given\n"));
+ if (argc < 1 || c->display_usage) {
return rpc_file_usage(c, argc, argv);
}
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_file_list_internals,
argc, argv);
}
/**
* 'net rpc file' entrypoint.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param argc Standard main() style argc.
+ * @param argv Standard main() style argv. Initial components are already
+ * stripped.
**/
int net_rpc_file(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"close", rpc_file_close},
- {"user", rpc_file_user},
+ {
+ "close",
+ rpc_file_close,
+ NET_TRANSPORT_RPC,
+ "Close opened file",
+ "net rpc file close\n"
+ " Close opened file"
+ },
+ {
+ "user",
+ rpc_file_user,
+ NET_TRANSPORT_RPC,
+ "List files opened by user",
+ "net rpc file user\n"
+ " List files opened by user"
+ },
#if 0
- {"info", rpc_file_info},
+ {
+ "info",
+ rpc_file_info,
+ NET_TRANSPORT_RPC,
+ "Display information about opened file",
+ "net rpc file info\n"
+ " Display information about opened file"
+ },
#endif
- {NULL, NULL}
+ {NULL, NULL, 0, NULL, NULL}
};
- if (argc == 0)
- return run_rpc_command(c, NULL, PI_SRVSVC, 0,
+ if (argc == 0) {
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rpc file\n"
+ " List opened files\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_srvsvc.syntax_id, 0,
rpc_file_list_internals,
argc, argv);
+ }
- return net_run_function(c, argc, argv, func, rpc_file_usage);
+ return net_run_function(c, argc, argv, "net rpc file", func);
}
/**
- * ABORT the shutdown of a remote RPC Server over, initshutdown pipe
+ * ABORT the shutdown of a remote RPC Server, over initshutdown pipe.
*
* 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 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 compleation of the function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * ABORT the shutdown of a remote RPC Server, over winreg pipe
+ * ABORT the shutdown of a remote RPC Server, over winreg pipe.
*
* 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 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 compleation of the function.
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * ABORT the Shut down of a remote RPC server
+ * ABORT the shutdown of a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argv Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_shutdown_abort(struct net_context *c, int argc,
const char **argv)
{
- int rc = run_rpc_command(c, NULL, PI_INITSHUTDOWN, 0,
- rpc_shutdown_abort_internals,
- argc, argv);
+ int rc = -1;
+
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc abortshutdown\n"
+ " Abort a scheduled shutdown\n");
+ return 0;
+ }
+
+ rc = run_rpc_command(c, NULL, &ndr_table_initshutdown.syntax_id, 0,
+ rpc_shutdown_abort_internals, argc, argv);
if (rc == 0)
return rc;
DEBUG(1, ("initshutdown pipe didn't work, trying winreg pipe\n"));
- return run_rpc_command(c, NULL, PI_WINREG, 0,
+ return run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0,
rpc_reg_shutdown_abort_internals,
argc, argv);
}
/**
- * Shut down a remote RPC Server via initshutdown pipe
+ * Shut down a remote RPC Server via initshutdown pipe.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param c A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @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 compleation of the function.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * Shut down a remote RPC Server via winreg pipe
+ * Shut down a remote RPC Server via winreg pipe.
*
* All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through.
+ * argc, argv which are passed through.
*
- * @param c A net_context structure
- * @param domain_sid The domain sid aquired from the remote server
+ * @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 compleation of the function.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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.
**/
}
/**
- * Shut down a remote RPC server
+ * Shut down a remote RPC server.
*
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_shutdown(struct net_context *c, int argc, const char **argv)
{
- int rc = run_rpc_command(c, NULL, PI_INITSHUTDOWN, 0,
- rpc_init_shutdown_internals,
- argc, argv);
+ int rc = -1;
+
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc shutdown\n"
+ " Shut down a remote RPC server\n");
+ return 0;
+ }
+
+ rc = run_rpc_command(c, NULL, &ndr_table_initshutdown.syntax_id, 0,
+ rpc_init_shutdown_internals, argc, argv);
if (rc) {
DEBUG(1, ("initshutdown pipe failed, trying winreg pipe\n"));
- rc = run_rpc_command(c, NULL, PI_WINREG, 0,
+ rc = run_rpc_command(c, NULL, &ndr_table_winreg.syntax_id, 0,
rpc_reg_shutdown_internals, argc, argv);
}
* 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 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.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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 code
+ * @return normal NTSTATUS return code.
*/
static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
uint32 user_rid;
uint32_t access_granted = 0;
union samr_UserInfo info;
+ unsigned int orig_timeout;
if (argc != 2) {
- d_printf("Usage: net rpc trustdom add <domain_name> <pw>\n");
+ d_printf("Usage: net rpc trustdom add <domain_name> "
+ "<trust password>\n");
return NT_STATUS_INVALID_PARAMETER;
}
goto done;
}
+ /* This call can take a long time - allow the server to time out.
+ * 35 seconds should do it. */
+
+ orig_timeout = rpccli_set_timeout(pipe_hnd, 35000);
+
/* Create trusting domain's account */
acb_info = ACB_NORMAL;
acct_flags = SEC_GENERIC_READ | SEC_GENERIC_WRITE | SEC_GENERIC_EXECUTE |
&user_pol,
&access_granted,
&user_rid);
+
+ /* And restore our original timeout. */
+ rpccli_set_timeout(pipe_hnd, orig_timeout);
+
if (!NT_STATUS_IS_OK(result)) {
+ d_printf("net rpc trustdom add: create user %s failed %s\n",
+ acct_name, nt_errstr(result));
goto done;
}
/**
* Create interdomain trust account for a remote domain.
*
- * @param argc standard argc
- * @param argv standard argv without initial components
+ * @param argc Standard argc.
+ * @param argv Standard argv without initial components.
*
- * @return Integer status (0 means success)
+ * @return Integer status (0 means success).
**/
static int rpc_trustdom_add(struct net_context *c, int argc, const char **argv)
{
- if (argc > 0) {
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ if (argc > 0 && !c->display_usage) {
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_trustdom_add_internals, argc, argv);
} else {
- d_printf("Usage: net rpc trustdom add <domain>\n");
+ d_printf("Usage:\n"
+ "net rpc trustdom add <domain_name> <trust password>\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 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.
- * @param argc Standard main() style argc
- * @param argc Standard main() style argv. Initial components are already
- * stripped
+ * @param mem_ctx Talloc context, destroyed 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 code
+ * @return normal NTSTATUS return code.
*/
static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
&name_types);
if (!NT_STATUS_IS_OK(result)) {
+ d_printf("net rpc trustdom del: LookupNames on user %s failed %s\n",
+ acct_name, nt_errstr(result) );
goto done;
}
&user_pol);
if (!NT_STATUS_IS_OK(result)) {
+ d_printf("net rpc trustdom del: OpenUser on user %s failed %s\n",
+ acct_name, nt_errstr(result) );
goto done;
}
&user_pol,
&trust_acct_sid);
if (!NT_STATUS_IS_OK(result)) {
+ d_printf("net rpc trustdom del: RemoveMemberFromForeignDomain on user %s failed %s\n",
+ acct_name, nt_errstr(result) );
goto done;
}
&user_pol);
if (!NT_STATUS_IS_OK(result)) {
+ d_printf("net rpc trustdom del: DeleteUser on user %s failed %s\n",
+ acct_name, nt_errstr(result) );
goto done;
}
if (!NT_STATUS_IS_OK(result)) {
- DEBUG(0,("Could not set trust account password: %s\n",
- nt_errstr(result)));
- goto done;
+ d_printf("Could not set trust account password: %s\n",
+ nt_errstr(result));
+ goto done;
}
done:
/**
* Delete interdomain trust account for a remote domain.
*
- * @param argc standard argc
- * @param argv standard argv without initial components
+ * @param argc Standard argc.
+ * @param argv Standard argv without initial components.
*
- * @return Integer status (0 means success)
+ * @return Integer status (0 means success).
**/
static int rpc_trustdom_del(struct net_context *c, int argc, const char **argv)
{
- if (argc > 0) {
- return run_rpc_command(c, NULL, PI_SAMR, 0,
+ if (argc > 0 && !c->display_usage) {
+ return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id, 0,
rpc_trustdom_del_internals, argc, argv);
} else {
- d_printf("Usage: net rpc trustdom del <domain>\n");
+ d_printf("Usage:\n"
+ "net rpc trustdom del <domain>\n");
return -1;
}
}
/* Try netr_GetDcName */
- netr = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON, &status);
- if (!netr) {
+ status = cli_rpc_pipe_open_noauth(cli, &ndr_table_netlogon.syntax_id,
+ &netr);
+ if (!NT_STATUS_IS_OK(status)) {
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
+ * @param c A net_context structure.
+ * @param argc Standard argc.
+ * @param argv Standard argv without initial components.
*
- * @return Integer status (0 means success)
+ * @return Integer status (0 means success).
**/
static int rpc_trustdom_establish(struct net_context *c, int argc,
* Connect to \\server\ipc$ as 'our domain' account with password
*/
- if (argc != 1) {
- d_printf("Usage: net rpc trustdom establish <domain_name>\n");
+ if (argc != 1 || c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc trustdom establish <domain_name>\n");
return -1;
}
* Call LsaOpenPolicy and LsaQueryInfo
*/
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &nt_status);
- if (!pipe_hnd) {
+ nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", nt_errstr(nt_status) ));
cli_shutdown(cli);
talloc_destroy(mem_ctx);
}
/**
- * Revoke trust relationship to the remote domain
+ * Revoke trust relationship to the remote domain.
*
- * @param c A net_context structure
- * @param argc standard argc
- * @param argv standard argv without initial components
+ * @param c A net_context structure.
+ * @param argc Standard argc.
+ * @param argv Standard argv without initial components.
*
- * @return Integer status (0 means success)
+ * @return Integer status (0 means success).
**/
static int rpc_trustdom_revoke(struct net_context *c, int argc,
char* domain_name;
int rc = -1;
- if (argc < 1) return -1;
+ if (argc < 1 || c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc trustdom revoke <domain_name>\n"
+ " Revoke trust relationship\n"
+ " domain_name\tName of domain to revoke trust\n");
+ return -1;
+ }
/* generate upper cased domain name */
domain_name = smb_xstrdup(argv[0]);
return rc;
}
-/**
- * Usage for 'net rpc trustdom' command
- *
- * @param argc standard argc
- * @param argv standard argv without inital components
- *
- * @return Integer status returned to shell
- **/
-
-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");
- d_printf(" net rpc trustdom establish \t establish relationship to trusted domain\n");
- d_printf(" net rpc trustdom revoke \t abandon relationship to trusted domain\n");
- d_printf(" net rpc trustdom list \t show current interdomain trust relationships\n");
- d_printf(" net rpc trustdom vampire \t vampire interdomain trust relationships from remote server\n");
- return -1;
-}
-
-
static NTSTATUS rpc_query_domain_sid(struct net_context *c,
const DOM_SID *domain_sid,
const char *domain_name,
struct lsa_DomainList dom_list;
fstring pdc_name;
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc trustdom vampire\n"
+ " Vampire trust relationship from remote server\n");
+ return 0;
+ }
+
/*
* Listing trusted domains (stored in secrets.tdb, if local)
*/
return -1;
};
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &nt_status);
- if (!pipe_hnd) {
+ nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
nt_errstr(nt_status) ));
cli_shutdown(cli);
POLICY_HND domain_hnd;
struct samr_SamArray *trusts = NULL;
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc trustdom list\n"
+ " List trust relationships\n");
+ return 0;
+ }
+
/*
* Listing trusted domains (stored in secrets.tdb, if local)
*/
return -1;
};
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &nt_status);
- if (!pipe_hnd) {
+ nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
nt_errstr(nt_status) ));
cli_shutdown(cli);
/*
* Open \PIPE\samr and get needed policy handles
*/
- pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &nt_status);
- if (!pipe_hnd) {
+ nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id,
+ &pipe_hnd);
+ if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0, ("Could not initialise samr pipe. Error was %s\n", nt_errstr(nt_status)));
cli_shutdown(cli);
talloc_destroy(mem_ctx);
&remote_cli);
if (NT_STATUS_IS_OK(nt_status)) {
/* query for domain's sid */
- if (run_rpc_command(c, remote_cli, PI_LSARPC, 0,
- rpc_query_domain_sid, argc,
- argv))
+ if (run_rpc_command(
+ c, remote_cli,
+ &ndr_table_lsarpc.syntax_id, 0,
+ rpc_query_domain_sid, argc,
+ argv))
d_fprintf(stderr, "couldn't get domain's sid\n");
cli_shutdown(remote_cli);
}
/**
- * Entrypoint for 'net rpc trustdom' code
+ * Entrypoint for 'net rpc trustdom' code.
*
- * @param argc standard argc
- * @param argv standard argv without initial components
+ * @param argc Standard argc.
+ * @param argv Standard argv without initial components.
*
- * @return Integer status (0 means success)
+ * @return Integer status (0 means success).
*/
static int rpc_trustdom(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"add", rpc_trustdom_add},
- {"del", rpc_trustdom_del},
- {"establish", rpc_trustdom_establish},
- {"revoke", rpc_trustdom_revoke},
- {"help", rpc_trustdom_usage},
- {"list", rpc_trustdom_list},
- {"vampire", rpc_trustdom_vampire},
- {NULL, NULL}
+ {
+ "add",
+ rpc_trustdom_add,
+ NET_TRANSPORT_RPC,
+ "Add trusted domain's account",
+ "net rpc trustdom add\n"
+ " Add trusted domain's account"
+ },
+ {
+ "del",
+ rpc_trustdom_del,
+ NET_TRANSPORT_RPC,
+ "Remove trusted domain's account",
+ "net rpc trustdom del\n"
+ " Remove trusted domain's account"
+ },
+ {
+ "establish",
+ rpc_trustdom_establish,
+ NET_TRANSPORT_RPC,
+ "Establish trust relationship",
+ "net rpc trustdom establish\n"
+ " Establish trust relationship"
+ },
+ {
+ "revoke",
+ rpc_trustdom_revoke,
+ NET_TRANSPORT_RPC,
+ "Revoke trust relationship",
+ "net rpc trustdom revoke\n"
+ " Revoke trust relationship"
+ },
+ {
+ "list",
+ rpc_trustdom_list,
+ NET_TRANSPORT_RPC,
+ "List domain trusts",
+ "net rpc trustdom list\n"
+ " List domain trusts"
+ },
+ {
+ "vampire",
+ rpc_trustdom_vampire,
+ NET_TRANSPORT_RPC,
+ "Vampire trusts from remote server",
+ "net rpc trustdom vampire\n"
+ " Vampire trusts from remote server"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if (argc == 0) {
- rpc_trustdom_usage(c, argc, argv);
- return -1;
- }
-
- return net_run_function(c, argc, argv, func, rpc_user_usage);
+ return net_run_function(c, argc, argv, "net rpc trustdom", func);
}
/**
/* dump sam database via samsync rpc calls */
static int rpc_samdump(struct net_context *c, int argc, const char **argv) {
- return run_rpc_command(c, NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS,
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc samdump\n"
+ " Dump remote SAM database\n");
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id,
+ NET_FLAGS_ANONYMOUS,
rpc_samdump_internals, argc, argv);
}
/* syncronise sam database via samsync rpc calls */
-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);
+static int rpc_vampire(struct net_context *c, int argc, const char **argv)
+{
+ struct functable func[] = {
+ {
+ "ldif",
+ rpc_vampire_ldif,
+ NET_TRANSPORT_RPC,
+ "Dump remote SAM database to ldif",
+ "net rpc vampire ldif\n"
+ " Dump remote SAM database to LDIF file or stdout"
+ },
+ {
+ "keytab",
+ rpc_vampire_keytab,
+ NET_TRANSPORT_RPC,
+ "Dump remote SAM database to Kerberos Keytab",
+ "net rpc vampire keytab\n"
+ " Dump remote SAM database to Kerberos keytab file"
+ },
+
+ {NULL, NULL, 0, NULL, NULL}
+ };
+
+ if (argc == 0) {
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc vampire\n"
+ " Vampire remote SAM database\n");
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_netlogon.syntax_id,
+ NET_FLAGS_ANONYMOUS,
+ rpc_vampire_internals,
+ argc, argv);
+ }
+
+ return net_run_function(c, argc, argv, "net rpc vampire", func);
}
/**
- * Migrate everything from a print-server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
*
* The order is important !
- * To successfully add drivers the print-queues have to exist !
- * Applying ACLs should be the last step, because you're easily locked out
+ * To successfully add drivers the print queues have to exist !
+ * Applying ACLs should be the last step, because you're easily locked out.
*
**/
static int rpc_printer_migrate_all(struct net_context *c, int argc,
{
int ret;
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer migrate all\n"
+ " Migrate everything from a print server\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_printers_internals, argc,
argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_drivers_internals, argc,
argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_forms_internals, argc, argv);
if (ret)
return ret;
- ret = run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_settings_internals, argc,
argv);
if (ret)
return ret;
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_security_internals, argc,
argv);
}
/**
- * Migrate print-drivers from a print-server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_migrate_drivers(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer migrate drivers\n"
+ " Migrate print-drivers from a print-server\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_drivers_internals,
argc, argv);
}
/**
- * Migrate print-forms from a print-server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_migrate_forms(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer migrate forms\n"
+ " Migrate print-forms from a print-server\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_forms_internals,
argc, argv);
}
/**
- * Migrate printers from a print-server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_migrate_printers(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer migrate printers\n"
+ " Migrate printers from a print-server\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_migrate_security(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer migrate security\n"
+ " Migrate printer-ACLs from a print-server\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_migrate_security_internals,
argc, argv);
}
/**
- * Migrate printer-settings from a print-server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_migrate_settings(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer migrate settings\n"
+ " Migrate printer-settings from a print-server\n");
+ return 0;
+ }
+
if (!c->opt_host) {
- printf("no server to migrate\n");
+ d_printf("no server to migrate\n");
return -1;
}
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_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
+ * @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(struct net_context *c, int argc, const char **argv)
*has* to exist */
struct functable func[] = {
- {"all", rpc_printer_migrate_all},
- {"drivers", rpc_printer_migrate_drivers},
- {"forms", rpc_printer_migrate_forms},
- {"help", rpc_printer_usage},
- {"printers", rpc_printer_migrate_printers},
- {"security", rpc_printer_migrate_security},
- {"settings", rpc_printer_migrate_settings},
- {NULL, NULL}
+ {
+ "all",
+ rpc_printer_migrate_all,
+ NET_TRANSPORT_RPC,
+ "Migrate all from remote to local print server",
+ "net rpc printer migrate all\n"
+ " Migrate all from remote to local print server"
+ },
+ {
+ "drivers",
+ rpc_printer_migrate_drivers,
+ NET_TRANSPORT_RPC,
+ "Migrate drivers to local server",
+ "net rpc printer migrate drivers\n"
+ " Migrate drivers to local server"
+ },
+ {
+ "forms",
+ rpc_printer_migrate_forms,
+ NET_TRANSPORT_RPC,
+ "Migrate froms to local server",
+ "net rpc printer migrate forms\n"
+ " Migrate froms to local server"
+ },
+ {
+ "printers",
+ rpc_printer_migrate_printers,
+ NET_TRANSPORT_RPC,
+ "Migrate printers to local server",
+ "net rpc printer migrate printers\n"
+ " Migrate printers to local server"
+ },
+ {
+ "security",
+ rpc_printer_migrate_security,
+ NET_TRANSPORT_RPC,
+ "Mirgate printer ACLs to local server",
+ "net rpc printer migrate security\n"
+ " Mirgate printer ACLs to local server"
+ },
+ {
+ "settings",
+ rpc_printer_migrate_settings,
+ NET_TRANSPORT_RPC,
+ "Migrate printer settings to local server",
+ "net rpc printer migrate settings\n"
+ " Migrate printer settings to local server"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- return net_run_function(c, argc, argv, func, rpc_printer_usage);
+ return net_run_function(c, argc, argv, "net rpc printer migrate",func);
}
/**
- * List printers on a remote RPC server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_list(struct net_context *c, int argc, const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer list\n"
+ " List printers on a remote RPC server\n");
+ return 0;
+ }
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_list_internals,
argc, argv);
}
/**
- * List printer-drivers on a remote RPC server
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_driver_list(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer driver\n"
+ " List printer-drivers on a remote RPC server\n");
+ return 0;
+ }
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_driver_list_internals,
argc, argv);
}
/**
- * Publish printer in ADS via MSRPC
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_publish_publish(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer publish publish\n"
+ " Publish printer in ADS via MSRPC\n");
+ return 0;
+ }
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_publish_publish_internals,
argc, argv);
}
/**
- * Update printer in ADS via MSRPC
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_publish_update(struct net_context *c, int argc, const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer publish update\n"
+ " Update printer in ADS via MSRPC\n");
+ return 0;
+ }
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_publish_update_internals,
argc, argv);
}
/**
- * UnPublish printer in ADS via MSRPC
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_publish_unpublish(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer publish unpublish\n"
+ " UnPublish printer in ADS via MSRPC\n");
+ return 0;
+ }
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_publish_unpublish_internals,
argc, argv);
}
/**
- * List published printers via MSRPC
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_publish_list(struct net_context *c, int argc,
const char **argv)
{
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rpc printer publish list\n"
+ " List published printers via MSRPC\n");
+ return 0;
+ }
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_publish_list_internals,
argc, argv);
}
/**
- * Publish printer in ADS
+ * 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
+ * @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)
+ * @return A shell status integer (0 for success).
**/
static int rpc_printer_publish(struct net_context *c, int argc,
const char **argv)
{
struct functable func[] = {
- {"publish", rpc_printer_publish_publish},
- {"update", rpc_printer_publish_update},
- {"unpublish", rpc_printer_publish_unpublish},
- {"list", rpc_printer_publish_list},
- {"help", rpc_printer_usage},
- {NULL, NULL}
+ {
+ "publish",
+ rpc_printer_publish_publish,
+ NET_TRANSPORT_RPC,
+ "Publish printer in AD",
+ "net rpc printer publish publish\n"
+ " Publish printer in AD"
+ },
+ {
+ "update",
+ rpc_printer_publish_update,
+ NET_TRANSPORT_RPC,
+ "Update printer in AD",
+ "net rpc printer publish update\n"
+ " Update printer in AD"
+ },
+ {
+ "unpublish",
+ rpc_printer_publish_unpublish,
+ NET_TRANSPORT_RPC,
+ "Unpublish printer",
+ "net rpc printer publish unpublish\n"
+ " Unpublish printer"
+ },
+ {
+ "list",
+ rpc_printer_publish_list,
+ NET_TRANSPORT_RPC,
+ "List published printers",
+ "net rpc printer publish list\n"
+ " List published printers"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if (argc == 0)
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ if (argc == 0) {
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rpc printer publish\n"
+ " List published printers\n"
+ " Alias of net rpc printer publish list\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_publish_list_internals,
argc, argv);
+ }
- return net_run_function(c, argc, argv, func, rpc_printer_usage);
+ return net_run_function(c, argc, argv, "net rpc printer publish",func);
}
/**
* 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
+ * @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(struct net_context *c, int argc, const char **argv)
{
- return net_help_printer(c, argc, argv);
+ d_printf("net rpc printer LIST [printer] [misc. options] [targets]\n"
+ "\tlists all printers on print-server\n\n");
+ d_printf("net rpc printer DRIVER [printer] [misc. options] [targets]\n"
+ "\tlists all printer-drivers on print-server\n\n");
+ d_printf("net rpc printer PUBLISH action [printer] [misc. options] [targets]\n"
+ "\tpublishes printer settings in Active Directory\n"
+ "\taction can be one of PUBLISH, UPDATE, UNPUBLISH or LIST\n\n");
+ d_printf("net rpc printer MIGRATE PRINTERS [printer] [misc. options] [targets]"
+ "\n\tmigrates printers from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE SETTINGS [printer] [misc. options] [targets]"
+ "\n\tmigrates printer-settings from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE DRIVERS [printer] [misc. options] [targets]"
+ "\n\tmigrates printer-drivers from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE FORMS [printer] [misc. options] [targets]"
+ "\n\tmigrates printer-forms from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE SECURITY [printer] [misc. options] [targets]"
+ "\n\tmigrates printer-ACLs from remote to local server\n\n");
+ d_printf("net rpc printer MIGRATE ALL [printer] [misc. options] [targets]"
+ "\n\tmigrates drivers, forms, queues, settings and acls from\n"
+ "\tremote to local print-server\n\n");
+ net_common_methods_usage(c, argc, argv);
+ net_common_flags_usage(c, argc, argv);
+ d_printf(
+ "\t-v or --verbose\t\t\tgive verbose output\n"
+ "\t --destination\t\tmigration target server (default: localhost)\n");
+
+ return -1;
}
/**
* '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
+ * @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(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"list", rpc_printer_list},
- {"migrate", rpc_printer_migrate},
- {"driver", rpc_printer_driver_list},
- {"publish", rpc_printer_publish},
- {NULL, NULL}
+ {
+ "list",
+ rpc_printer_list,
+ NET_TRANSPORT_RPC,
+ "List all printers on print server",
+ "net rpc printer list\n"
+ " List all printers on print server"
+ },
+ {
+ "migrate",
+ rpc_printer_migrate,
+ NET_TRANSPORT_RPC,
+ "Migrate printer to local server",
+ "net rpc printer migrate\n"
+ " Migrate printer to local server"
+ },
+ {
+ "driver",
+ rpc_printer_driver_list,
+ NET_TRANSPORT_RPC,
+ "List printer drivers",
+ "net rpc printer driver\n"
+ " List printer drivers"
+ },
+ {
+ "publish",
+ rpc_printer_publish,
+ NET_TRANSPORT_RPC,
+ "Publish printer in AD",
+ "net rpc printer publish\n"
+ " Publish printer in AD"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if (argc == 0)
- return run_rpc_command(c, NULL, PI_SPOOLSS, 0,
+ if (argc == 0) {
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rpc printer\n"
+ " List printers\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+ return run_rpc_command(c, NULL, &syntax_spoolss, 0,
rpc_printer_list_internals,
argc, argv);
-
- 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(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");
- d_printf(" net rpc oldjoin \t\tto join a domain created in server manager\n");
- d_printf(" net rpc testjoin \t\ttests that a join is valid\n");
- d_printf(" net rpc user \t\t\tto add, delete and list users\n");
- d_printf(" net rpc password <username> [<password>] -Uadmin_username%%admin_pass\n");
- d_printf(" net rpc group \t\tto list groups\n");
- d_printf(" net rpc share \t\tto add, delete, list and migrate shares\n");
- d_printf(" net rpc printer \t\tto list and migrate printers\n");
- d_printf(" net rpc file \t\t\tto list open files\n");
- d_printf(" net rpc changetrustpw \tto change the trust account password\n");
- d_printf(" net rpc getsid \t\tfetch the domain sid into the local secrets.tdb\n");
- d_printf(" net rpc vampire \t\tsyncronise an NT PDC's users and groups into the local passdb\n");
- d_printf(" net rpc samdump \t\tdisplay an NT PDC's users, groups and other data\n");
- d_printf(" net rpc trustdom \t\tto create trusting domain's account or establish trust\n");
- d_printf(" net rpc abortshutdown \tto abort the shutdown of a remote server\n");
- d_printf(" net rpc shutdown \t\tto shutdown a remote server\n");
- d_printf(" net rpc rights\t\tto manage privileges assigned to SIDs\n");
- d_printf(" net rpc registry\t\tto manage registry hives\n");
- d_printf(" net rpc service\t\tto start, stop and query services\n");
- d_printf(" net rpc audit\t\t\tto modify global auditing settings\n");
- d_printf(" net rpc shell\t\t\tto open an interactive shell for remote server/account management\n");
- d_printf("\n");
- d_printf("'net rpc shutdown' also accepts the following miscellaneous options:\n"); /* misc options */
- d_printf("\t-r or --reboot\trequest remote server reboot on shutdown\n");
- d_printf("\t-f or --force\trequest the remote server force its shutdown\n");
- d_printf("\t-t or --timeout=<timeout>\tnumber of seconds before shutdown\n");
- d_printf("\t-C or --comment=<message>\ttext message to display on impending shutdown\n");
- return -1;
-}
-
-
-/**
- * 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(struct net_context *c, int argc, const char **argv)
-{
- struct functable func[] = {
- {"join", rpc_join_usage},
- {"user", rpc_user_usage},
- {"group", rpc_group_usage},
- {"share", rpc_share_usage},
- /*{"changetrustpw", rpc_changetrustpw_usage}, */
- {"trustdom", rpc_trustdom_usage},
- /*{"abortshutdown", rpc_shutdown_abort_usage},*/
- /*{"shutdown", rpc_shutdown_usage}, */
- {"vampire", rpc_vampire_usage},
- {NULL, NULL}
- };
-
- if (argc == 0) {
- net_rpc_usage(c, argc, argv);
- return -1;
}
- return net_run_function(c, argc, argv, func, rpc_user_usage);
+ return net_run_function(c, argc, argv, "net rpc printer", func);
}
/**
* '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
+ * @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(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"audit", net_rpc_audit},
- {"info", net_rpc_info},
- {"join", net_rpc_join},
- {"oldjoin", net_rpc_oldjoin},
- {"testjoin", net_rpc_testjoin},
- {"user", net_rpc_user},
- {"password", rpc_user_password},
- {"group", net_rpc_group},
- {"share", net_rpc_share},
- {"file", net_rpc_file},
- {"printer", net_rpc_printer},
- {"changetrustpw", net_rpc_changetrustpw},
- {"trustdom", rpc_trustdom},
- {"abortshutdown", rpc_shutdown_abort},
- {"shutdown", rpc_shutdown},
- {"samdump", rpc_samdump},
- {"vampire", rpc_vampire},
- {"getsid", net_rpc_getsid},
- {"rights", net_rpc_rights},
- {"service", net_rpc_service},
- {"registry", net_rpc_registry},
- {"shell", net_rpc_shell},
- {"help", net_rpc_help},
- {NULL, NULL}
+ {
+ "audit",
+ net_rpc_audit,
+ NET_TRANSPORT_RPC,
+ "Modify global audit settings",
+ "net rpc audit\n"
+ " Modify global audit settings"
+ },
+ {
+ "info",
+ net_rpc_info,
+ NET_TRANSPORT_RPC,
+ "Show basic info about a domain",
+ "net rpc info\n"
+ " Show basic info about a domain"
+ },
+ {
+ "join",
+ net_rpc_join,
+ NET_TRANSPORT_RPC,
+ "Join a domain",
+ "net rpc join\n"
+ " Join a domain"
+ },
+ {
+ "oldjoin",
+ net_rpc_oldjoin,
+ NET_TRANSPORT_RPC,
+ "Join a domain created in server manager",
+ "net rpc oldjoin\n"
+ " Join a domain created in server manager"
+ },
+ {
+ "testjoin",
+ net_rpc_testjoin,
+ NET_TRANSPORT_RPC,
+ "Test that a join is valid",
+ "net rpc testjoin\n"
+ " Test that a join is valid"
+ },
+ {
+ "user",
+ net_rpc_user,
+ NET_TRANSPORT_RPC,
+ "List/modify users",
+ "net rpc user\n"
+ " List/modify users"
+ },
+ {
+ "password",
+ rpc_user_password,
+ NET_TRANSPORT_RPC,
+ "Change a user password",
+ "net rpc password\n"
+ " Change a user password\n"
+ " Alias for net rpc user password"
+ },
+ {
+ "group",
+ net_rpc_group,
+ NET_TRANSPORT_RPC,
+ "List/modify groups",
+ "net rpc group\n"
+ " List/modify groups"
+ },
+ {
+ "share",
+ net_rpc_share,
+ NET_TRANSPORT_RPC,
+ "List/modify shares",
+ "net rpc share\n"
+ " List/modify shares"
+ },
+ {
+ "file",
+ net_rpc_file,
+ NET_TRANSPORT_RPC,
+ "List open files",
+ "net rpc file\n"
+ " List open files"
+ },
+ {
+ "printer",
+ net_rpc_printer,
+ NET_TRANSPORT_RPC,
+ "List/modify printers",
+ "net rpc printer\n"
+ " List/modify printers"
+ },
+ {
+ "changetrustpw",
+ net_rpc_changetrustpw,
+ NET_TRANSPORT_RPC,
+ "Change trust account password",
+ "net rpc changetrustpw\n"
+ " Change trust account password"
+ },
+ {
+ "trustdom",
+ rpc_trustdom,
+ NET_TRANSPORT_RPC,
+ "Modify domain trusts",
+ "net rpc trustdom\n"
+ " Modify domain trusts"
+ },
+ {
+ "abortshutdown",
+ rpc_shutdown_abort,
+ NET_TRANSPORT_RPC,
+ "Abort a remote shutdown",
+ "net rpc abortshutdown\n"
+ " Abort a remote shutdown"
+ },
+ {
+ "shutdown",
+ rpc_shutdown,
+ NET_TRANSPORT_RPC,
+ "Shutdown a remote server",
+ "net rpc shutdown\n"
+ " Shutdown a remote server"
+ },
+ {
+ "samdump",
+ rpc_samdump,
+ NET_TRANSPORT_RPC,
+ "Dump SAM data of remote NT PDC",
+ "net rpc samdump\n"
+ " Dump SAM data of remote NT PDC"
+ },
+ {
+ "vampire",
+ rpc_vampire,
+ NET_TRANSPORT_RPC,
+ "Sync a remote NT PDC's data into local passdb",
+ "net rpc vampire\n"
+ " Sync a remote NT PDC's data into local passdb"
+ },
+ {
+ "getsid",
+ net_rpc_getsid,
+ NET_TRANSPORT_RPC,
+ "Fetch the domain sid into local secrets.tdb",
+ "net rpc getsid\n"
+ " Fetch the domain sid into local secrets.tdb"
+ },
+ {
+ "rights",
+ net_rpc_rights,
+ NET_TRANSPORT_RPC,
+ "Manage privileges assigned to SID",
+ "net rpc rights\n"
+ " Manage privileges assigned to SID"
+ },
+ {
+ "service",
+ net_rpc_service,
+ NET_TRANSPORT_RPC,
+ "Start/stop/query remote services",
+ "net rpc service\n"
+ " Start/stop/query remote services"
+ },
+ {
+ "registry",
+ net_rpc_registry,
+ NET_TRANSPORT_RPC,
+ "Manage registry hives",
+ "net rpc registry\n"
+ " Manage registry hives"
+ },
+ {
+ "shell",
+ net_rpc_shell,
+ NET_TRANSPORT_RPC,
+ "Open interactive shell on remote server",
+ "net rpc shell\n"
+ " Open interactive shell on remote server"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- return net_run_function(c, argc, argv, func, net_rpc_usage);
+ return net_run_function(c, argc, argv, "net rpc", func);
}