Refactoring: net_sh_run uses ndr_syntax_id instead of pipe_idx

[kai/samba.git] / source3 / utils / net_rpc.c

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 375c1518ab29b2f6c3faa7ebfebe5f6620dcc92f..5989fd4cf1c9c0f2b6dcf7be1dab73a60ac07e2f 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -59,8 +59,9 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        NTSTATUS result = NT_STATUS_OK;
        union lsa_PolicyInformation *info = NULL;
 
        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;
        }
                d_fprintf(stderr, "Could not initialise lsa pipe\n");
                return result;
        }


@@ -99,15 +100,15 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx,
  * @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 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,
  */
 
 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,
                        int conn_flags,
                        rpc_command_fn fn,
                        int argc,


@@ -152,23 +153,36 @@ int run_rpc_command(struct net_context *c,
        }
 
        if (!(conn_flags & NET_FLAGS_NO_PIPE)) {
        }
 
        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. */
                        /* 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 {
                                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",
                                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;
                                        nt_errstr(nt_status) ));
                                cli_shutdown(cli);
                                return -1;


@@ -203,14 +217,14 @@ int run_rpc_command(struct net_context *c,
  * Force a change of the trust acccount password.
  *
  * All parameters are provided by the run_rpc_command function, except for
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -231,16 +245,24 @@ static NTSTATUS rpc_changetrustpw_internals(struct net_context *c,
 /**
  * Force a change of the trust acccount password.
  *
 /**
  * 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)
 {
  **/
 
 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);
 }
                               rpc_changetrustpw_internals,
                               argc, argv);
 }


@@ -253,14 +275,14 @@ int net_rpc_changetrustpw(struct net_context *c, int argc, const char **argv)
  * The password should be created with 'server manager' or equiv first.
  *
  * All parameters are provided by the run_rpc_command function, except for
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -280,8 +302,9 @@ static NTSTATUS rpc_oldjoin_internals(struct net_context *c,
        NTSTATUS result;
        uint32 sec_channel_type;
 
        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,
                DEBUG(0,("rpc_oldjoin_internals: netlogon pipe open to machine %s failed. "
                        "error was %s\n",
                        cli->desthost,


@@ -330,16 +353,16 @@ static NTSTATUS rpc_oldjoin_internals(struct net_context *c,
 /**
  * Join a domain, the old way.
  *
 /**
  * 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)
 {
  **/
 
 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);
                               NET_FLAGS_NO_PIPE | NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
                               rpc_oldjoin_internals,
                               argc, argv);


@@ -348,18 +371,27 @@ static int net_rpc_perform_oldjoin(struct net_context *c, int argc, const char *
 /**
  * Join a domain, the old way.  This function exists to allow
  * the message to be displayed when oldjoin was explicitly
 /**
  * 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)
 {
  **/
 
 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");
 
        if (rc) {
                d_fprintf(stderr, "Failed to join domain\n");


@@ -368,41 +400,34 @@ static int net_rpc_oldjoin(struct net_context *c, int argc, const char **argv)
        return rc;
 }
 
        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.
 /**
  * '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
  *              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)
 {
  * 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;
        if (lp_server_role() == ROLE_STANDALONE) {
                d_printf("cannot join as standalone machine\n");
                return -1;


@@ -429,10 +454,10 @@ int net_rpc_join(struct net_context *c, int argc, const char **argv)
  *
  * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -494,30 +519,37 @@ NTSTATUS rpc_info_internals(struct net_context *c,
 
 /**
  * 'net rpc info' entrypoint.
 
 /**
  * '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)
 {
  **/
 
 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);
 }
 
 /**
                               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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -547,14 +579,21 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c,
 
 /**
  * 'net rpc getsid' entrypoint.
 
 /**
  * '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)
 {
  **/
 
 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);
                               NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
                               rpc_getsid_internals,
                               argc, argv);


@@ -563,9 +602,9 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
 /****************************************************************************/
 
 /**
 /****************************************************************************/
 
 /**

- * Basic usage function for 'net rpc user'
+ * Basic usage function for 'net rpc user'.

  * @param argc Standard main() style argc.
  * @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.
  **/
 
  *             stripped.
  **/
 


