Makefile client.c clientutil.c clitar.c nmbsync.c :

	redid the split that i did a year ago, taking the functions in client.c
	out into clientutil.c.  guess what?  we could now do encrypted password
	NetServerEnum2 calls in nmbd, if we wanted to.

	i can now use cli_call_api() to send to different pipes.  i hope.

pipenetlog.c:

	allow adding to users group _and_ to admin group.  if adding to
	guest group, don't allow adding to users or admin as well.

smb.h :

	added some pipe #defines (\PIPE\NETLOGON \PIPE\srvsvc ...)

proto.h :

	usual.
(This used to be commit 6ee065ce6e099acfc7e83ad399ef6e60b4c625c1)

2 files changed, 24 insertions, 9 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6bab787be9..636b99e646 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -36,11 +36,8 @@ BOOL chgpasswd(char *name,char *oldpass,char *newpass);
 
 /*The following definitions come from  client.c  */
 
-void setup_pkt(char *outbuf);
 void do_dir(char *inbuf,char *outbuf,char *Mask,int attribute,void (*fn)(),BOOL recurse_dir);
 void cmd_help(void);
-BOOL reopen_connection(char *inbuf,char *outbuf);
-char *smb_errstr(char *inbuf);
 
 /*The following definitions come from  clientgen.c  */
 
@@ -62,12 +59,24 @@ void cli_shutdown(struct cli_state *cli);
 
 /*The following definitions come from  clientutil.c  */
 
-BOOL cli_send_login(char *inbuf, char *outbuf, BOOL start_session, BOOL use_setup);
-void cli_send_logout(void);
-BOOL cli_call_api(int prcnt,int drcnt,int mprcnt,int mdrcnt,int *rprcnt,
-		  int *rdrcnt, char *param,char *data, 
-		  char **rparam, char **rdata);
-BOOL cli_open_sockets(int port);
+void cli_setup_pkt(char *outbuf);
+BOOL cli_call_api(char *pipe_name, int prcnt,int drcnt,
+		     int mprcnt,int mdrcnt,
+		     int *rprcnt,int *rdrcnt,
+		     char *param,char *data,
+		     char **rparam,char **rdata);
+BOOL cli_receive_trans_response(char *inbuf,int trans,
+                                   int *data_len,int *param_len,
+				   char **data,char **param);
+BOOL cli_send_trans_request(char *outbuf,int trans,
+			       char *name,int fid,int flags,
+			       char *data,char *param,uint16 *setup,
+			       int ldata,int lparam,int lsetup,
+			       int mdata,int mparam,int msetup);
+BOOL cli_send_session_request(char *inbuf,char *outbuf);
+BOOL cli_send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setup);
+void cli_send_logout(void );
+BOOL cli_open_sockets(int port );
 BOOL cli_reopen_connection(char *inbuf,char *outbuf);
 char *smb_errstr(char *inbuf);
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 913f5607b7..d10b449e6f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -260,6 +260,12 @@ typedef char fstring[128];
 typedef fstring string;
 
 
+/* pipe strings */
+#define PIPE_LANMAN   "\\PIPE\\LANMAN"
+#define PIPE_SRVSVC   "\\PIPE\\srvsvc"
+#define PIPE_NETLOGON "\\PIPE\\NETLOGON"
+#define PIPE_NTLSA    "\\PIPE\\ntlsa"
+
 /* NETLOGON opcodes and data structures */
 
 #define NET_QUERYFORPDC	     7 /* Query for PDC */