r10656: BIG merge from trunk. Features not copied over

[tprouty/samba.git] / source3 / utils / net.h

diff --git a/source3/utils/net.h b/source3/utils/net.h
index af6f153f7ba66d8384921db44a7a9cb9a7fd04a1..2df13cfb8f1248d85e0ded24ba8ac10148d23f83 100644 (file)
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -16,7 +16,35 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* 
+ * A function of this type is passed to the '
+ * run_rpc_command' wrapper.  Must go before the net_proto.h 
+ * include
+ */
+
+typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *,
+                               const char *, 
+                               struct cli_state *cli,
+                               struct rpc_pipe_client *,
+                               TALLOC_CTX *,
+                               int,
+                               const char **);
+
+typedef struct copy_clistate {
+       TALLOC_CTX *mem_ctx;
+       struct cli_state *cli_share_src;
+       struct cli_state *cli_share_dst;
+       char *cwd;
+       uint16 attribute;
+}copy_clistate;
+
+/* INCLUDE FILES */
+
+#include "utils/net_proto.h"
  
+/* MACROS & DEFINES */
+
 #define NET_FLAGS_MASTER 1
 #define NET_FLAGS_DMB 2
 
@@ -33,19 +61,57 @@
 /* We want an anonymous connection */
 #define NET_FLAGS_ANONYMOUS 16 
 
+/* don't open an RPC pipe */
+#define NET_FLAGS_NO_PIPE 32
+
+/* net share operation modes */
+#define NET_MODE_SHARE_MIGRATE 1
 
 extern int opt_maxusers;
-extern char *opt_comment;
+extern const char *opt_comment;
+extern const char *opt_container;
 extern int opt_flags;
 
-extern char *opt_comment;
+extern const char *opt_comment;
 
-extern char *opt_target_workgroup;
+extern const char *opt_target_workgroup;
+extern const char *opt_workgroup;
 extern int opt_long_list_entries;
+extern int opt_verbose;
 extern int opt_reboot;
 extern int opt_force;
+extern int opt_machine_pass;
 extern int opt_timeout;
-extern char *opt_host;
-extern char *opt_user_name;
-extern char *opt_password;
+extern const char *opt_host;
+extern const char *opt_user_name;
+extern const char *opt_password;
 extern BOOL opt_user_specified;
+
+extern BOOL opt_localgroup;
+extern BOOL opt_domaingroup;
+extern const char *opt_newntname;
+extern int opt_rid;
+extern int opt_acls;
+extern int opt_attrs;
+extern int opt_timestamps;
+extern const char *opt_exclude;
+extern const char *opt_destination;
+
+extern BOOL opt_have_ip;
+extern struct in_addr opt_dest_ip;
+
+extern const char *share_type[];
+
+/* Structure for mapping accounts to groups */
+/* Array element is the group rid */
+typedef struct _groupmap {
+       uint32 rid;
+       uint32 gidNumber;
+       fstring sambaSID;
+       fstring group_dn;
+} GROUPMAP;
+
+typedef struct _accountmap {
+       uint32 rid;
+       fstring cn;
+} ACCOUNTMAP;