@@ -575,13 +614,13 @@ static int rpc_user_usage(struct net_context *c, int argc, const char **argv)
 }
 
 /**
 }
 
 /**

- * 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)
  **/
 
 static int rpc_user_add(struct net_context *c, int argc, const char **argv)


@@ -590,8 +629,7 @@ static int rpc_user_add(struct net_context *c, int argc, const char **argv)
        struct USER_INFO_1 info1;
        uint32_t parm_error = 0;
 
        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;
        }
                rpc_user_usage(c, argc, argv);
                return 0;
        }


@@ -618,17 +656,17 @@ static int rpc_user_add(struct net_context *c, int argc, const char **argv)
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -650,8 +688,7 @@ static NTSTATUS rpc_user_rename_internals(struct net_context *c,
        struct lsa_String lsa_acct_name;
        union samr_UserInfo *info = NULL;
 
        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;
        }
                rpc_user_usage(c, argc, argv);
                return NT_STATUS_OK;
        }


@@ -737,37 +774,36 @@ static NTSTATUS rpc_user_rename_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 
 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;
 
  **/
 
 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;
        }
                rpc_user_usage(c, argc, argv);
                return 0;
        }


@@ -787,17 +823,17 @@ static int rpc_user_delete(struct net_context *c, int argc, const char **argv)
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -819,8 +855,7 @@ static NTSTATUS rpc_user_password_internals(struct net_context *c,
        char *prompt = NULL;
        union samr_UserInfo info;
 
        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;
        }
                rpc_user_usage(c, argc, argv);
                return NT_STATUS_OK;
        }


@@ -911,33 +946,33 @@ static NTSTATUS rpc_user_password_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 
 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -962,8 +997,7 @@ static NTSTATUS rpc_user_info_internals(struct net_context *c,
        struct lsa_String lsa_acct_name;
 
 
        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;
        }
                rpc_user_usage(c, argc, argv);
                return NT_STATUS_OK;
        }


@@ -1042,33 +1076,33 @@ static NTSTATUS rpc_user_info_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -1109,7 +1143,7 @@ static NTSTATUS rpc_user_list_internals(struct net_context *c,
 
        /* Query domain users */
        if (c->opt_long_list_entries)
 
        /* 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;
                         "\n-----------------------------\n");
        do {
                const char *user = NULL;


@@ -1151,9 +1185,9 @@ static NTSTATUS rpc_user_list_internals(struct net_context *c,
 
 /**
  * 'net rpc user' entrypoint.
 
 /**
  * '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)
  **/
 
 int net_rpc_user(struct net_context *c, int argc, const char **argv)


@@ -1161,12 +1195,47 @@ int net_rpc_user(struct net_context *c, int argc, const char **argv)
        NET_API_STATUS status;
 
        struct functable func[] = {
        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);
        };
 
        status = libnetapi_init(&c->netapi_ctx);


@@ -1177,12 +1246,20 @@ int net_rpc_user(struct net_context *c, int argc, const char **argv)
        libnetapi_set_password(c->netapi_ctx, c->opt_password);
 
        if (argc == 0) {
        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);
        }
 
                                       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 NTSTATUS rpc_sh_user_list(struct net_context *c,


@@ -1515,34 +1592,34 @@ struct rpc_sh_cmd *net_rpc_user_edit_cmds(struct net_context *c,
 {
        static struct rpc_sh_cmd cmds[] = {
 
 {
        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" },
 
                  "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" },
 
                  "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" },
 
                  "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" },
 
                  "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" },
 
                  "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" },
 
                  "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" },
 
                  "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" },
 
                  "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" },
 
                  "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 }
                  "Show/Set whether a user's password does not expire" },
 
                { NULL, NULL, 0, NULL, NULL }


