Remove remaining old srvsvc client and server rpc code entirely.

Guenther
(This used to be commit a5f0186f70abe8dba650265219e69ce5ca2fb642)

2 files changed, 1 insertions, 258 deletions

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 6c1b65b858..f33ee88aec 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -2388,7 +2388,7 @@ void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
 			netlogon_get_pipe_fns( &cmds, &n_cmds );
 			break;
 		case PI_SRVSVC:
-			srvsvc2_get_pipe_fns( &cmds, &n_cmds );
+			srvsvc_get_pipe_fns( &cmds, &n_cmds );
 			break;
 		case PI_WKSSVC:
 			wkssvc_get_pipe_fns( &cmds, &n_cmds );
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
deleted file mode 100644
index 3a7340c0fa..0000000000
--- a/source3/rpc_server/srv_srvsvc.c
+++ /dev/null
@@ -1,257 +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) Jeremy Allison                    2001,
- *  Copyright (C) Jim McDonough <jmcd@us.ibm.com>   2003.
- *  Copyright (C) Gera;d (Jerry) Carter             2006.
- *  
- *  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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-/* This is the interface to the srvsvc pipe. */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
-
-static bool proxy_srvsvc_call(pipes_struct *p, uint8 opnum)
-{
-	struct api_struct *fns;
-	int n_fns;
-
-	srvsvc_get_pipe_fns(&fns, &n_fns);
-
-	if (opnum >= n_fns)
-		return False;
-
-	if (fns[opnum].opnum != opnum) {
-		smb_panic("SRVSVC function table not sorted\n");
-	}
-
-	return fns[opnum].fn(p);
-}
-
-/*******************************************************************
- api_srv_net_srv_get_info
-********************************************************************/
-
-static bool api_srv_net_srv_get_info(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSRVGETINFO);
-}
-
-/*******************************************************************
- api_srv_net_srv_get_info
-********************************************************************/
-
-static bool api_srv_net_srv_set_info(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSRVSETINFO);
-}
-
-/*******************************************************************
- api_srv_net_file_enum
-********************************************************************/
-
-static bool api_srv_net_file_enum(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETFILEENUM);
-}
-
-/*******************************************************************
- api_srv_net_conn_enum
-********************************************************************/
-
-static bool api_srv_net_conn_enum(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETCONNENUM);
-}
-
-/*******************************************************************
- Enumerate sessions.
-********************************************************************/
-
-static bool api_srv_net_sess_enum(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSESSENUM);
-}
-
-/*******************************************************************
- Delete session.
-********************************************************************/
-
-static bool api_srv_net_sess_del(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSESSDEL);
-}
-
-/*******************************************************************
- RPC to enumerate shares.
-********************************************************************/
-
-static bool api_srv_net_share_enum_all(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREENUMALL);
-}
-
-/*******************************************************************
- RPC to enumerate shares.
-********************************************************************/
-
-static bool api_srv_net_share_enum(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREENUM);
-}
-
-/*******************************************************************
- RPC to return share information.
-********************************************************************/
-
-static bool api_srv_net_share_get_info(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREGETINFO);
-}
-
-/*******************************************************************
- RPC to set share information.
-********************************************************************/
-
-static bool api_srv_net_share_set_info(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHARESETINFO);
-}
-
-/*******************************************************************
- RPC to add share information.
-********************************************************************/
-
-static bool api_srv_net_share_add(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREADD);
-}
-
-/*******************************************************************
- RPC to delete share information.
-********************************************************************/
-
-static bool api_srv_net_share_del(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREDEL);
-}
-
-/*******************************************************************
- RPC to delete share information.
-********************************************************************/
-
-static bool api_srv_net_share_del_sticky(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSHAREDELSTICKY);
-}
-
-/*******************************************************************
- api_srv_net_remote_tod
-********************************************************************/
-
-static bool api_srv_net_remote_tod(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETREMOTETOD);
-}
-
-/*******************************************************************
- RPC to enumerate disks available on a server e.g. C:, D: ...
-*******************************************************************/
-
-static bool api_srv_net_disk_enum(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETDISKENUM);
-}
-
-/*******************************************************************
- NetValidateName (opnum 0x21) 
-*******************************************************************/
-
-static bool api_srv_net_name_validate(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETNAMEVALIDATE);
-}
-
-/*******************************************************************
- NetFileQuerySecdesc (opnum 0x27)
-*******************************************************************/
-
-static bool api_srv_net_file_query_secdesc(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETGETFILESECURITY);
-}
-
-/*******************************************************************
- NetFileSetSecdesc (opnum 0x28)
-*******************************************************************/
-
-static bool api_srv_net_file_set_secdesc(pipes_struct *p)
-{
-	return proxy_srvsvc_call(p, NDR_SRVSVC_NETSETFILESECURITY);
-}
-
-/*******************************************************************
-*******************************************************************/
-
-static bool api_srv_net_file_close(pipes_struct *p)
-{
-	return proxy_srvsvc_call( p, NDR_SRVSVC_NETFILECLOSE );
-}
-
-/*******************************************************************
-\PIPE\srvsvc commands
-********************************************************************/
-
-static struct api_struct api_srv_cmds[] =
-{
-      { "SRV_NET_CONN_ENUM"         , SRV_NET_CONN_ENUM         , api_srv_net_conn_enum          },
-      { "SRV_NET_SESS_ENUM"         , SRV_NET_SESS_ENUM         , api_srv_net_sess_enum          },
-      { "SRV_NET_SESS_DEL"          , SRV_NET_SESS_DEL          , api_srv_net_sess_del           },
-      { "SRV_NET_SHARE_ENUM_ALL"    , SRV_NET_SHARE_ENUM_ALL    , api_srv_net_share_enum_all     },
-      { "SRV_NET_SHARE_ENUM"        , SRV_NET_SHARE_ENUM        , api_srv_net_share_enum         },
-      { "SRV_NET_SHARE_ADD"         , SRV_NET_SHARE_ADD         , api_srv_net_share_add          },
-      { "SRV_NET_SHARE_DEL"         , SRV_NET_SHARE_DEL         , api_srv_net_share_del          },
-      { "SRV_NET_SHARE_DEL_STICKY"  , SRV_NET_SHARE_DEL_STICKY  , api_srv_net_share_del_sticky   },
-      { "SRV_NET_SHARE_GET_INFO"    , SRV_NET_SHARE_GET_INFO    , api_srv_net_share_get_info     },
-      { "SRV_NET_SHARE_SET_INFO"    , SRV_NET_SHARE_SET_INFO    , api_srv_net_share_set_info     },
-      { "SRV_NET_FILE_ENUM"         , SRV_NET_FILE_ENUM         , api_srv_net_file_enum          },
-      { "SRV_NET_SRV_GET_INFO"      , SRV_NET_SRV_GET_INFO      , api_srv_net_srv_get_info       },
-      { "SRV_NET_SRV_SET_INFO"      , SRV_NET_SRV_SET_INFO      , api_srv_net_srv_set_info       },
-      { "SRV_NET_REMOTE_TOD"        , SRV_NET_REMOTE_TOD        , api_srv_net_remote_tod         },
-      { "SRV_NET_DISK_ENUM"         , SRV_NET_DISK_ENUM         , api_srv_net_disk_enum          },
-      { "SRV_NET_NAME_VALIDATE"     , SRV_NET_NAME_VALIDATE     , api_srv_net_name_validate      },
-      { "SRV_NET_FILE_QUERY_SECDESC", SRV_NET_FILE_QUERY_SECDESC, api_srv_net_file_query_secdesc },
-      { "SRV_NET_FILE_SET_SECDESC"  , SRV_NET_FILE_SET_SECDESC  , api_srv_net_file_set_secdesc   },
-      { "SRV_NET_FILE_CLOSE"        , SRV_NET_FILE_CLOSE        , api_srv_net_file_close         }
-};
-
-void srvsvc2_get_pipe_fns( struct api_struct **fns, int *n_fns )
-{
-	*fns = api_srv_cmds;
-	*n_fns = sizeof(api_srv_cmds) / sizeof(struct api_struct);
-}
-
-
-NTSTATUS rpc_srvsvc2_init(void)
-{
-  return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "srvsvc", "ntsvcs", api_srv_cmds,
-				    sizeof(api_srv_cmds) / sizeof(struct api_struct));
-}