first pass at merging rpcclient from TNG to HEAD. You can get a

semi-connection and a rpcclient prompt, but no functionality there yet.
Will be a few more days on that.

The changes to the header files were minor.  A few struct's and a few
additional fields to existing ones.  No deletions.  **minimal change
necessary** :-)  Well, maybe not minimal, but I tried.

All other programs compile, link and run ok from what I can tell so
I don;t think I broke anything.

--jerry
(This used to be commit cd7f0b0b91afd3331c0607ba2fcb3ccdd41ecebf)

1 files changed, 29 insertions, 1 deletions

diff --git a/source3/include/rpcclient.h b/source3/include/rpcclient.h
index dc2be5d2b8..f322724217 100644
--- a/source3/include/rpcclient.h
+++ b/source3/include/rpcclient.h
@@ -24,6 +24,8 @@
 #ifndef _RPCCLIENT_H
 #define _RPCCLIENT_H
 
+#define report fprintf
+
 struct tar_client_info
 {
     int blocksize;
@@ -83,7 +85,7 @@ struct nt_client_info
     int num_sam_entries;
 };
 
-struct client_info
+/* struct client_info
 {
     struct in_addr dest_ip;
     fstring dest_host;
@@ -117,8 +119,34 @@ struct client_info
 
     struct tar_client_info tar;
     struct nt_client_info dom;
+}; */
+
+struct client_info
+{
+    struct in_addr dest_ip;
+    fstring dest_host;
+
+    fstring myhostname;
+
+    struct tar_client_info tar;
+    struct nt_client_info dom;
+
+    BOOL reuse;
 };
 
+
 enum action_type {ACTION_HEADER, ACTION_ENUMERATE, ACTION_FOOTER};
 
+/****************************************************************************
+ This defines the commands supported by this client
+ ****************************************************************************/
+struct command_set
+{
+	char *name;
+	uint32 (*fn)(struct client_info*, int, char*[]);
+	char *description;
+	char* (*compl_args[2])(char*, int);
+};
+
+
 #endif /* _RPCCLIENT_H */