-/*
- Samba Unix/Linux SMB client library
- Version 3.0
- Distributed SMB/CIFS Server Management Utility
+/*
+ Samba Unix/Linux SMB client library
+ Distributed SMB/CIFS Server Management Utility
Copyright (C) 2001 Steve French (sfrench@us.ibm.com)
Copyright (C) 2001 Jim McDonough (jmcd@us.ibm.com)
Copyright (C) 2001 Andrew Tridgell (tridge@samba.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
-/* The following messages were for error checking that is not properly
+/* The following messages were for error checking that is not properly
reported at the moment. Which should be reinstated? */
#define ERRMSG_TARGET_WG_NOT_VALID "\nTarget workgroup option not valid "\
"except on net rap server command, ignored"
#define ERRMSG_BOTH_SERVER_IPADDRESS "\nTarget server and IP address both "\
"specified. Do not set both at the same time. The target IP address was used\n"
-static const char *share_type[] = {
- "Disk",
- "Print",
- "Dev",
- "IPC"
-};
-
static int errmsg_not_implemented(void)
{
d_printf("\nNot implemented\n");
return 0;
}
-int general_rap_usage(int argc, const char **argv)
-{
-
- d_printf("Valid targets: choose one (none defaults to localhost)\n");
- d_printf("\t-S or --server=<server>\t\tserver name\n");
- d_printf("\t-I or --ipaddress=<ipaddr>\taddress of target server\n");
- d_printf("\t-w or --workgroup=<wg>\t\ttarget workgroup or domain\n");
-
- d_printf("\n");
- d_printf("Valid miscellaneous options are:\n"); /* misc options */
- d_printf("\t-p or --port=<port>\tconnection port on target server\n");
- d_printf("\t-W or --myworkgroup=<wg>\tclient workgroup\n");
- d_printf("\t-d or --debug=<level>\t\tdebug level (0-10)\n");
- d_printf("\t-n or --myname=<name>\t\tclient name\n");
- d_printf("\t-U or --user=<name>\t\tuser name\n");
- d_printf("\t-s or --conf=<path>\t\tpathname of smb.conf file\n");
- d_printf("\t-l or --long\t\t\tDisplay full information\n");
- return -1;
-}
-
-
-int net_rap_file_usage(int argc, const char **argv)
+int net_rap_file_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf("net rap file [misc. options] [targets]\n"\
- "\tlists all open files on file server\n\n");
- d_printf("net rap file USER <username> [misc. options] [targets]\n"\
- "\tlists all files opened by username on file server\n\n");
- d_printf("net rap file CLOSE <id> [misc. options] [targets]\n"\
- "\tcloses specified file on target server\n");
-
- general_rap_usage(argc, argv);
- return -1;
+ return net_file_usage(c, argc, argv);
}
/***************************************************************************
list info on an open file
***************************************************************************/
-static void file_fn(const char * pPath, const char * pUser, uint16 perms,
+static void file_fn(const char * pPath, const char * pUser, uint16 perms,
uint16 locks, uint32 id)
{
- d_printf("\t%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
+ d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
id, pUser, perms, locks, pPath);
}
-static void one_file_fn(const char *pPath, const char *pUser, uint16 perms,
+static void one_file_fn(const char *pPath, const char *pUser, uint16 perms,
uint16 locks, uint32 id)
{
- d_printf("File ID %d\n"\
- "User name %s\n"\
- "Locks 0x%-4.2x\n"\
- "Path %s\n"\
+ d_printf("File ID %d\n"
+ "User name %s\n"
+ "Locks 0x%-4.2x\n"
+ "Path %s\n"
"Permissions 0x%x\n",
id, pUser, locks, pPath, perms);
}
-static int rap_file_close(int argc, const char **argv)
+static int rap_file_close(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc == 0) {
- d_printf("\nMissing fileid of file to close\n\n");
- return net_rap_file_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_file_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetFileClose(cli, atoi(argv[0]));
return ret;
}
-static int rap_file_info(int argc, const char **argv)
+static int rap_file_info(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc == 0)
- return net_rap_file_usage(argc, argv);
-
- if (!(cli = net_make_ipc_connection(0)))
+ if (argc == 0 || c->display_usage)
+ return net_rap_file_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetFileGetInfo(cli, atoi(argv[0]), one_file_fn);
return ret;
}
-static int rap_file_user(int argc, const char **argv)
+static int rap_file_user(struct net_context *c, int argc, const char **argv)
{
- if (argc == 0)
- return net_rap_file_usage(argc, argv);
+ struct cli_state *cli;
+ int ret;
- d_printf("net rap file user not implemented yet\n");
- return -1;
+ if (argc == 0 || c->display_usage)
+ return net_rap_file_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
+ return -1;
+
+ /* list open files */
+
+ d_printf("\nEnumerating open files on remote server:\n\n"
+ "\nFileId Opened by Perms Locks Path \n"
+ "------ --------- ----- ----- ---- \n");
+ ret = cli_NetFileEnum(cli, argv[0], NULL, file_fn);
+
+ if (ret == -1)
+ d_printf("\nOperation not supported by server!\n\n");
+
+ cli_shutdown(cli);
+ return ret;
}
-int net_rap_file(int argc, const char **argv)
+int net_rap_file(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"CLOSE", rap_file_close},
- {"USER", rap_file_user},
- {"INFO", rap_file_info},
- {NULL, NULL}
+ {
+ "close",
+ rap_file_close,
+ NET_TRANSPORT_RAP,
+ "Close specified file on server",
+ "net rap file close\n"
+ " Close specified file on server"
+ },
+ {
+ "user",
+ rap_file_user,
+ NET_TRANSPORT_RAP,
+ "List all files opened by username",
+ "net rap file user\n"
+ " List all files opened by username"
+ },
+ {
+ "info",
+ rap_file_info,
+ NET_TRANSPORT_RAP,
+ "Display info about an opened file",
+ "net rap file info\n"
+ " Display info about an opened file"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
-
+
if (argc == 0) {
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap file\n"
+ " List all open files on rempte server\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
/* list open files */
- d_printf(
- "\nEnumerating open files on remote server:\n\n"\
- "\n\tFileId Opened by Perms Locks Path \n"\
- "\t------ --------- ----- ----- ---- \n");
+
+ d_printf("\nEnumerating open files on remote server:\n\n"
+ "\nFileId Opened by Perms Locks Path \n"
+ "------ --------- ----- ----- ---- \n");
ret = cli_NetFileEnum(cli, NULL, NULL, file_fn);
+
+ if (ret == -1)
+ d_printf("\nOperation not supported by server!\n\n");
+
cli_shutdown(cli);
return ret;
}
-
- return net_run_function(argc, argv, func, net_rap_file_usage);
+
+ return net_run_function(c, argc, argv, "net rap file", func);
}
-
-int net_rap_share_usage(int argc, const char **argv)
+
+int net_rap_share_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf(
- "\nnet [rap] share [misc. options] [targets] \n"\
- "\tenumerates all exported resources (network shares) "\
- "on target server\n");
- d_printf(
- "\nnet rap share ADD <name=serverpath> [misc. options] [targets]"\
- "\n\tAdds a share from a server (makes the export active)\n");
- d_printf(
- "\nnet rap share DELETE <sharename> [misc. options] [targets]\n"\
- "\tor"\
- "\nnet rap share CLOSE <sharename> [misc. options] [targets]"\
- "\n\tDeletes a share from a server (makes the export inactive)\n");
- general_rap_usage(argc, argv);
- d_printf(
- "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
- d_printf("\t-M or --maxusers=<num>\t\tmax users allowed for share\n");
- return -1;
+ return net_share_usage(c, argc, argv);
}
-static void long_share_fn(const char *share_name, uint32 type,
+static void long_share_fn(const char *share_name, uint32 type,
const char *comment, void *state)
{
- d_printf("%-12.12s %-8.8s %-50.50s\n",
- share_name, share_type[type], comment);
+ d_printf("%-12s %-8.8s %-50s\n",
+ share_name, net_share_type_str(type), comment);
}
-static void share_fn(const char *share_name, uint32 type,
+static void share_fn(const char *share_name, uint32 type,
const char *comment, void *state)
{
- d_printf("%-12.12s\n", share_name);
+ d_printf("%s\n", share_name);
}
-static int rap_share_delete(int argc, const char **argv)
+static int rap_share_delete(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (argc == 0) {
- d_printf("\n\nShare name not specified\n");
- return net_rap_share_usage(argc, argv);
+
+ if (argc == 0 || c->display_usage) {
+ return net_rap_share_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetShareDelete(cli, argv[0]);
return ret;
}
-static int rap_share_add(int argc, const char **argv)
+static int rap_share_add(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
+
RAP_SHARE_INFO_2 sinfo;
char *p;
char *sharename;
- if (argc == 0) {
- d_printf("\n\nShare name not specified\n");
- return net_rap_share_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_share_usage(c, argc, argv);
}
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- sharename = strdup(argv[0]);
+ sharename = SMB_STRDUP(argv[0]);
p = strchr(sharename, '=');
+ if (p == NULL) {
+ d_printf("Server path not specified\n");
+ SAFE_FREE(sharename);
+ return net_rap_share_usage(c, argc, argv);
+ }
*p = 0;
strlcpy(sinfo.share_name, sharename, sizeof(sinfo.share_name));
sinfo.reserved1 = '\0';
sinfo.share_type = 0;
- sinfo.comment = opt_comment;
+ sinfo.comment = smb_xstrdup(c->opt_comment);
sinfo.perms = 0;
- sinfo.maximum_users = opt_maxusers;
+ sinfo.maximum_users = c->opt_maxusers;
sinfo.active_users = 0;
sinfo.path = p+1;
memset(sinfo.password, '\0', sizeof(sinfo.password));
sinfo.reserved2 = '\0';
-
+
ret = cli_NetShareAdd(cli, &sinfo);
cli_shutdown(cli);
+ SAFE_FREE(sharename);
return ret;
}
-int net_rap_share(int argc, const char **argv)
+int net_rap_share(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"DELETE", rap_share_delete},
- {"CLOSE", rap_share_delete},
- {"ADD", rap_share_add},
- {NULL, NULL}
+ {
+ "delete",
+ rap_share_delete,
+ NET_TRANSPORT_RAP,
+ "Delete a share from server",
+ "net rap share delete\n"
+ " Delete a share from server"
+ },
+ {
+ "close",
+ rap_share_delete,
+ NET_TRANSPORT_RAP,
+ "Delete a share from server",
+ "net rap share close\n"
+ " Delete a share from server\n"
+ " Alias for net rap share delete"
+ },
+ {
+ "add",
+ rap_share_add,
+ NET_TRANSPORT_RAP,
+ "Add a share to server",
+ "net rap share add\n"
+ " Add a share to server"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
if (argc == 0) {
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap share\n"
+ " List all shares on remote server\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
-
- if (opt_long_list_entries) {
+
+ if (c->opt_long_list_entries) {
d_printf(
- "\nEnumerating shared resources (exports) on remote server:\n\n"\
- "\nShare name Type Description\n"\
+ "\nEnumerating shared resources (exports) on remote server:\n\n"
+ "\nShare name Type Description\n"
"---------- ---- -----------\n");
ret = cli_RNetShareEnum(cli, long_share_fn, NULL);
+ } else {
+ ret = cli_RNetShareEnum(cli, share_fn, NULL);
}
- ret = cli_RNetShareEnum(cli, share_fn, NULL);
cli_shutdown(cli);
return ret;
}
- return net_run_function(argc, argv, func, net_rap_share_usage);
+ return net_run_function(c, argc, argv, "net rap share", func);
}
-
-
-int net_rap_session_usage(int argc, const char **argv)
+
+int net_rap_session_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(
- "\nnet rap session [misc. options] [targets]"\
+ "\nnet rap session [misc. options] [targets]"
"\n\tenumerates all active SMB/CIFS sessions on target server\n");
d_printf(
- "\nnet rap session DELETE <client_name> [misc. options] [targets] \n"\
- "\tor"\
- "\nnet rap session CLOSE <client_name> [misc. options] [targets]"\
+ "\nnet rap session DELETE <client_name> [misc. options] [targets] \n"
+ "\tor"
+ "\nnet rap session CLOSE <client_name> [misc. options] [targets]"
"\n\tDeletes (closes) a session from specified client to server\n");
+ d_printf(
+ "\nnet rap session INFO <client_name>"
+ "\n\tEnumerates all open files in specified session\n");
- general_rap_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
-
+
static void list_sessions_func(char *wsname, char *username, uint16 conns,
uint16 opens, uint16 users, uint32 sess_time,
uint32 idle_time, uint32 user_flags, char *clitype)
int hrs = idle_time / 3600;
int min = (idle_time / 60) % 60;
int sec = idle_time % 60;
-
+
d_printf("\\\\%-18.18s %-20.20s %-18.18s %5d %2.2d:%2.2d:%2.2d\n",
wsname, username, clitype, opens, hrs, min, sec);
}
-static void display_session_func(const char *wsname, const char *username,
- uint16 conns, uint16 opens, uint16 users,
- uint32 sess_time, uint32 idle_time,
+static void display_session_func(const char *wsname, const char *username,
+ uint16 conns, uint16 opens, uint16 users,
+ uint32 sess_time, uint32 idle_time,
uint32 user_flags, const char *clitype)
{
int ihrs = idle_time / 3600;
int shrs = sess_time / 3600;
int smin = (sess_time / 60) % 60;
int ssec = sess_time % 60;
- d_printf("User name %-20.20s\n"\
- "Computer %-20.20s\n"\
- "Guest logon %-20.20s\n"\
- "Client Type %-40.40s\n"\
- "Sess time %2.2d:%2.2d:%2.2d\n"\
- "Idle time %2.2d:%2.2d:%2.2d\n",
- username, wsname,
+ d_printf("User name %-20.20s\n"
+ "Computer %-20.20s\n"
+ "Guest logon %-20.20s\n"
+ "Client Type %-40.40s\n"
+ "Sess time %2.2d:%2.2d:%2.2d\n"
+ "Idle time %2.2d:%2.2d:%2.2d\n",
+ username, wsname,
(user_flags&0x0)?"yes":"no", clitype,
shrs, smin, ssec, ihrs, imin, isec);
}
const char *username, const char *netname)
{
d_printf("%-14.14s %-8.8s %5d\n",
- netname, share_type[conn_type], opens);
+ netname, net_share_type_str(conn_type), opens);
}
-static int rap_session_info(int argc, const char **argv)
+static int rap_session_info(struct net_context *c, int argc, const char **argv)
{
const char *sessname;
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
- return -1;
- if (argc == 0)
- return net_rap_session_usage(argc, argv);
+ if (argc == 0 || c->display_usage)
+ return net_rap_session_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
+ return -1;
sessname = argv[0];
return ret;
}
- d_printf("Share name Type # Opens\n-------------------------"\
+ d_printf("Share name Type # Opens\n-------------------------"
"-----------------------------------------------------\n");
ret = cli_NetConnectionEnum(cli, sessname, display_conns_func);
cli_shutdown(cli);
return ret;
}
-static int rap_session_delete(int argc, const char **argv)
+static int rap_session_delete(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
- return -1;
- if (argc == 0)
- return net_rap_session_usage(argc, argv);
+ if (argc == 0 || c->display_usage)
+ return net_rap_session_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
+ return -1;
ret = cli_NetSessionDel(cli, argv[0]);
cli_shutdown(cli);
return ret;
}
-int net_rap_session(int argc, const char **argv)
+int net_rap_session(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"INFO", rap_session_info},
- {"DELETE", rap_session_delete},
- {"CLOSE", rap_session_delete},
- {NULL, NULL}
+ {
+ "info",
+ rap_session_info,
+ NET_TRANSPORT_RAP,
+ "Display information about session",
+ "net rap session info\n"
+ " Display information about session"
+ },
+ {
+ "delete",
+ rap_session_delete,
+ NET_TRANSPORT_RAP,
+ "Close specified session",
+ "net rap session delete\n"
+ " Close specified session\n"
+ " Alias for net rap session close"
+ },
+ {
+ "close",
+ rap_session_delete,
+ NET_TRANSPORT_RAP,
+ "Close specified session",
+ "net rap session close\n"
+ " Close specified session"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
if (argc == 0) {
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap session\n"
+ " List all open sessions on remote server\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- d_printf("Computer User name "\
- "Client Type Opens Idle time\n"\
- "------------------------------------------"\
+ d_printf("Computer User name "
+ "Client Type Opens Idle time\n"
+ "------------------------------------------"
"------------------------------------\n");
ret = cli_NetSessionEnum(cli, list_sessions_func);
return ret;
}
- return net_run_function(argc, argv, func, net_rap_session_usage);
+ return net_run_function(c, argc, argv, "net rap session", func);
}
-
+
/****************************************************************************
list a server name
****************************************************************************/
d_printf("\t%-16.16s %s\n", name, comment);
}
-
-int net_rap_server_usage(int argc, const char **argv)
+static int net_rap_server_name(struct net_context *c, int argc, const char *argv[])
{
- d_printf("net rap server [misc. options] [target]\n\t"\
- "lists the servers in the specified domain or workgroup.\n");
- d_printf("\n\tIf domain is not specified, it uses the current"\
- " domain or workgroup as\n\tthe default.\n");
+ struct cli_state *cli;
+ char *name;
- general_rap_usage(argc, argv);
- return -1;
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rap server name\n"
+ " Get the name of the server\n");
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
+ return -1;
+
+ if (!cli_get_server_name(NULL, cli, &name)) {
+ d_fprintf(stderr, "cli_get_server_name failed\n");
+ cli_shutdown(cli);
+ return -1;
+ }
+
+ d_printf("Server name = %s\n", name);
+
+ TALLOC_FREE(name);
+ cli_shutdown(cli);
+ return 0;
}
-
-int net_rap_server(int argc, const char **argv)
+
+static int net_rap_server_domain(struct net_context *c, int argc,
+ const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (c->display_usage) {
+ d_printf("Usage:\n"
+ "net rap server domain\n"
+ " Enumerate servers in this domain/workgroup\n");
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- d_printf("\nEnumerating servers in this domain or workgroup: \n\n"\
- "\tServer name Server description\n"\
+ d_printf("\nEnumerating servers in this domain or workgroup: \n\n"
+ "\tServer name Server description\n"
"\t------------- ----------------------------\n");
- ret = cli_NetServerEnum(cli, cli->server_domain, SV_TYPE_ALL,
- display_server_func,NULL);
+ ret = cli_NetServerEnum(cli, cli->server_domain, SV_TYPE_ALL,
+ display_server_func,NULL);
cli_shutdown(cli);
- return ret;
+ return ret;
+}
+
+int net_rap_server(struct net_context *c, int argc, const char **argv)
+{
+ struct functable func[] = {
+ {
+ "name",
+ net_rap_server_name,
+ NET_TRANSPORT_RAP,
+ "Get the name of the server",
+ "net rap server name\n"
+ " Get the name of the server"
+ },
+ {
+ "domain",
+ net_rap_server_domain,
+ NET_TRANSPORT_RAP,
+ "Get the servers in this domain/workgroup",
+ "net rap server domain\n"
+ " Get the servers in this domain/workgroup"
+ },
+ {NULL, NULL, 0, NULL, NULL}
+ };
+
+ /* smb4k uses 'net [rap|rpc] server domain' to query servers in a domain */
+ /* Fall through for 'domain', any other forms will cause to show usage message */
+ return net_run_function(c, argc, argv, "net rap server", func);
+
}
-
-int net_rap_domain_usage(int argc, const char **argv)
+
+int net_rap_domain_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf("net rap domain [misc. options] [target]\n\tlists the"\
+ d_printf("net rap domain [misc. options] [target]\n\tlists the"
" domains or workgroups visible on the current network\n");
- general_rap_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
-
-int net_rap_domain(int argc, const char **argv)
+int net_rap_domain(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (c->display_usage)
+ return net_rap_domain_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- d_printf("\nEnumerating domains:\n\n"\
- "\tDomain name Server name of Browse Master\n"\
+ d_printf("\nEnumerating domains:\n\n"
+ "\tDomain name Server name of Browse Master\n"
"\t------------- ----------------------------\n");
ret = cli_NetServerEnum(cli, cli->server_domain, SV_TYPE_DOMAIN_ENUM,
- display_server_func,NULL);
+ display_server_func,NULL);
cli_shutdown(cli);
- return ret;
+ return ret;
}
-
-int net_rap_printq_usage(int argc, const char **argv)
+
+int net_rap_printq_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(
- "net rap printq [misc. options] [targets]\n"\
- "\tor\n"\
- "net rap printq list [<queue_name>] [misc. options] [targets]\n"\
- "\tlists the specified queue and jobs on the target server.\n"\
+ "net rap printq [misc. options] [targets]\n"
+ "\tor\n"
+ "net rap printq info [<queue_name>] [misc. options] [targets]\n"
+ "\tlists the specified queue and jobs on the target server.\n"
"\tIf the queue name is not specified, all queues are listed.\n\n");
d_printf(
- "net rap printq delete [<queue name>] [misc. options] [targets]\n"\
- "\tdeletes the specified job number on the target server, or the\n"\
+ "net rap printq delete [<queue name>] [misc. options] [targets]\n"
+ "\tdeletes the specified job number on the target server, or the\n"
"\tprinter queue if no job number is specified\n");
- general_rap_usage(argc, argv);
- d_printf("\t-j or --jobid=<job id>\t\tjob id\n");
+ net_common_flags_usage(c, argc, argv);
return -1;
-}
+}
-static void enum_queue(const char *queuename, uint16 pri, uint16 start,
- uint16 until, const char *sep, const char *pproc,
- const char *dest, const char *qparms,
- const char *qcomment, uint16 status, uint16 jobcount)
+static void enum_queue(const char *queuename, uint16 pri, uint16 start,
+ uint16 until, const char *sep, const char *pproc,
+ const char *dest, const char *qparms,
+ const char *qcomment, uint16 status, uint16 jobcount)
{
d_printf("%-17.17s Queue %5d jobs ",
queuename, jobcount);
}
}
-static void enum_jobs(uint16 jobid, const char *ownername,
+static void enum_jobs(uint16 jobid, const char *ownername,
const char *notifyname, const char *datatype,
- const char *jparms, uint16 pos, uint16 status,
- const char *jstatus, uint submitted, uint jobsize,
+ const char *jparms, uint16 pos, uint16 status,
+ const char *jstatus, unsigned int submitted, unsigned int jobsize,
const char *comment)
{
d_printf(" %-23.23s %5d %9d ",
"------------------------------------------------------------------"\
"-------------\n"
-static int rap_printq_info(int argc, const char **argv)
+static int rap_printq_info(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (argc == 0)
- return net_rap_printq_usage(argc, argv);
- if (!(cli = net_make_ipc_connection(0)))
+ if (argc == 0 || c->display_usage)
+ return net_rap_printq_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
d_printf(PRINTQ_ENUM_DISPLAY, cli->desthost); /* list header */
return ret;
}
-static int rap_printq_delete(int argc, const char **argv)
+static int rap_printq_delete(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (argc == 0)
- return net_rap_printq_usage(argc, argv);
- if (!(cli = net_make_ipc_connection(0)))
+ if (argc == 0 || c->display_usage)
+ return net_rap_printq_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_printjob_del(cli, atoi(argv[0]));
return ret;
}
-int net_rap_printq(int argc, const char **argv)
+int net_rap_printq(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
+
struct functable func[] = {
- {"INFO", rap_printq_info},
- {"DELETE", rap_printq_delete},
- {NULL, NULL}
+ {
+ "info",
+ rap_printq_info,
+ NET_TRANSPORT_RAP,
+ "Display info about print queues and jobs",
+ "net rap printq info [queue]\n"
+ " Display info about print jobs in queue.\n"
+ " If queue is not specified, all queues are listed"
+ },
+ {
+ "delete",
+ rap_printq_delete,
+ NET_TRANSPORT_RAP,
+ "Delete print job(s)",
+ "net rap printq delete\n"
+ " Delete print job(s)"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
if (argc == 0) {
- if (!(cli = net_make_ipc_connection(0)))
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap printq\n"
+ " List the print queue\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
d_printf(PRINTQ_ENUM_DISPLAY, cli->desthost); /* list header */
return ret;
}
- return net_run_function(argc, argv, func, net_rap_printq_usage);
+ return net_run_function(c, argc, argv, "net rap printq", func);
}
-
-int net_rap_user_usage(int argc, const char **argv)
+static int net_rap_user_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf("\nnet rap user [misc. options] [targets]\n\tList users\n");
- d_printf("\nnet rap user DELETE <name> [misc. options] [targets]"\
- "\n\tDelete specified user\n");
- d_printf("\nnet rap user INFO <name> [misc. options] [targets]"\
- "\n\tList the domain groups of the specified user\n");
- d_printf("\nnet rap user ADD <name> [-F user flags] [misc. options]"\
- " [targets]\n\tAdd specified user\n");
+ return net_user_usage(c, argc, argv);
+}
- general_rap_usage(argc, argv);
- d_printf(
- "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
- return -1;
-}
-
-static void user_fn(const char *user_name, const char *comment,
- const char * home_dir, const char * logon_script,
- void *state)
+static void user_fn(const char *user_name, void *state)
{
d_printf("%-21.21s\n", user_name);
}
static void long_user_fn(const char *user_name, const char *comment,
- const char * home_dir, const char * logon_script,
+ const char * home_dir, const char * logon_script,
void *state)
{
- d_printf("%-21.21s %-47.47s %-35.35s %35.35s\n",
- user_name, comment, home_dir, logon_script);
+ d_printf("%-21.21s %s\n",
+ user_name, comment);
}
static void group_member_fn(const char *user_name, void *state)
d_printf("%-21.21s\n", user_name);
}
-static int rap_user_delete(int argc, const char **argv)
+static int rap_user_delete(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (argc == 0) {
- d_printf("\n\nUser name not specified\n");
- return net_rap_user_usage(argc, argv);
+
+ if (argc == 0 || c->display_usage) {
+ return net_rap_user_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetUserDelete(cli, argv[0]);
return ret;
}
-static int rap_user_add(int argc, const char **argv)
+static int rap_user_add(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
RAP_USER_INFO_1 userinfo;
- if (argc == 0) {
- d_printf("\n\nUser name not specified\n");
- return net_rap_user_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_user_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
-
- safe_strcpy(userinfo.user_name, argv[0], sizeof(userinfo.user_name));
- if (opt_flags == -1)
- opt_flags = 0x21;
-
- userinfo.userflags = opt_flags;
+
+ safe_strcpy(userinfo.user_name, argv[0], sizeof(userinfo.user_name)-1);
+ if (c->opt_flags == -1)
+ c->opt_flags = 0x21;
+
+ userinfo.userflags = c->opt_flags;
userinfo.reserved1 = '\0';
- userinfo.comment = opt_comment;
- userinfo.priv = 1;
+ userinfo.comment = smb_xstrdup(c->opt_comment ? c->opt_comment : "");
+ userinfo.priv = 1;
userinfo.home_dir = NULL;
userinfo.logon_script = NULL;
-
+ userinfo.passwrd[0] = '\0';
+
ret = cli_NetUserAdd(cli, &userinfo);
+
cli_shutdown(cli);
return ret;
}
-static int rap_user_info(int argc, const char **argv)
+static int rap_user_info(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc == 0) {
- d_printf("\n\nUser name not specified\n");
- return net_rap_user_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_user_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetUserGetGroups(cli, argv[0], group_member_fn, NULL);
return ret;
}
-int net_rap_user(int argc, const char **argv)
+int net_rap_user(struct net_context *c, int argc, const char **argv)
{
+ int ret = -1;
struct functable func[] = {
- {"ADD", rap_user_add},
- {"INFO", rap_user_info},
- {"DELETE", rap_user_delete},
- {NULL, NULL}
+ {
+ "add",
+ rap_user_add,
+ NET_TRANSPORT_RAP,
+ "Add specified user",
+ "net rap user add\n"
+ " Add specified user"
+ },
+ {
+ "info",
+ rap_user_info,
+ NET_TRANSPORT_RAP,
+ "List domain groups of specified user",
+ "net rap user info\n"
+ " List domain groups of specified user"
+
+ },
+ {
+ "delete",
+ rap_user_delete,
+ NET_TRANSPORT_RAP,
+ "Remove specified user",
+ "net rap user delete\n"
+ " Remove specified user"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
if (argc == 0) {
struct cli_state *cli;
- int ret;
- if (!(cli = net_make_ipc_connection(0)))
- return -1;
- if (opt_long_list_entries) {
- d_printf(
- "\nListing users on remote server:\n\n"\
- "\nUser name Description "\
- "Home Directory Profile Directory"\
- "\n--------- ----------- "\
- "-------------- -----------------\n");
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap user\n"
+ " List all users\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
+ goto done;
+ if (c->opt_long_list_entries) {
+ d_printf("\nUser name Comment"
+ "\n-----------------------------\n");
ret = cli_RNetUserEnum(cli, long_user_fn, NULL);
cli_shutdown(cli);
- return ret;
+ goto done;
}
- ret = cli_RNetUserEnum(cli, user_fn, NULL);
+ ret = cli_RNetUserEnum0(cli, user_fn, NULL);
cli_shutdown(cli);
- return ret;
+ goto done;
}
- return net_run_function(argc, argv, func, net_rap_user_usage);
+ ret = net_run_function(c, argc, argv, "net rap user", func);
+ done:
+ if (ret != 0) {
+ DEBUG(1, ("Net user returned: %d\n", ret));
+ }
+ return ret;
}
-int net_rap_group_usage(int argc, const char **argv)
+int net_rap_group_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf("net rap group [misc. options] [targets]"\
- "\n\tList user groups\n");
- d_printf("\nnet rap group DELETE <name> [misc. options] [targets]"\
- "\n\tDelete specified group\n");
- d_printf("\nnet rap group ADD <name> [-C comment] [misc. options]"\
- " [targets]\n\tCreate specified group\n");
-
- general_rap_usage(argc, argv);
- d_printf(
- "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
- return -1;
+ return net_group_usage(c, argc, argv);
}
static void long_group_fn(const char *group_name, const char *comment,
void *state)
{
- d_printf("%-21.21s %-50.50s\n", group_name, comment);
+ d_printf("%-21.21s %s\n", group_name, comment);
}
-static void group_fn(const char *group_name, const char *comment, void *state)
+static void group_fn(const char *group_name, void *state)
{
d_printf("%-21.21s\n", group_name);
}
-static int rap_group_delete(int argc, const char **argv)
+static int rap_group_delete(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc == 0) {
- d_printf("\n\nGroup name not specified\n");
- return net_rap_group_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_group_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetGroupDelete(cli, argv[0]);
return ret;
}
-static int rap_group_add(int argc, const char **argv)
+static int rap_group_add(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
RAP_GROUP_INFO_1 grinfo;
- if (argc == 0) {
- d_printf("\n\nGroup name not specified\n");
- return net_rap_group_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_group_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
-
+
/* BB check for length 21 or smaller explicitly ? BB */
- safe_strcpy(grinfo.group_name, argv[0], sizeof(grinfo.group_name));
+ safe_strcpy(grinfo.group_name, argv[0], sizeof(grinfo.group_name)-1);
grinfo.reserved1 = '\0';
- grinfo.comment = opt_comment;
-
+ grinfo.comment = smb_xstrdup(c->opt_comment);
+
ret = cli_NetGroupAdd(cli, &grinfo);
cli_shutdown(cli);
return ret;
}
-int net_rap_group(int argc, const char **argv)
+int net_rap_group(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"ADD", rap_group_add},
- {"DELETE", rap_group_delete},
- {NULL, NULL}
+ {
+ "add",
+ rap_group_add,
+ NET_TRANSPORT_RAP,
+ "Add specified group",
+ "net rap group add\n"
+ " Add specified group"
+ },
+ {
+ "delete",
+ rap_group_delete,
+ NET_TRANSPORT_RAP,
+ "Delete specified group",
+ "net rap group delete\n"
+ " Delete specified group"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
if (argc == 0) {
struct cli_state *cli;
int ret;
- if (!(cli = net_make_ipc_connection(0)))
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap group\n"
+ " List all groups\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
d_printf("Group name Comment\n");
d_printf("-----------------------------\n");
ret = cli_RNetGroupEnum(cli, long_group_fn, NULL);
cli_shutdown(cli);
return ret;
}
- ret = cli_RNetGroupEnum(cli, group_fn, NULL);
+ ret = cli_RNetGroupEnum0(cli, group_fn, NULL);
cli_shutdown(cli);
return ret;
}
- return net_run_function(argc, argv, func, net_rap_group_usage);
+ return net_run_function(c, argc, argv, "net rap group", func);
}
-int net_rap_groupmember_usage(int argc, const char **argv)
+int net_rap_groupmember_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(
- "net rap groupmember LIST <group> [misc. options] [targets]"\
- "\n\t Enumerate users in a group\n"\
- "\nnet rap groupmember DELETE <group> <user> [misc. options] "\
- "[targets]\n\t Delete sepcified user from specified group\n"\
- "\nnet rap groupmember ADD <group> <user> [misc. options] [targets]"\
+ "net rap groupmember LIST <group> [misc. options] [targets]"
+ "\n\t Enumerate users in a group\n"
+ "\nnet rap groupmember DELETE <group> <user> [misc. options] "
+ "[targets]\n\t Delete specified user from specified group\n"
+ "\nnet rap groupmember ADD <group> <user> [misc. options] [targets]"
"\n\t Add specified user to specified group\n");
- general_rap_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
-static int rap_groupmember_add(int argc, const char **argv)
+static int rap_groupmember_add(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc != 2) {
- d_printf("\n\nGroup or user name not specified\n");
- return net_rap_groupmember_usage(argc, argv);
+ if (argc != 2 || c->display_usage) {
+ return net_rap_groupmember_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetGroupAddUser(cli, argv[0], argv[1]);
return ret;
}
-static int rap_groupmember_delete(int argc, const char **argv)
+static int rap_groupmember_delete(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc != 2) {
- d_printf("\n\nGroup or user name not specified\n");
- return net_rap_groupmember_usage(argc, argv);
+ if (argc != 2 || c->display_usage) {
+ return net_rap_groupmember_usage(c, argc, argv);
}
-
- if (!(cli = net_make_ipc_connection(0)))
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
ret = cli_NetGroupDelUser(cli, argv[0], argv[1]);
return ret;
}
-static int rap_groupmember_list(int argc, const char **argv)
+static int rap_groupmember_list(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
- if (argc == 0) {
- d_printf("\n\nGroup name not specified\n");
- return net_rap_groupmember_usage(argc, argv);
+ if (argc == 0 || c->display_usage) {
+ return net_rap_groupmember_usage(c, argc, argv);
}
- if (!(cli = net_make_ipc_connection(0)))
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- ret = cli_NetGroupGetUsers(cli, argv[0], group_member_fn, NULL );
+ ret = cli_NetGroupGetUsers(cli, argv[0], group_member_fn, NULL );
cli_shutdown(cli);
return ret;
}
-int net_rap_groupmember(int argc, const char **argv)
+int net_rap_groupmember(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"ADD", rap_groupmember_add},
- {"LIST", rap_groupmember_list},
- {"DELETE", rap_groupmember_delete},
- {NULL, NULL}
+ {
+ "add",
+ rap_groupmember_add,
+ NET_TRANSPORT_RAP,
+ "Add specified user to group",
+ "net rap groupmember add\n"
+ " Add specified user to group"
+ },
+ {
+ "list",
+ rap_groupmember_list,
+ NET_TRANSPORT_RAP,
+ "List users in group",
+ "net rap groupmember list\n"
+ " List users in group"
+ },
+ {
+ "delete",
+ rap_groupmember_delete,
+ NET_TRANSPORT_RAP,
+ "Remove user from group",
+ "net rap groupmember delete\n"
+ " Remove user from group"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
-
- return net_run_function(argc, argv, func, net_rap_groupmember_usage);
+
+ return net_run_function(c, argc, argv, "net rap groupmember", func);
}
-int net_rap_validate_usage(int argc, const char **argv)
+int net_rap_validate_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf("net rap validate <username> [password]\n"\
- "\tValidate user and password to check whether they"\
+ d_printf("net rap validate <username> [password]\n"
+ "\tValidate user and password to check whether they"
" can access target server or domain\n");
- general_rap_usage(argc, argv);
+ net_common_flags_usage(c, argc, argv);
return -1;
}
-int net_rap_validate(int argc, const char **argv)
+int net_rap_validate(struct net_context *c, int argc, const char **argv)
{
return errmsg_not_implemented();
}
-int net_rap_service_usage(int argc, const char **argv)
+int net_rap_service_usage(struct net_context *c, int argc, const char **argv)
{
- d_printf("net rap service [misc. options] [targets] \n"\
+ d_printf("net rap service [misc. options] [targets] \n"
"\tlists all running service daemons on target server\n");
- d_printf("\nnet rap service START <name> [service startup arguments]"\
- " [misc. options] [targets]"\
+ d_printf("\nnet rap service START <name> [service startup arguments]"
+ " [misc. options] [targets]"
"\n\tStart named service on remote server\n");
- d_printf("\nnet rap service STOP <name> [misc. options] [targets]\n"\
+ d_printf("\nnet rap service STOP <name> [misc. options] [targets]\n"
"\n\tStop named service on remote server\n");
-
- general_rap_usage(argc, argv);
+
+ net_common_flags_usage(c, argc, argv);
return -1;
}
-static int rap_service_start(int argc, const char **argv)
+static int rap_service_start(struct net_context *c, int argc, const char **argv)
{
return errmsg_not_implemented();
}
-static int rap_service_stop(int argc, const char **argv)
+static int rap_service_stop(struct net_context *c, int argc, const char **argv)
{
return errmsg_not_implemented();
}
-int net_rap_service(int argc, const char **argv)
+static void service_fn(const char *service_name, const char *dummy,
+ void *state)
+{
+ d_printf("%-21.21s\n", service_name);
+}
+
+int net_rap_service(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"START", rap_service_start},
- {"STOP", rap_service_stop},
- {NULL, NULL}
+ {
+ "start",
+ rap_service_start,
+ NET_TRANSPORT_RAP,
+ "Start service on remote server",
+ "net rap service start\n"
+ " Start service on remote server"
+ },
+ {
+ "stop",
+ rap_service_stop,
+ NET_TRANSPORT_RAP,
+ "Stop named serve on remote server",
+ "net rap service stop\n"
+ " Stop named serve on remote server"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
if (argc == 0) {
struct cli_state *cli;
int ret;
- if (!(cli = net_make_ipc_connection(0)))
+ if (c->display_usage) {
+ d_printf("Usage:\n");
+ d_printf("net rap service\n"
+ " List services on remote server\n");
+ net_display_usage_from_functable(func);
+ return 0;
+ }
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
- if (opt_long_list_entries) {
+ if (c->opt_long_list_entries) {
d_printf("Service name Comment\n");
d_printf("-----------------------------\n");
ret = cli_RNetServiceEnum(cli, long_group_fn, NULL);
}
- ret = cli_RNetServiceEnum(cli, group_fn, NULL);
+ ret = cli_RNetServiceEnum(cli, service_fn, NULL);
cli_shutdown(cli);
return ret;
}
- return net_run_function(argc, argv, func, net_rap_service_usage);
+ return net_run_function(c, argc, argv, "net rap service", func);
}
-int net_rap_password_usage(int argc, const char **argv)
+int net_rap_password_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(
- "net rap password <user> <oldpwo> <newpw> [misc. options] [target]\n"\
- "\tchanges the password for the specified user at target\n");
-
+ "net rap password <user> <oldpwo> <newpw> [misc. options] [target]\n"
+ "\tchanges the password for the specified user at target\n");
+
return -1;
}
-int net_rap_password(int argc, const char **argv)
+int net_rap_password(struct net_context *c, int argc, const char **argv)
{
struct cli_state *cli;
int ret;
-
- if (argc < 3)
- return net_rap_password_usage(argc, argv);
- if (!(cli = net_make_ipc_connection(0)))
+ if (argc < 3 || c->display_usage)
+ return net_rap_password_usage(c, argc, argv);
+
+ if (!NT_STATUS_IS_OK(net_make_ipc_connection(c, 0, &cli)))
return -1;
/* BB Add check for password lengths? */
return ret;
}
-int net_rap_admin_usage(int argc, const char **argv)
+int net_rap_admin_usage(struct net_context *c, int argc, const char **argv)
{
d_printf(
- "net rap admin <remote command> [cmd args [env]] [misc. options] [targets]"\
- "\n\texecutes a remote command on an os/2 target server\n");
-
- return -1;
-}
-
-
-int net_rap_admin(int argc, const char **argv)
-{
- return errmsg_not_implemented();
-}
-
-/* The help subsystem for the RAP subcommand */
+ "net rap admin <remote command> [cmd args [env]] [misc. options] [targets]"
+ "\n\texecutes a remote command on an os/2 target server\n");
-int net_rap_usage(int argc, const char **argv)
-{
- d_printf(" net rap domain \tto list domains \n"\
- " net rap file \tto list open files on a server \n"\
- " net rap group \tto list user groups \n"\
- " net rap groupmember to list users in a group \n"\
- " net rap password\t to change the password of a user\n"\
- " net rap printq \tto list the print queues on a server\n"\
- " net rap server \tto list servers in a domain\n"\
- " net rap session \tto list clients with open sessions to a server\n"\
- " net rap share \tto list shares exported by a server\n"\
- " net rap user \tto list users\n"\
- " net rap validate \tto check whether a user and the corresponding password are valid\n"\
- " net rap help\n"\
- "\nType \"net help <option>\" to get more information on that option\n\n");
-
- general_rap_usage(argc, argv);
return -1;
}
-int rap_help_usage(int argc, const char **argv)
-{
- d_printf("\n"\
- "Usage: net rap help <function>\n"\
- "\n"\
- "Valid functions are:\n"\
- " FILE SHARE SESSION SERVER DOMAIN PRINTQ USER GROUP\n"\
- " VALIDATE GROUPMEMBER ADMIN SERVICE PASSWORD\n");
- return -1;
-}
-/*
- handle "net help rap *" subcommands
-*/
-static int net_rap_help(int argc, const char **argv)
+int net_rap_admin(struct net_context *c, int argc, const char **argv)
{
- struct functable func[] = {
- {"FILE", net_rap_file_usage},
- {"SHARE", net_rap_share_usage},
- {"SESSION", net_rap_session_usage},
- {"SERVER", net_rap_server_usage},
- {"DOMAIN", net_rap_domain_usage},
- {"PRINTQ", net_rap_printq_usage},
- {"USER", net_rap_user_usage},
- {"GROUP", net_rap_group_usage},
- {"VALIDATE", net_rap_validate_usage},
- {"GROUPMEMBER", net_rap_groupmember_usage},
- {"ADMIN", net_rap_admin_usage},
- {"SERVICE", net_rap_service_usage},
- {"PASSWORD", net_rap_password_usage},
- {NULL, NULL}};
-
- return net_run_function(argc, argv, func, rap_help_usage);
+ return errmsg_not_implemented();
}
/* Entry-point for all the RAP functions. */
-int net_rap(int argc, const char **argv)
+int net_rap(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"FILE", net_rap_file},
- {"SHARE", net_rap_share},
- {"SESSION", net_rap_session},
- {"SERVER", net_rap_server},
- {"DOMAIN", net_rap_domain},
- {"PRINTQ", net_rap_printq},
- {"USER", net_rap_user},
- {"GROUP", net_rap_group},
- {"VALIDATE", net_rap_validate},
- {"GROUPMEMBER", net_rap_groupmember},
- {"ADMIN", net_rap_admin},
- {"SERVICE", net_rap_service},
- {"PASSWORD", net_rap_password},
- {"HELP", net_rap_help},
- {NULL, NULL}
+ {
+ "file",
+ net_rap_file,
+ NET_TRANSPORT_RAP,
+ "List open files",
+ "net rap file\n"
+ " List open files"
+ },
+ {
+ "share",
+ net_rap_share,
+ NET_TRANSPORT_RAP,
+ "List shares exported by server",
+ "net rap share\n"
+ " List shares exported by server"
+ },
+ {
+ "session",
+ net_rap_session,
+ NET_TRANSPORT_RAP,
+ "List open sessions",
+ "net rap session\n"
+ " List open sessions"
+ },
+ {
+ "server",
+ net_rap_server,
+ NET_TRANSPORT_RAP,
+ "List servers in workgroup",
+ "net rap server\n"
+ " List servers in domain/workgroup"
+ },
+ {
+ "domain",
+ net_rap_domain,
+ NET_TRANSPORT_RAP,
+ "List domains in network",
+ "net rap domain\n"
+ " List domains in network"
+ },
+ {
+ "printq",
+ net_rap_printq,
+ NET_TRANSPORT_RAP,
+ "List printer queues on server",
+ "net rap printq\n"
+ " List printer queues on server"
+ },
+ {
+ "user",
+ net_rap_user,
+ NET_TRANSPORT_RAP,
+ "List users",
+ "net rap user\n"
+ " List users"
+ },
+ {
+ "group",
+ net_rap_group,
+ NET_TRANSPORT_RAP,
+ "List user groups",
+ "net rap group\n"
+ " List user groups"
+ },
+ {
+ "validate",
+ net_rap_validate,
+ NET_TRANSPORT_RAP,
+ "Check username/password",
+ "net rap validate\n"
+ " Check username/password"
+ },
+ {
+ "groupmember",
+ net_rap_groupmember,
+ NET_TRANSPORT_RAP,
+ "List/modify group memberships",
+ "net rap groupmember\n"
+ " List/modify group memberships"
+ },
+ {
+ "admin",
+ net_rap_admin,
+ NET_TRANSPORT_RAP,
+ "Execute commands on remote OS/2",
+ "net rap admin\n"
+ " Execute commands on remote OS/2"
+ },
+ {
+ "service",
+ net_rap_service,
+ NET_TRANSPORT_RAP,
+ "Start/stop remote service",
+ "net rap service\n"
+ " Start/stop remote service"
+ },
+ {
+ "password",
+ net_rap_password,
+ NET_TRANSPORT_RAP,
+ "Change user password",
+ "net rap password\n"
+ " Change user password"
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
-
- return net_run_function(argc, argv, func, net_rap_usage);
+
+ return net_run_function(c, argc, argv, "net rap", func);
}
git.samba.org / ira / wip.git / blobdiff