1 files changed, 11 insertions, 53 deletions

diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c
index d1e0c8e8eb..e648c0f122 100644
--- a/source3/rpc_server/srv_wkssvc.c
+++ b/source3/rpc_server/srv_wkssvc.c
@@ -22,76 +22,34 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+/* This is the interface to the wks pipe. */
+
 #include "includes.h"
 
 extern int DEBUGLEVEL;
-extern pstring global_myname;
-
-/*******************************************************************
- create_wks_info_100
- ********************************************************************/
-static void create_wks_info_100(WKS_INFO_100 *inf)
-{
-	pstring my_name;
-	pstring domain;
-
-	DEBUG(5,("create_wks_info_100: %d\n", __LINE__));
-
-	pstrcpy (my_name, global_myname);
-	strupper(my_name);
-
-	pstrcpy (domain, lp_workgroup());
-	strupper(domain);
-
-	init_wks_info_100(inf,
-	                  0x000001f4, /* platform id info */
-	                  lp_major_announce_version(),
-	                  lp_minor_announce_version(),
-	                  my_name, unix_to_dos(domain,False));
-}
-
-/*******************************************************************
- wks_reply_query_info
- 
- only supports info level 100 at the moment.
-
- ********************************************************************/
-static BOOL wks_reply_query_info(WKS_Q_QUERY_INFO *q_u,
-				prs_struct *rdata,
-				int status)
-{
-	WKS_R_QUERY_INFO r_u;
-	WKS_INFO_100 wks100;
-
-	DEBUG(5,("wks_query_info: %d\n", __LINE__));
-
-	create_wks_info_100(&wks100);
-	init_wks_r_query_info(&r_u, q_u->switch_value, &wks100, status);
-
-	/* store the response in the SMB stream */
-	if(!wks_io_r_query_info("", &r_u, rdata, 0))
-		return False;
-
-	DEBUG(5,("wks_query_info: %d\n", __LINE__));
-
-	return True;
-}
 
 /*******************************************************************
  api_wks_query_info
  ********************************************************************/
+
 static BOOL api_wks_query_info(pipes_struct *p)
 {
 	WKS_Q_QUERY_INFO q_u;
+	WKS_R_QUERY_INFO r_u;
 	prs_struct *data = &p->in_data.data;
 	prs_struct *rdata = &p->out_data.rdata;
 
+	ZERO_STRUCT(q_u);
+	ZERO_STRUCT(r_u);
+
 	/* grab the net share enum */
 	if(!wks_io_q_query_info("", &q_u, data, 0))
 		return False;
 
-	/* construct reply.  always indicate success */
-	if(!wks_reply_query_info(&q_u, rdata, 0x0))
+	r_u.status = _wks_query_info(p, &q_u, &r_u);
+
+	/* store the response in the SMB stream */
+	if(!wks_io_r_query_info("", &r_u, rdata, 0))
 		return False;
 
 	return True;