s3: Make run_rpc_command take strings instead of a ndr_interface_table

[abartlet/samba.git/.git] / source3 / utils / net_proto.h

diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 0d4714cf9f4c52e5cd93ba58a558382c7c381db1..92cd7a67375c35cd0d76285ddafb737e72ef4bb5 100644 (file)
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -42,7 +42,7 @@ void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
 
 /* The following definitions come from utils/net.c  */
 
-uint32 get_sec_channel_type(const char *param);
+enum netr_SchannelType get_sec_channel_type(const char *param);
 
 /* The following definitions come from utils/net_ads.c  */
 
@@ -145,8 +145,6 @@ int net_rap_password_usage(struct net_context *c, int argc, const char **argv);
 int net_rap_password(struct net_context *c, int argc, const char **argv);
 int net_rap_admin_usage(struct net_context *c, int argc, const char **argv);
 int net_rap_admin(struct net_context *c, int argc, const char **argv);
-int net_rap_help(struct net_context *c, int argc, const char **argv);
-int net_rap_usage(struct net_context *c, int argc, const char **argv);
 int net_rap(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_registry.c  */
@@ -160,7 +158,8 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx,
                                   const char **domain_name);
 int run_rpc_command(struct net_context *c,
                        struct cli_state *cli_arg,
-                       const int pipe_idx,
+                       const char *interface,
+                       uint32_t interface_version,
                        int conn_flags,
                        rpc_command_fn fn,
                        int argc,
@@ -214,8 +213,6 @@ bool net_rpc_check(struct net_context *c, unsigned flags);
 int rpc_printer_migrate(struct net_context *c, int argc, const char **argv);
 int rpc_printer_usage(struct net_context *c, int argc, const char **argv);
 int net_rpc_printer(struct net_context *c, int argc, const char **argv);
-int net_rpc_help(struct net_context *c, int argc, const char **argv);
-int net_rpc_usage(struct net_context *c, int argc, const char **argv);
 int net_rpc(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_rpc_audit.c  */
@@ -363,6 +360,25 @@ NTSTATUS rpc_vampire_internals(struct net_context *c,
                                TALLOC_CTX *mem_ctx,
                                int argc,
                                const char **argv);
+int rpc_vampire_passdb(struct net_context *c, int argc, const char **argv);
+int rpc_vampire_ldif(struct net_context *c, int argc, const char **argv);
+NTSTATUS rpc_vampire_ldif_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);
+NTSTATUS rpc_vampire_keytab_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);
+int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_rpc_service.c  */
 
@@ -408,6 +424,10 @@ int net_usershare_usage(struct net_context *c, int argc, const char **argv);
 int net_usershare_help(struct net_context *c, int argc, const char **argv);
 int net_usershare(struct net_context *c, int argc, const char **argv);
 
+/* The following definitions come from utils/net_eventlog.c  */
+
+int net_eventlog(struct net_context *c, int argc, const char **argv);
+
 /* The following definitions come from utils/net_util.c  */
 
 NTSTATUS net_rpc_lookup_name(struct net_context *c,
@@ -434,7 +454,8 @@ NTSTATUS connect_to_ipc_krb5(struct net_context *c,
                        struct sockaddr_storage *server_ss,
                        const char *server_name);
 NTSTATUS connect_dst_pipe(struct net_context *c, struct cli_state **cli_dst,
-                         struct rpc_pipe_client **pp_pipe_hnd, int pipe_num);
+                         struct rpc_pipe_client **pp_pipe_hnd,
+                         const struct ndr_syntax_id *interface);
 int net_use_krb_machine_account(struct net_context *c);
 int net_use_machine_account(struct net_context *c);
 bool net_find_server(struct net_context *c,
@@ -453,14 +474,14 @@ NTSTATUS net_make_ipc_connection_ex(struct net_context *c ,const char *domain,
                                    unsigned flags, struct cli_state **pcli);
 const char *net_prompt_pass(struct net_context *c, const char *user);
 int net_run_function(struct net_context *c, int argc, const char **argv,
-                    struct functable *table,
-                    int (*usage_fn)(struct net_context *c,
-                                    int argc, const char **argv));
-int net_run_function2(struct net_context *c, int argc, const char **argv,
-                     const char *whoami, struct functable2 *table);
-int net_run_function3(struct net_context *c, int argc, const char **argv,
-                     const char *whoami, struct functable3 *table);
-void net_display_usage_from_functable(struct functable3 *table);
+                     const char *whoami, struct functable *table);
+void net_display_usage_from_functable(struct functable *table);
+
+const char *net_share_type_str(int num_type);
+
+NTSTATUS net_scan_dc(struct net_context *c,
+                    struct cli_state *cli,
+                    struct net_dc_info *dc_info);
 
 /* The following definitions come from utils/netlookup.c  */