updated the 3.0 branch from the head branch - ready for alpha18

(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

7 files changed, 35 insertions, 13 deletions

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index a7049f78df..eae6be5128 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -23,6 +23,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 extern struct pipe_id_info pipe_names[];
 extern fstring global_myworkgroup;
 extern pstring global_myname;
diff --git a/source3/rpc_client/cli_reg.c b/source3/rpc_client/cli_reg.c
index 628cd576a8..07001f13bd 100644
--- a/source3/rpc_client/cli_reg.c
+++ b/source3/rpc_client/cli_reg.c
@@ -24,6 +24,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 /****************************************************************************
 do a REG Open Policy
 ****************************************************************************/
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 6467ae4fa9..0d4db7f88f 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -22,6 +22,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 /****************************************************************************
 do a SAMR query user groups
 ****************************************************************************/
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index ca01808f59..5292569ed4 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -25,6 +25,9 @@
 #include "rpc_parse.h"
 #include "nterr.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 /****************************************************************************
 do a SPOOLSS Enum Printer Drivers
 ****************************************************************************/
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c
index 024e711789..06e733893e 100644
--- a/source3/rpc_client/cli_srvsvc.c
+++ b/source3/rpc_client/cli_srvsvc.c
@@ -23,6 +23,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 /****************************************************************************
 do a server net conn enum
 ****************************************************************************/
@@ -43,7 +46,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETCONNENUM */
+	/* create and send a MSRPC command with api SRV_NET_CONN_ENUM */
 
 	DEBUG(4,("SRV Net Server Connection Enum(%s, %s), level %d, enum:%8x\n",
 				server_name, qual_name, switch_value, get_enum_hnd(hnd)));
@@ -67,7 +70,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if(!rpc_api_pipe_req(cli, SRV_NETCONNENUM, &data, &rdata)) {
+	if(!rpc_api_pipe_req(cli, SRV_NET_CONN_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
@@ -107,10 +110,11 @@ do a server net sess enum
 ****************************************************************************/
 
 BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
-			char *server_name, char *qual_name,
-			uint32 switch_value, SRV_SESS_INFO_CTR *ctr,
-			uint32 preferred_len,
-			ENUM_HND *hnd)
+			      char *server_name, char *qual_name,
+			      char *user_name,
+			      uint32 switch_value, SRV_SESS_INFO_CTR *ctr,
+			      uint32 preferred_len,
+			      ENUM_HND *hnd)
 {
 	prs_struct data; 
 	prs_struct rdata;
@@ -123,7 +127,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETSESSENUM */
+	/* create and send a MSRPC command with api SRV_NET_SESS_ENUM */
 
 	DEBUG(4,("SRV Net Session Enum (%s), level %d, enum:%8x\n",
 				server_name, switch_value, get_enum_hnd(hnd)));
@@ -134,7 +138,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 	ctr->sess.info0.ptr_sess_info    = 1;
 
 	/* store the parameters */
-	init_srv_q_net_sess_enum(&q_o, server_name, qual_name,
+	init_srv_q_net_sess_enum(&q_o, server_name, qual_name, user_name,
 	                         switch_value, ctr,
 	                         preferred_len,
 	                         hnd);
@@ -147,7 +151,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if (!rpc_api_pipe_req(cli, SRV_NETSESSENUM, &data, &rdata)) {
+	if (!rpc_api_pipe_req(cli, SRV_NET_SESS_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
@@ -200,7 +204,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETSHAREENUM */
+	/* create and send a MSRPC command with api SRV_NET_SHARE_ENUM */
 
 	DEBUG(4,("SRV Get Share Info (%s), level %d, enum:%8x\n",
 				server_name, switch_value, get_enum_hnd(hnd)));
@@ -217,7 +221,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if (!rpc_api_pipe_req(cli, SRV_NETSHAREENUM, &data, &rdata)) {
+	if (!rpc_api_pipe_req(cli, SRV_NET_SHARE_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
@@ -271,7 +275,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
 	prs_init(&data, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
 	prs_init(&rdata, 0, cli->mem_ctx, UNMARSHALL);
 
-	/* create and send a MSRPC command with api SRV_NETFILEENUM */
+	/* create and send a MSRPC command with api SRV_NET_FILE_ENUM */
 
 	DEBUG(4,("SRV Get File Info (%s), level %d, enum:%8x\n",
 				server_name, switch_value, get_enum_hnd(hnd)));
@@ -297,7 +301,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
 	}
 
 	/* send the data on \PIPE\ */
-	if (!rpc_api_pipe_req(cli, SRV_NETFILEENUM, &data, &rdata)) {
+	if (!rpc_api_pipe_req(cli, SRV_NET_FILE_ENUM, &data, &rdata)) {
 		prs_mem_free(&data);
 		prs_mem_free(&rdata);
 		return False;
diff --git a/source3/rpc_client/cli_wkssvc.c b/source3/rpc_client/cli_wkssvc.c
index 788d60c56e..90269dfbee 100644
--- a/source3/rpc_client/cli_wkssvc.c
+++ b/source3/rpc_client/cli_wkssvc.c
@@ -23,6 +23,9 @@
 
 #include "includes.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 /****************************************************************************
 do a WKS Open Policy
 ****************************************************************************/
diff --git a/source3/rpc_client/msrpc_spoolss.c b/source3/rpc_client/msrpc_spoolss.c
index 2267190d8e..56c70730ba 100644
--- a/source3/rpc_client/msrpc_spoolss.c
+++ b/source3/rpc_client/msrpc_spoolss.c
@@ -25,6 +25,9 @@
 #include "rpc_parse.h"
 #include "rpcclient.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
 #define DEBUG_TESTING
 
 extern FILE* out_hnd;