r18728: revert previous commit until I fix the wkssvc_nt.c changes

(This used to be commit 57d8519185008602fab5cf5d1d1951415aacb7f0)

1 files changed, 22 insertions, 294 deletions

diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index fe48251639..6528e63225 100644
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -29,323 +29,51 @@
 #define DBGC_CLASS DBGC_RPC_SRV
 
 /*******************************************************************
- Fill in the valiues for the struct wkssvc_NetWkstaInfo100.
+ create_wks_info_100
  ********************************************************************/
 
-static void create_wks_info_100(struct wkssvc_NetWkstaInfo100 *info100)
+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_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 );
 
-	return;
+	init_wks_info_100(inf,
+	                  0x000001f4, /* platform id info */
+	                  lp_major_announce_version(),
+	                  lp_minor_announce_version(),
+	                  my_name, domain);
 }
 
-/********************************************************************
+/*******************************************************************
+ 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;
-}
-
-/********************************************************************
- ********************************************************************/
-
-WERROR _wkssvc_NetWkstaSetInfo( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
-
-WERROR _wkssvc_NetWkstaEnumUsers( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
-
-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 )
-{
-	/* 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 )
+NTSTATUS _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u)
 {
-	/* 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;
-}
-
-/********************************************************************
- ********************************************************************/
+	WKS_INFO_100 *wks100 = NULL;
 
-WERROR _wkssvc_NetrJoinDomain2( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
-
-WERROR _wkssvc_NetrUnjoinDomain2( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
-
-WERROR _wkssvc_NetrRenameMachineInDomain2( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
-
-WERROR _WKSSVC_NETRVALIDATENAME2( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
+	DEBUG(5,("_wks_query_info: %d\n", __LINE__));
 
-WERROR _WKSSVC_NETRGETJOINABLEOUS2( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
-
-/********************************************************************
- ********************************************************************/
-
-WERROR _wkssvc_NetrAddAlternateComputerName( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
+	wks100 = TALLOC_ZERO_P(p->mem_ctx, WKS_INFO_100);
 
-/********************************************************************
- ********************************************************************/
-
-WERROR _wkssvc_NetrRemoveAlternateComputerName( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
+	if (!wks100)
+		return NT_STATUS_NO_MEMORY;
 
-/********************************************************************
- ********************************************************************/
+	create_wks_info_100(wks100);
+	init_wks_r_query_info(r_u, q_u->switch_value, wks100, NT_STATUS_OK);
 
-WERROR _WKSSVC_NETRSETPRIMARYCOMPUTERNAME( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
-}
+	DEBUG(5,("_wks_query_info: %d\n", __LINE__));
 
-/********************************************************************
- ********************************************************************/
-
-WERROR _WKSSVC_NETRENUMERATECOMPUTERNAMES( pipes_struct *p )
-{
-	/* FIXME: Add implementation code here */
-	return WERR_NOT_SUPPORTED;
+	return r_u->status;
 }
-