@@ -1557,13 +1634,13 @@ struct rpc_sh_cmd *net_rpc_user_cmds(struct net_context *c,
 {
        static struct rpc_sh_cmd cmds[] = {
 
 {
        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" },
 
                  "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" },
 
                  "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,
                  "Show info about a user" },
 
                { "edit", net_rpc_user_edit_cmds, 0, NULL,


@@ -1578,9 +1655,9 @@ struct rpc_sh_cmd *net_rpc_user_cmds(struct net_context *c,
 /****************************************************************************/
 
 /**
 /****************************************************************************/
 
 /**

- * Basic usage function for 'net rpc group'
+ * Basic usage function for 'net rpc group'.

  * @param argc Standard main() style argc.
  * @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.
  **/
 
  *             stripped.
  **/
 


@@ -1590,17 +1667,17 @@ static int rpc_group_usage(struct net_context *c, int argc, const char **argv)
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -1627,8 +1704,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c,
        struct lsa_String lsa_acct_name;
        union samr_UserInfo *info = NULL;
 
        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? */
        }
                rpc_group_usage(c, argc,argv);
                return NT_STATUS_OK; /* ok? */
        }


@@ -1802,79 +1878,40 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c,
 
 static int rpc_group_delete(struct net_context *c, int argc, const char **argv)
 {
 
 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);
                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,
 }
 
 static NTSTATUS rpc_alias_add_internals(struct net_context *c,


@@ -1892,8 +1929,7 @@ static NTSTATUS rpc_alias_add_internals(struct net_context *c,
        struct lsa_String alias_name;
        uint32_t rid = 0;
 
        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;
        }
                rpc_group_usage(c, argc, argv);
                return NT_STATUS_OK;
        }


@@ -1952,13 +1988,11 @@ static NTSTATUS rpc_alias_add_internals(struct net_context *c,
 static int rpc_group_add(struct net_context *c, int argc, const char **argv)
 {
        if (c->opt_localgroup)
 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);
 
                                       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,
 }
 
 static NTSTATUS get_sid_from_name(struct cli_state *cli,


@@ -1973,8 +2007,9 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
        POLICY_HND lsa_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
        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;
        }
 
                goto done;
        }
 


@@ -2173,8 +2208,12 @@ static NTSTATUS rpc_group_addmem_internals(struct net_context *c,
        DOM_SID group_sid;
        enum lsa_SidType group_type;
 
        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;
        }
 
                return NT_STATUS_UNSUCCESSFUL;
        }
 


@@ -2214,7 +2253,7 @@ static NTSTATUS rpc_group_addmem_internals(struct net_context *c,
 
 static int rpc_group_addmem(struct net_context *c, int argc, const char **argv)
 {
 
 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);
 }
                               rpc_group_addmem_internals,
                               argc, argv);
 }


@@ -2368,8 +2407,12 @@ static NTSTATUS rpc_group_delmem_internals(struct net_context *c,
        DOM_SID group_sid;
        enum lsa_SidType group_type;
 
        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;
        }
 
                return NT_STATUS_UNSUCCESSFUL;
        }
 


