r18739: * Get the wkssvc patch right this time.

* Remove the old wkssvc server, client, & parsing code.
* Update srv_wkssvc_nt.c with stubs for the remaining
  stubs
(This used to be commit 0cb79ee13fd78b515a48b2c72d91596ed21e41a8)

2 files changed, 301 insertions, 100 deletions

diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c
deleted file mode 100644
index b5c1af34d9..0000000000
--- a/source3/rpc_server/srv_wkssvc.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
- *  Copyright (C) Paul Ashton                       1997,
- *  Copyright (C) Jim McDonough <jmcd@us.ibm.com>   2003.
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* This is the interface to the wks pipe. */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
-
-/*******************************************************************
- 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;
-
-	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;
-}
-
-
-/*******************************************************************
- \PIPE\wkssvc commands
- ********************************************************************/
-
-static struct api_struct api_wks_cmds[] =
-{
-      { "WKS_Q_QUERY_INFO", WKS_QUERY_INFO, api_wks_query_info }
-};
-
-void wkssvc_get_pipe_fns( struct api_struct **fns, int *n_fns )
-{
-	*fns = api_wks_cmds;
-	*n_fns = sizeof(api_wks_cmds) / sizeof(struct api_struct);
-}
-
-NTSTATUS rpc_wks_init(void)
-{
-  return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "wkssvc", "ntsvcs", api_wks_cmds,
-				    sizeof(api_wks_cmds) / sizeof(struct api_struct));
-}
diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index 6528e63225..ead1b7b918 100644
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -29,51 +29,330 @@
 #define DBGC_CLASS DBGC_RPC_SRV
 
 /*******************************************************************
- create_wks_info_100
+ Fill in the valiues for the struct wkssvc_NetWkstaInfo100.
  ********************************************************************/
 
-static void create_wks_info_100(WKS_INFO_100 *inf)
+static void create_wks_info_100(struct wkssvc_NetWkstaInfo100 *info100)
 {
 	pstring my_name;
 	pstring domain;
 
-	DEBUG(5,("create_wks_info_100: %d\n", __LINE__));
-
 	pstrcpy (my_name, global_myname());
 	strupper_m(my_name);
 
 	pstrcpy (domain, lp_workgroup());
 	strupper_m(domain);
+	
+	info100->platform_id     = 0x000001f4; 	/* unknown */
+	info100->version_major   = lp_major_announce_version(); 
+	info100->version_minor   = lp_minor_announce_version();   
+
+	info100->server_name = talloc_strdup( info100, my_name );
+	info100->domain_name = talloc_strdup( info100, domain );
 
-	init_wks_info_100(inf,
-	                  0x000001f4, /* platform id info */
-	                  lp_major_announce_version(),
-	                  lp_minor_announce_version(),
-	                  my_name, domain);
+	return;
 }
 
-/*******************************************************************
- wks_reply_query_info
- 
+/********************************************************************
  only supports info level 100 at the moment.
+ ********************************************************************/
+
+WERROR _wkssvc_NetWkstaGetInfo( pipes_struct *p, const char *server_name, uint32_t level, 
+                                 union wkssvc_NetWkstaInfo *info )
+{
+	struct wkssvc_NetWkstaInfo100 *wks100 = NULL;
+	
+	/* We only support info level 100 currently */
+	
+	if ( level != 100 ) {
+		return NT_STATUS_INVALID_LEVEL;
+	}
+
+	if ( (wks100 = TALLOC_ZERO_P(p->mem_ctx, struct wkssvc_NetWkstaInfo100)) == NULL ) {
+		return NT_STATUS_NO_MEMORY;
+	}
 
+	create_wks_info_100( wks100 );
+	
+	info->info100 = wks100;
+
+	return NT_STATUS_OK;
+}
+
+/********************************************************************
  ********************************************************************/
 
-NTSTATUS _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u)
+WERROR _wkssvc_NetWkstaSetInfo( pipes_struct *p, const char *server_name, 
+                                uint32_t level, union wkssvc_NetWkstaInfo *info,
+                                uint32_t *parm_error )
 {
-	WKS_INFO_100 *wks100 = NULL;
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
 
-	DEBUG(5,("_wks_query_info: %d\n", __LINE__));
+/********************************************************************
+ ********************************************************************/
 
-	wks100 = TALLOC_ZERO_P(p->mem_ctx, WKS_INFO_100);
+WERROR _wkssvc_NetWkstaEnumUsers( pipes_struct *p, const char *server_name,
+                                  uint32_t level, 
+                                  union WKS_USER_ENUM_UNION *users,
+                                  uint32_t prefmaxlen, uint32_t *entriesread,
+                                  uint32_t *totalentries, 
+                                  uint32_t *resumehandle )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
 
-	if (!wks100)
-		return NT_STATUS_NO_MEMORY;
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRWKSTAUSERGETINFO( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRWKSTAUSERSETINFO( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _wkssvc_NetWkstaTransportEnum( pipes_struct *p, const char *server_name, uint32_t *level, union wkssvc_NetWkstaTransportCtr *ctr, uint32_t max_buffer, uint32_t *totalentries, uint32_t *resume_handle)
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRWKSTATRANSPORTADD( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRWKSTATRANSPORTDEL( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRUSEADD( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRUSEGETINFO( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRUSEDEL( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRUSEENUM( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRMESSAGEBUFFERSEND( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRWORKSTATIONSTATISTICSGET( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRLOGONDOMAINNAMEADD( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRLOGONDOMAINNAMEDEL( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRJOINDOMAIN( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRUNJOINDOMAIN( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRRENAMEMACHINEINDOMAIN( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRVALIDATENAME( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRGETJOININFORMATION( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRGETJOINABLEOUS( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _wkssvc_NetrJoinDomain2(pipes_struct *p, const char *server_name, const char *domain_name, const char *account_name, const char *admin_account, struct wkssvc_PasswordBuffer *encrypted_password, uint32_t join_flags)
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _wkssvc_NetrUnjoinDomain2(pipes_struct *p, const char *server_name, const char *account, struct wkssvc_PasswordBuffer *encrypted_password, uint32_t unjoin_flags)
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _wkssvc_NetrRenameMachineInDomain2(pipes_struct *p, const char *server_name, const char *NewMachineName, const char *Account, struct wkssvc_PasswordBuffer *EncryptedPassword, uint32_t RenameOptions)
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRVALIDATENAME2( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRGETJOINABLEOUS2( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
 
-	create_wks_info_100(wks100);
-	init_wks_r_query_info(r_u, q_u->switch_value, wks100, NT_STATUS_OK);
+/********************************************************************
+ ********************************************************************/
+
+WERROR _wkssvc_NetrAddAlternateComputerName(pipes_struct *p, const char *server_name, const char *NewAlternateMachineName, const char *Account, struct wkssvc_PasswordBuffer *EncryptedPassword, uint32_t Reserved)
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
 
-	DEBUG(5,("_wks_query_info: %d\n", __LINE__));
+/********************************************************************
+ ********************************************************************/
 
-	return r_u->status;
+WERROR _wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p, const char *server_name, const char *AlternateMachineNameToRemove, const char *Account, struct wkssvc_PasswordBuffer *EncryptedPassword, uint32_t Reserved)
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
 }
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRSETPRIMARYCOMPUTERNAME( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+
+/********************************************************************
+ ********************************************************************/
+
+WERROR _WKSSVC_NETRENUMERATECOMPUTERNAMES( pipes_struct *p )
+{
+	/* FIXME: Add implementation code here */
+	return WERR_NOT_SUPPORTED;
+}
+