diff options
| -rw-r--r-- | source3/Makefile.in | 4 | ||||
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 11 | ||||
| -rw-r--r-- | source3/include/rpc_ntsvcs.h | 36 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_ntsvcs.c | 24 | ||||
| -rw-r--r-- | source3/rpc_server/srv_ntsvcs.c | 132 |
7 files changed, 4 insertions, 208 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index e91bb90635..f139d73fb1 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -555,7 +555,7 @@ RPC_SVCCTL_OBJ = rpc_server/srv_svcctl.o rpc_server/srv_svcctl_nt.o \ services/svc_netlogon.o services/svc_winreg.o \ services/svc_wins.o -RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs.o rpc_server/srv_ntsvcs_nt.o \ +RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs_nt.o \ ../librpc/gen_ndr/srv_ntsvcs.o RPC_DFS_OBJ = ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o @@ -575,7 +575,7 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \ rpc_parse/parse_spoolss.o \ rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o \ - rpc_parse/parse_ntsvcs.o rpc_parse/parse_svcctl.o + rpc_parse/parse_svcctl.o RPC_CLIENT_OBJ = rpc_client/cli_pipe.o diff --git a/source3/configure.in b/source3/configure.in index a8761334c8..fc3cb261d4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -396,7 +396,7 @@ AC_SUBST(DYNEXP) dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs2 rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template" +default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template" dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer" @@ -6081,7 +6081,7 @@ SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), "bin/librpc_initshutdown. SMB_MODULE(rpc_dssetup, \$(RPC_DSSETUP_OBJ), "bin/librpc_dssetup.$SHLIBEXT", RPC) SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC) SMB_MODULE(rpc_svcctl2, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl2.$SHLIBEXT", RPC) -SMB_MODULE(rpc_ntsvcs2, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs2.$SHLIBEXT", RPC) +SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs.$SHLIBEXT", RPC) SMB_MODULE(rpc_netlogon, \$(RPC_NETLOG_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC) SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC) SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), "bin/librpc_svcsvc.$SHLIBEXT", RPC) diff --git a/source3/include/includes.h b/source3/include/includes.h index 38d6ec06b9..4e41fa3c05 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -620,7 +620,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "auth.h" #include "ntdomain.h" #include "rpc_svcctl.h" -#include "rpc_ntsvcs.h" #include "rpc_lsa.h" #include "reg_objects.h" #include "reg_db.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index 9c3aba29af..5e2b823d64 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6023,8 +6023,6 @@ bool make_bufhdr2(BUFHDR2 *hdr, uint32 info_level, uint32 length, uint32 buffer) uint32 str_len_uni(UNISTR *source); bool policy_handle_is_valid(const POLICY_HND *hnd); -/* The following definitions come from rpc_parse/parse_ntsvcs.c */ - /* The following definitions come from rpc_parse/parse_prs.c */ void prs_dump(const char *name, int v, prs_struct *ps); @@ -6551,15 +6549,6 @@ bool close_policy_hnd(pipes_struct *p, POLICY_HND *hnd); void close_policy_by_pipe(pipes_struct *p); bool pipe_access_check(pipes_struct *p); -/* The following definitions come from rpc_server/srv_ntsvcs.c */ - -void ntsvcs2_get_pipe_fns( struct api_struct **fns, int *n_fns ); -NTSTATUS rpc_ntsvcs2_init(void); - -/* The following definitions come from rpc_server/srv_ntsvcs_nt.c */ - -WERROR _ntsvcs_get_device_list( pipes_struct *p, NTSVCS_Q_GET_DEVICE_LIST *q_u, NTSVCS_R_GET_DEVICE_LIST *r_u ); - /* The following definitions come from rpc_server/srv_pipe.c */ bool create_next_pdu(pipes_struct *p); diff --git a/source3/include/rpc_ntsvcs.h b/source3/include/rpc_ntsvcs.h deleted file mode 100644 index 14e11cf6a1..0000000000 --- a/source3/include/rpc_ntsvcs.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB parameters and setup - Copyright (C) Gerald (Jerry) Carter 2005 - - 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/>. -*/ - -#ifndef _RPC_NTSVCS_H /* _RPC_NTSVCS_H */ -#define _RPC_NTSVCS_H - -/* ntsvcs pipe */ - -#define NTSVCS_GET_VERSION 0x02 -#define NTSVCS_VALIDATE_DEVICE_INSTANCE 0x06 -#define NTSVCS_GET_ROOT_DEVICE_INSTANCE 0x07 -#define NTSVCS_GET_DEVICE_LIST 0x0a -#define NTSVCS_GET_DEVICE_LIST_SIZE 0x0b -#define NTSVCS_GET_DEVICE_REG_PROPERTY 0x0d -#define NTSVCS_HW_PROFILE_FLAGS 0x28 -#define NTSVCS_GET_HW_PROFILE_INFO 0x29 -#define NTSVCS_GET_VERSION_INTERNAL 0x3e - - -#endif /* _RPC_NTSVCS_H */ diff --git a/source3/rpc_parse/parse_ntsvcs.c b/source3/rpc_parse/parse_ntsvcs.c deleted file mode 100644 index d347277ad8..0000000000 --- a/source3/rpc_parse/parse_ntsvcs.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * RPC Pipe client / server routines - * Copyright (C) Gerald (Jerry) Carter 2005. - * - * 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/>. - */ - -#include "includes.h" - -#undef DBGC_CLASS -#define DBGC_CLASS DBGC_RPC_PARSE - diff --git a/source3/rpc_server/srv_ntsvcs.c b/source3/rpc_server/srv_ntsvcs.c deleted file mode 100644 index c37d2dda7e..0000000000 --- a/source3/rpc_server/srv_ntsvcs.c +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * RPC Pipe client / server routines - * Copyright (C) Gerald Carter 2005. - * - * 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/>. - */ - -#include "includes.h" -#include "librpc/gen_ndr/srv_ntsvcs.h" - -#undef DBGC_CLASS -#define DBGC_CLASS DBGC_RPC_SRV - -/******************************************************************* - ********************************************************************/ - -static bool proxy_ntsvcs_call(pipes_struct *p, uint8_t opnum) -{ - struct api_struct *fns; - int n_fns; - - ntsvcs_get_pipe_fns(&fns, &n_fns); - - if (opnum >= n_fns) { - return false; - } - - if (fns[opnum].opnum != opnum) { - smb_panic("NTSVCS function table not sorted"); - } - - return fns[opnum].fn(p); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_get_version(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_GETVERSION); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_get_device_list_size(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_GETDEVICELISTSIZE); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_get_device_list(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_GETDEVICELIST); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_validate_device_instance(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_VALIDATEDEVICEINSTANCE); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_get_device_reg_property(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_GETDEVICEREGPROP); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_get_hw_profile_info(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_GETHWPROFINFO); -} - -/******************************************************************* - ********************************************************************/ - -static bool api_ntsvcs_hw_profile_flags(pipes_struct *p) -{ - return proxy_ntsvcs_call(p, NDR_PNP_HWPROFFLAGS); -} - -/******************************************************************* - \PIPE\svcctl commands - ********************************************************************/ - -static struct api_struct api_ntsvcs_cmds[] = -{ - { "NTSVCS_GET_VERSION" , NTSVCS_GET_VERSION , api_ntsvcs_get_version }, - { "NTSVCS_GET_DEVICE_LIST_SIZE" , NTSVCS_GET_DEVICE_LIST_SIZE , api_ntsvcs_get_device_list_size }, - { "NTSVCS_GET_DEVICE_LIST" , NTSVCS_GET_DEVICE_LIST , api_ntsvcs_get_device_list }, - { "NTSVCS_VALIDATE_DEVICE_INSTANCE" , NTSVCS_VALIDATE_DEVICE_INSTANCE , api_ntsvcs_validate_device_instance }, - { "NTSVCS_GET_DEVICE_REG_PROPERTY" , NTSVCS_GET_DEVICE_REG_PROPERTY , api_ntsvcs_get_device_reg_property }, - { "NTSVCS_GET_HW_PROFILE_INFO" , NTSVCS_GET_HW_PROFILE_INFO , api_ntsvcs_get_hw_profile_info }, - { "NTSVCS_HW_PROFILE_FLAGS" , NTSVCS_HW_PROFILE_FLAGS , api_ntsvcs_hw_profile_flags } -}; - - -void ntsvcs2_get_pipe_fns( struct api_struct **fns, int *n_fns ) -{ - *fns = api_ntsvcs_cmds; - *n_fns = sizeof(api_ntsvcs_cmds) / sizeof(struct api_struct); -} - -NTSTATUS rpc_ntsvcs2_init(void) -{ - return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, - "ntsvcs", "ntsvcs", - &ndr_table_ntsvcs.syntax_id, - api_ntsvcs_cmds, - sizeof(api_ntsvcs_cmds) / sizeof(struct api_struct)); -} |