@@ -2409,23 +2452,23 @@ static NTSTATUS rpc_group_delmem_internals(struct net_context *c,
 
 static int rpc_group_delmem(struct net_context *c, int argc, const char **argv)
 {
 
 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);
 }
 
 /**
                               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.
  *
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -2447,6 +2490,18 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
        bool local = false;
        bool builtin = false;
 
        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;
        if (argc == 0) {
                global = true;
                local = true;


@@ -2487,7 +2542,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
 
        /* Query domain groups */
        if (c->opt_long_list_entries)
 
        /* 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;
                         "\n-----------------------------\n");
        do {
                uint32_t max_size, total_size, returned_size;


@@ -2643,7 +2698,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
 
 static int rpc_group_list(struct net_context *c, int argc, const char **argv)
 {
 
 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);
 }
                               rpc_group_list_internals,
                               argc, argv);
 }


@@ -2766,9 +2821,10 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c,
                return NT_STATUS_OK;
        }
 
                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;
                d_fprintf(stderr, "Couldn't open LSA pipe. Error was %s\n",
                        nt_errstr(result) );
                return result;


@@ -2924,156 +2980,168 @@ static NTSTATUS rpc_group_members_internals(struct net_context *c,
 
 static int rpc_group_members(struct net_context *c, int argc, const char **argv)
 {
 
 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 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);
 }
 
                               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");
 
        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)
 {
 }
 
 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 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.
 }
 
 /**
  * '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)
 {
  **/
 
 int net_rpc_group(struct net_context *c, int argc, const char **argv)
 {

+       NET_API_STATUS status;
+

        struct functable func[] = {
        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)
 {
 }
 
 /****************************************************************************/
 
 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -3128,27 +3196,26 @@ static NTSTATUS rpc_share_add_internals(struct net_context *c,
 
 static int rpc_share_add(struct net_context *c, int argc, const char **argv)
 {
 
 static int rpc_share_add(struct net_context *c, int argc, const char **argv)
 {

-       if ((argc < 1) || !strchr(argv[0], '=')) {
-               DEBUG(1,("Sharename or path not specified on add\n"));
+       if ((argc < 1) || !strchr(argv[0], '=') || c->display_usage) {

                return rpc_share_usage(c, argc, argv);
        }
                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);
 }
 
 /**
                               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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -3171,22 +3238,21 @@ static NTSTATUS rpc_share_del_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 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 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);
 }
                               rpc_share_del_internals,
                               argc, argv);
 }


@@ -3301,17 +3367,17 @@ done:
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -3345,8 +3411,8 @@ static NTSTATUS rpc_share_list_internals(struct net_context *c,
 
        if (c->opt_long_list_entries) {
                d_printf(
 
        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++)
        "----------   ----     -----------\n");
        }
        for (i = 0; i < info_ctr.ctr.ctr1->count; i++)


@@ -3357,14 +3423,21 @@ static NTSTATUS rpc_share_list_internals(struct net_context *c,
 
 /***
  * 'net rpc share list' entrypoint.
 
 /***
  * '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)
 {
  **/
 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)
 }
 
 static bool check_share_availability(struct cli_state *cli, const char *netname)


@@ -3404,17 +3477,17 @@ static bool check_share_sanity(struct net_context *c, struct cli_state *cli,
 }
 
 /**
 }
 
 /**

- * 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.
  *
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -3499,24 +3572,30 @@ done:
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 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;
        }
 
 
        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);
 }
                               rpc_share_migrate_shares_internals,
                               argc, argv);
 }


@@ -3696,17 +3775,17 @@ bool copy_top_level_perms(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -3732,6 +3811,10 @@ static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
        char *dst = NULL;
 
        dst = SMB_STRDUP(c->opt_destination?c->opt_destination:"127.0.0.1");
        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);
 
        result = get_share_info(c, pipe_hnd, mem_ctx, level, argc, argv,
                                &ctr_src);


@@ -3817,35 +3900,42 @@ done:
        if (got_dst_share)
                cli_shutdown(cp_clistate.cli_share_dst);
 
        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)
 {
        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) {
 
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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);
 }
 
 /**
                               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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -3928,37 +4018,43 @@ done:
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 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) {
 
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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)
                               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,
  *
  **/
 static int rpc_share_migrate_all(struct net_context *c, int argc,


@@ -3966,25 +4062,32 @@ static int rpc_share_migrate_all(struct net_context *c, int argc,
 {
        int ret;
 
 {
        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) {
        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 */
 
                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;
 
                              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;
 
                              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);
 }
                               rpc_share_migrate_security_internals, argc,
                               argv);
 }


@@ -3992,25 +4095,52 @@ static int rpc_share_migrate_all(struct net_context *c, int argc,
 
 /**
  * 'net rpc share migrate' entrypoint.
 
 /**
  * '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[] = {
  **/
 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;
 
        };
 
        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 {
 }
 
 struct full_alias {


@@ -4646,23 +4776,18 @@ static void collect_share(const char *name, uint32 m,
        share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
 }
 
        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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -4687,11 +4812,6 @@ static NTSTATUS rpc_share_allowedusers_internals(struct net_context *c,
 
        struct share_list share_list;
 
 
        struct share_list share_list;
 

-       if (argc > 1) {
-               rpc_share_userlist_usage();
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-

        if (argc == 0) {
                f = stdin;
        } else {
        if (argc == 0) {
                f = stdin;
        } else {


@@ -4755,19 +4875,26 @@ static int rpc_share_allowedusers(struct net_context *c, int argc,
 {
        int result;
 
 {
        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;
 
                                 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;
 
                                 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);
 }
                               rpc_share_allowedusers_internals,
                               argc, argv);
 }


@@ -4810,28 +4937,74 @@ int net_usersidlist_usage(struct net_context *c, int argc, const char **argv)
 
 /**
  * 'net rpc share' entrypoint.
 
 /**
  * '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[] = {
  **/
 
 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);
                                       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 NTSTATUS rpc_sh_share_list(struct net_context *c,


@@ -4946,16 +5119,16 @@ struct rpc_sh_cmd *net_rpc_share_cmds(struct net_context *c, TALLOC_CTX *mem_ctx
 {
        static struct rpc_sh_cmd cmds[] = {
 
 {
        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" },
 
          "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" },
 
          "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" },
 
          "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 }
          "Get information about a share" },
 
        { NULL, NULL, 0, NULL, NULL }


@@ -4972,18 +5145,18 @@ static int rpc_file_usage(struct net_context *c, int argc, const char **argv)
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -5002,22 +5175,21 @@ static NTSTATUS rpc_file_close_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 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 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);
 }
                               rpc_file_close_internals,
                               argc, argv);
 }


@@ -5035,18 +5207,18 @@ static void display_file_info_3(struct srvsvc_NetFileInfo3 *r)
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -5095,8 +5267,8 @@ static NTSTATUS rpc_file_list_internals(struct net_context *c,
        /* Display results */
 
        d_printf(
        /* 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]);
                 "\n------  ---------            -----  -----  ---- \n");
        for (i = 0; i < total_entries; i++)
                display_file_info_3(&info_ctr.ctr.ctr3->array[i]);


@@ -5105,66 +5277,95 @@ static NTSTATUS rpc_file_list_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 
 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 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.
                               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[] = {
  **/
 
 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
 #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
 #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);
                                       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.
  *
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -5192,18 +5393,18 @@ static NTSTATUS rpc_shutdown_abort_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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.
  *
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -5231,45 +5432,53 @@ static NTSTATUS rpc_reg_shutdown_abort_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 
 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"));
 
 
        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);
 }
 
 /**
                               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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -5314,18 +5523,18 @@ NTSTATUS rpc_init_shutdown_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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
  *
  * 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 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.
  **/
  *
  * @return Normal NTSTATUS return.
  **/


@@ -5375,24 +5584,32 @@ NTSTATUS rpc_reg_shutdown_internals(struct net_context *c,
 }
 
 /**
 }
 
 /**

- * 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)
 {
  **/
 
 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"));
 
        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);
        }
 
                                     rpc_reg_shutdown_internals, argc, argv);
        }
 


