s3:net_util: pass const sockaddr_storage to net_make_ipc_connection_ex()

[metze/samba/wip.git] / source3 / utils / net_proto.h

diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 2475c9f35dafa22b6022278dd4c8b37d0745e521..1e89507fa88e7c4b8a926f9841f601093983d8ac 100644 (file)
--- 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,7 +87,6 @@ int net_help(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_idmap.c  */
 
-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  */
@@ -332,32 +332,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  */
@@ -424,22 +400,22 @@ 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 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,
@@ -458,7 +434,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,
@@ -489,4 +465,7 @@ 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);
+
 #endif /*  _NET_PROTO_H_  */