X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Futils%2Fnet_proto.h;h=3f99e14e6e8be3707fe2cb67b0a81c8ed4f6b4c8;hb=671f534e5e02adafe945a4e77813e80b5adaeb70;hp=99e0cbd7a4605378243f5aa1972d585ca60cfcd9;hpb=11016f2a6befc477c631c4f2ed8d9e7e4e250102;p=kai%2Fsamba.git

diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 99e0cbd7a46..3f99e14e6e8 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -23,6 +23,7 @@
 #ifndef _NET_PROTO_H_
 #define _NET_PROTO_H_
 
+#include "libads/ads_status.h"
 
 /* The following definitions come from utils/net.c  */
 
@@ -86,10 +87,6 @@ int net_help(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_idmap.c  */
 
-bool idmap_store_secret(const char *backend,
-			const char *domain, const char *identity,
-			const char *secret);
-int net_help_idmap(struct net_context *c, int argc, const char **argv);
 int net_idmap(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_join.c  */
@@ -142,7 +139,7 @@ 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 struct ndr_syntax_id *interface,
+		        const struct ndr_interface_table *table,
 			int conn_flags,
 			rpc_command_fn fn,
 			int argc,
@@ -205,7 +202,8 @@ int net_rpc_audit(struct net_context *c, int argc, const char **argv);
 /* The following definitions come from utils/net_rpc_join.c  */
 
 NTSTATUS net_rpc_join_ok(struct net_context *c, const char *domain,
-			 const char *server, struct sockaddr_storage *pss);
+			 const char *server,
+			 const struct sockaddr_storage *server_ss);
 int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv);
 int net_rpc_testjoin(struct net_context *c, int argc, const char **argv);
 
@@ -335,32 +333,8 @@ NTSTATUS rpc_samdump_internals(struct net_context *c,
 				int argc,
 				const char **argv);
 int rpc_vampire_usage(struct net_context *c, int argc, const char **argv);
-NTSTATUS rpc_vampire_internals(struct net_context *c,
-				const struct 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_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 struct 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 struct 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  */
@@ -427,23 +401,19 @@ NTSTATUS net_rpc_lookup_name(struct net_context *c,
 			     const char **ret_name, struct dom_sid *ret_sid,
 			     enum lsa_SidType *ret_type);
 NTSTATUS connect_to_service(struct net_context *c,
-					struct cli_state **cli_ctx,
-					struct sockaddr_storage *server_ss,
-					const char *server_name,
-					const char *service_name,
-					const char *service_type);
+			    struct cli_state **cli_ctx,
+			    const struct sockaddr_storage *server_ss,
+			    const char *server_name,
+			    const char *service_name,
+			    const char *service_type);
 NTSTATUS connect_to_ipc(struct net_context *c,
 			struct cli_state **cli_ctx,
-			struct sockaddr_storage *server_ss,
+			const struct sockaddr_storage *server_ss,
 			const char *server_name);
 NTSTATUS connect_to_ipc_anonymous(struct net_context *c,
 				struct cli_state **cli_ctx,
-				struct sockaddr_storage *server_ss,
+				const struct sockaddr_storage *server_ss,
 				const char *server_name);
-NTSTATUS connect_to_ipc_krb5(struct net_context *c,
-			struct cli_state **cli_ctx,
-			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,
 			  const struct ndr_syntax_id *interface);
@@ -461,7 +431,7 @@ NTSTATUS net_make_ipc_connection(struct net_context *c, unsigned flags,
 				 struct cli_state **pcli);
 NTSTATUS net_make_ipc_connection_ex(struct net_context *c ,const char *domain,
 				    const char *server,
-				    struct sockaddr_storage *pss,
+				    const struct sockaddr_storage *pss,
 				    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,
@@ -492,4 +462,10 @@ char *get_pass( const char *prompt, bool stdin_get);
 /* The following definitions come from utils/net_g_lock.c  */
 int net_g_lock(struct net_context *c, int argc, const char **argv);
 
+/* The following definitions come from utils/net_rpc_trust.c  */
+int net_rpc_trust(struct net_context *c, int argc, const char **argv);
+
+/* The following definitions come from utils/net_rpc_conf.c */
+int net_rpc_conf(struct net_context *c, int argc, const char **argv);
+
 #endif /*  _NET_PROTO_H_  */