@@ -5408,15 +5625,15 @@ static int rpc_shutdown(struct net_context *c, int argc, const char **argv)
  * All parameters (except for argc and argv) are passed by run_rpc_command
  * function.
  *
  * 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 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,
  */
 
 static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,


@@ -5437,9 +5654,11 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
        uint32 user_rid;
        uint32_t access_granted = 0;
        union samr_UserInfo info;
        uint32 user_rid;
        uint32_t access_granted = 0;
        union samr_UserInfo info;

+       unsigned int orig_timeout;

 
        if (argc != 2) {
 
        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;
        }
 
                return NT_STATUS_INVALID_PARAMETER;
        }
 


@@ -5474,6 +5693,11 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
                goto done;
        }
 
                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 |
        /* Create trusting domain's account */
        acb_info = ACB_NORMAL;
        acct_flags = SEC_GENERIC_READ | SEC_GENERIC_WRITE | SEC_GENERIC_EXECUTE |


@@ -5490,7 +5714,13 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
                                         &user_pol,
                                         &access_granted,
                                         &user_rid);
                                         &user_pol,
                                         &access_granted,
                                         &user_rid);

+
+       /* And restore our original timeout. */
+       rpccli_set_timeout(pipe_hnd, orig_timeout);
+

        if (!NT_STATUS_IS_OK(result)) {
        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;
        }
 
                goto done;
        }
 


