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, 35 insertions, 0 deletions

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 5af04f6e93..cb53e7b59e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -363,10 +363,20 @@ struct sam_disp_info
 	char *full_name;    /* user's full name string */
 };
 
+typedef struct
+{
+        uint32 pid;
+        uint16 vuid;
+
+}
+vuser_key;
+
+
 struct use_info
 {
 	BOOL connected;
 	char *srv_name;
+	vuser_key key;
 	char *user_name;
 	char *domain;
 };
@@ -1647,6 +1657,31 @@ struct ntdom_info
 
 	int max_recv_frag;
 	int max_xmit_frag;
+
+	vuser_key key;
+};
+
+struct msrpc_local
+{
+        fstring pipe_name;
+        struct ntdom_info nt;
+#if 0
+        cli_auth_fns *auth;
+        void *auth_info;
+#endif
+
+        int fd;
+        BOOL initialised;
+        char *inbuf;
+        char *outbuf;
+};
+
+struct ncacn_np
+{
+        fstring pipe_name;
+        struct cli_state *smb;
+        uint16 fnum;
+        BOOL initialised;
 };
 
 #include "rpc_creds.h"