summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-18 00:21:56 +0100
committerGünther Deschner <gd@samba.org>2008-02-18 00:31:14 +0100
commit3df6eedccfb1faeb778c4761594a6347bbf0b4b3 (patch)
treee7d803fbd6ded5af0308c45c7c349fe828773394 /source3
parent2e75900641b57d6a369d07efca817557650d9b8e (diff)
downloadsamba-3df6eedccfb1faeb778c4761594a6347bbf0b4b3.tar.gz
samba-3df6eedccfb1faeb778c4761594a6347bbf0b4b3.tar.bz2
samba-3df6eedccfb1faeb778c4761594a6347bbf0b4b3.zip
Use pidl for _PNP_GetDeviceListSize().
Guenther (This used to be commit da6636577dbbdabd248ea87a07819c5e63577f86)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_ntsvcs.c18
-rw-r--r--source3/rpc_server/srv_ntsvcs_nt.c23
2 files changed, 7 insertions, 34 deletions
diff --git a/source3/rpc_server/srv_ntsvcs.c b/source3/rpc_server/srv_ntsvcs.c
index cd2248926c..73d4b4f4ed 100644
--- a/source3/rpc_server/srv_ntsvcs.c
+++ b/source3/rpc_server/srv_ntsvcs.c
@@ -56,23 +56,7 @@ static bool api_ntsvcs_get_version(pipes_struct *p)
static bool api_ntsvcs_get_device_list_size(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);
-
- if(!ntsvcs_io_r_get_device_list_size("", &r_u, rdata, 0))
- return False;
-
- return True;
+ return proxy_ntsvcs_call(p, NDR_PNP_GETDEVICELISTSIZE);
}
/*******************************************************************
diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index b6e0126fa6..76bc24e7ba 100644
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/srv_ntsvcs_nt.c
@@ -45,21 +45,20 @@ WERROR _PNP_GetVersion(pipes_struct *p,
/********************************************************************
********************************************************************/
-WERROR _ntsvcs_get_device_list_size( pipes_struct *p, NTSVCS_Q_GET_DEVICE_LIST_SIZE *q_u, NTSVCS_R_GET_DEVICE_LIST_SIZE *r_u )
+WERROR _PNP_GetDeviceListSize(pipes_struct *p,
+ struct PNP_GetDeviceListSize *r)
{
- fstring device;
char *devicepath;
- if ( !q_u->devicename )
+ if (!r->in.devicename) {
return WERR_ACCESS_DENIED;
+ }
- rpcstr_pull(device, q_u->devicename->buffer, sizeof(device), q_u->devicename->uni_str_len*2, 0);
-
- if (!(devicepath = get_device_path(p->mem_ctx, device))) {
+ if (!(devicepath = get_device_path(p->mem_ctx, r->in.devicename))) {
return WERR_NOMEM;
}
- r_u->size = strlen(devicepath) + 2;
+ *r->out.size = strlen(devicepath) + 2;
TALLOC_FREE(devicepath);
@@ -269,16 +268,6 @@ WERROR _PNP_GetDeviceList(pipes_struct *p,
/****************************************************************
****************************************************************/
-WERROR _PNP_GetDeviceListSize(pipes_struct *p,
- struct PNP_GetDeviceListSize *r)
-{
- p->rng_fault_state = true;
- return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
-****************************************************************/
-
WERROR _PNP_GetDepth(pipes_struct *p,
struct PNP_GetDepth *r)
{