@@ -5548,19 +5778,20 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
 /**
  * Create interdomain trust account for a remote domain.
  *
 /**
  * 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)
 {
  **/
 
 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 {
                                       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;
        }
 }
                return -1;
        }
 }


@@ -5571,15 +5802,15 @@ static int rpc_trustdom_add(struct net_context *c, int argc, const char **argv)
  * All parameters (except for argc and argv) are passed by run_rpc_command
  * function.
  *
  * 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 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,
  */
 
 static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,


@@ -5642,6 +5873,8 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
                                         &name_types);
 
        if (!NT_STATUS_IS_OK(result)) {
                                         &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;
        }
 
                goto done;
        }
 


@@ -5652,6 +5885,8 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
                                      &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                                      &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;
        }
 
                goto done;
        }
 


@@ -5667,6 +5902,8 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
                                                           &user_pol,
                                                           &trust_acct_sid);
        if (!NT_STATUS_IS_OK(result)) {
                                                           &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;
        }
 
                goto done;
        }
 


@@ -5676,13 +5913,15 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
                                        &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                                        &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)) {
                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:
        }
 
  done:


@@ -5692,19 +5931,20 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
 /**
  * Delete interdomain trust account for a remote domain.
  *
 /**
  * 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)
 {
  **/
 
 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 {
                                       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;
        }
 }
                return -1;
        }
 }


@@ -5731,8 +5971,9 @@ static NTSTATUS rpc_trustdom_get_pdc(struct net_context *c,
 
        /* Try netr_GetDcName */
 
 
        /* 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;
        }
 
                return status;
        }
 


@@ -5757,11 +5998,11 @@ static NTSTATUS rpc_trustdom_get_pdc(struct net_context *c,
  * Establish trust relationship to a trusting domain.
  * Interdomain account must already be created on remote PDC.
  *
  * 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,
  **/
 
 static int rpc_trustdom_establish(struct net_context *c, int argc,


@@ -5784,8 +6025,9 @@ static int rpc_trustdom_establish(struct net_context *c, int argc,
         * Connect to \\server\ipc$ as 'our domain' account with password
         */
 
         * 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;
        }
 
                return -1;
        }
 


@@ -5859,8 +6101,9 @@ static int rpc_trustdom_establish(struct net_context *c, int argc,
         * Call LsaOpenPolicy and LsaQueryInfo
         */
 
         * 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);
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", nt_errstr(nt_status) ));
                cli_shutdown(cli);
                talloc_destroy(mem_ctx);


@@ -5929,13 +6172,13 @@ static int rpc_trustdom_establish(struct net_context *c, int argc,
 }
 
 /**
 }
 
 /**

- * 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,
  **/
 
 static int rpc_trustdom_revoke(struct net_context *c, int argc,


@@ -5944,7 +6187,13 @@ static int rpc_trustdom_revoke(struct net_context *c, int argc,
        char* domain_name;
        int rc = -1;
 
        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]);
 
        /* generate upper cased domain name */
        domain_name = smb_xstrdup(argv[0]);


@@ -5963,28 +6212,6 @@ done:
        return rc;
 }
 
        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,
 static NTSTATUS rpc_query_domain_sid(struct net_context *c,
                                        const DOM_SID *domain_sid,
                                        const char *domain_name,


@@ -6093,6 +6320,13 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
        struct lsa_DomainList dom_list;
        fstring pdc_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)
         */
        /*
         * Listing trusted domains (stored in secrets.tdb, if local)
         */


@@ -6122,8 +6356,9 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
                return -1;
        };
 
                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);
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
                        nt_errstr(nt_status) ));
                cli_shutdown(cli);


