1 files changed, 24 insertions, 83 deletions

diff --git a/source3/rpc_server/srv_ntsvcs.c b/source3/rpc_server/srv_ntsvcs.c
index b3e93ac459..12fffc3e96 100644
--- a/source3/rpc_server/srv_ntsvcs.c
+++ b/source3/rpc_server/srv_ntsvcs.c
@@ -25,49 +25,38 @@
 /*******************************************************************
  ********************************************************************/
 
-static bool api_ntsvcs_get_version(pipes_struct *p)
+static bool proxy_ntsvcs_call(pipes_struct *p, uint8_t opnum)
 {
-	NTSVCS_Q_GET_VERSION q_u;
-	NTSVCS_R_GET_VERSION r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
+	struct api_struct *fns;
+	int n_fns;
 
-	if(!ntsvcs_io_q_get_version("", &q_u, data, 0))
-		return False;
+	ntsvcs_get_pipe_fns(&fns, &n_fns);
 
-	r_u.status = _ntsvcs_get_version(p, &q_u, &r_u);
+	if (opnum >= n_fns) {
+		return false;
+	}
 
-	if(!ntsvcs_io_r_get_version("", &r_u, rdata, 0))
-		return False;
+	if (fns[opnum].opnum != opnum) {
+		smb_panic("NTSVCS function table not sorted");
+	}
 
-	return True;
+	return fns[opnum].fn(p);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-static bool api_ntsvcs_get_device_list_size(pipes_struct *p)
+static bool api_ntsvcs_get_version(pipes_struct *p)
 {
-	NTSVCS_Q_GET_DEVICE_LIST_SIZE q_u;
-	NTSVCS_R_GET_DEVICE_LIST_SIZE r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if(!ntsvcs_io_q_get_device_list_size("", &q_u, data, 0))
-		return False;
-
-	r_u.status = _ntsvcs_get_device_list_size(p, &q_u, &r_u);
+	return proxy_ntsvcs_call(p, NDR_PNP_GETVERSION);
+}
 
-	if(!ntsvcs_io_r_get_device_list_size("", &r_u, rdata, 0))
-		return False;
+/*******************************************************************
+ ********************************************************************/
 
-	return True;
+static bool api_ntsvcs_get_device_list_size(pipes_struct *p)
+{
+	return proxy_ntsvcs_call(p, NDR_PNP_GETDEVICELISTSIZE);
 }
 
 /*******************************************************************
@@ -99,23 +88,7 @@ static bool api_ntsvcs_get_device_list(pipes_struct *p)
 
 static bool api_ntsvcs_validate_device_instance(pipes_struct *p)
 {
-	NTSVCS_Q_VALIDATE_DEVICE_INSTANCE q_u;
-	NTSVCS_R_VALIDATE_DEVICE_INSTANCE r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if(!ntsvcs_io_q_validate_device_instance("", &q_u, data, 0))
-		return False;
-
-	r_u.status = _ntsvcs_validate_device_instance(p, &q_u, &r_u);
-
-	if(!ntsvcs_io_r_validate_device_instance("", &r_u, rdata, 0))
-		return False;
-
-	return True;
+	return proxy_ntsvcs_call(p, NDR_PNP_VALIDATEDEVICEINSTANCE);
 }
 
 /*******************************************************************
@@ -147,23 +120,7 @@ static bool api_ntsvcs_get_device_reg_property(pipes_struct *p)
 
 static bool api_ntsvcs_get_hw_profile_info(pipes_struct *p)
 {
-	NTSVCS_Q_GET_HW_PROFILE_INFO q_u;
-	NTSVCS_R_GET_HW_PROFILE_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);
-
-	if(!ntsvcs_io_q_get_hw_profile_info("", &q_u, data, 0))
-		return False;
-
-	r_u.status = _ntsvcs_get_hw_profile_info(p, &q_u, &r_u);
-
-	if(!ntsvcs_io_r_get_hw_profile_info("", &r_u, rdata, 0))
-		return False;
-
-	return True;
+	return proxy_ntsvcs_call(p, NDR_PNP_GETHWPROFINFO);
 }
 
 /*******************************************************************
@@ -171,23 +128,7 @@ static bool api_ntsvcs_get_hw_profile_info(pipes_struct *p)
 
 static bool api_ntsvcs_hw_profile_flags(pipes_struct *p)
 {
-	NTSVCS_Q_HW_PROFILE_FLAGS q_u;
-	NTSVCS_R_HW_PROFILE_FLAGS r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if(!ntsvcs_io_q_hw_profile_flags("", &q_u, data, 0))
-		return False;
-
-	r_u.status = _ntsvcs_hw_profile_flags(p, &q_u, &r_u);
-
-	if(!ntsvcs_io_r_hw_profile_flags("", &r_u, rdata, 0))
-		return False;
-
-	return True;
+	return proxy_ntsvcs_call(p, NDR_PNP_HWPROFFLAGS);
 }
 
 /*******************************************************************
@@ -206,13 +147,13 @@ static struct api_struct api_ntsvcs_cmds[] =
 };
 
 
-void ntsvcs_get_pipe_fns( struct api_struct **fns, int *n_fns )
+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_ntsvcs_init(void)
+NTSTATUS rpc_ntsvcs2_init(void)
 {
   return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "ntsvcs", "ntsvcs", api_ntsvcs_cmds,
 				    sizeof(api_ntsvcs_cmds) / sizeof(struct api_struct));