@@ -6242,6 +6477,13 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
        POLICY_HND domain_hnd;
        struct samr_SamArray *trusts = NULL;
 
        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)
         */
        /*
         * Listing trusted domains (stored in secrets.tdb, if local)
         */


@@ -6271,8 +6513,9 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
                return -1;
        };
 
                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);
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
                        nt_errstr(nt_status) ));
                cli_shutdown(cli);


@@ -6361,8 +6604,9 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
        /*
         * Open \PIPE\samr and get needed policy handles
         */
        /*
         * 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);
                DEBUG(0, ("Could not initialise samr pipe. Error was %s\n", nt_errstr(nt_status)));
                cli_shutdown(cli);
                talloc_destroy(mem_ctx);


@@ -6452,9 +6696,11 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
                                        &remote_cli);
                        if (NT_STATUS_IS_OK(nt_status)) {
                                /* query for domain's sid */
                                        &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);
                                        d_fprintf(stderr, "couldn't get domain's sid\n");
 
                                cli_shutdown(remote_cli);


@@ -6489,33 +6735,69 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
 }
 
 /**
 }
 
 /**

- * 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[] = {
  */
 
 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);

 }
 
 /**
 }
 
 /**


@@ -6559,29 +6841,72 @@ bool net_rpc_check(struct net_context *c, unsigned flags)
 
 /* dump sam database via samsync rpc calls */
 static int rpc_samdump(struct net_context *c, int argc, const char **argv) {
 
 /* 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 */
                               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 !
  *
  * 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,
  *
  **/
 static int rpc_printer_migrate_all(struct net_context *c, int argc,


@@ -6589,105 +6914,133 @@ static int rpc_printer_migrate_all(struct net_context *c, int argc,
 {
        int ret;
 
 {
        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) {
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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;
 
                              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;
 
                              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;
 
                              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;
 
                              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);
 
 }
 
 /**
                               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)
 {
  **/
 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) {
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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);
 }
 
 /**
                               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)
 {
  **/
 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) {
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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);
 }
 
 /**
                               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)
 {
  **/
 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) {
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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);
 }
                               rpc_printer_migrate_printers_internals,
                               argc, argv);
 }


@@ -6695,45 +7048,59 @@ static int rpc_printer_migrate_printers(struct net_context *c, int argc,
 /**
  * Migrate printer-ACLs from a print-server
  *
 /**
  * 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)
 {
  **/
 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) {
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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);
 }
 
 /**
                               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)
 {
  **/
 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) {
        if (!c->opt_host) {

-               printf("no server to migrate\n");
+               d_printf("no server to migrate\n");

                return -1;
        }
 
                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);
 }
                               rpc_printer_migrate_settings_internals,
                               argc, argv);
 }


@@ -6741,10 +7108,10 @@ static int rpc_printer_migrate_settings(struct net_context *c, int argc,
 /**
  * 'net rpc printer' entrypoint.
  *
 /**
  * '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)
  **/
 
 int rpc_printer_migrate(struct net_context *c, int argc, const char **argv)


@@ -6755,162 +7122,275 @@ int rpc_printer_migrate(struct net_context *c, int argc, const char **argv)
           *has* to exist */
 
        struct functable func[] = {
           *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)
 {
  **/
 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);
 }
 
 /**
                               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)
 {
  **/
 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);
 }
 
 /**
                               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)
 {
  **/
 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);
 }
 
 /**
                               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)
 {
  **/
 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);
 }
 
 /**
                               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)
 {
  **/
 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);
 }
 
 /**
                               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)
 {
  **/
 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);
 }
 
 
 /**
                               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[] = {
  **/
 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);
                               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);

 
 }
 
 
 }
 


@@ -6918,157 +7398,294 @@ static int rpc_printer_publish(struct net_context *c, int argc,
 /**
  * Display rpc printer help page.
  *
 /**
  * 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)
 {
  **/
 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.
  *
 }
 
 /**
  * '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[] = {
  **/
 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);
                               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.
  *
 }
 
 /**
  * '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[] = {
  **/
 
 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);

 }
 }