summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-11-11 11:21:45 +0100
committerGünther Deschner <gd@samba.org>2008-11-19 23:25:25 +0100
commit12fdb5eb4628db08a665791fb76d15e9f5894478 (patch)
tree85c6839d8aa2e7ab29a99a3e8ef8b384b19001bc /source3
parent9b40d26e30518c666e4dad9cf55ec319cf19e28e (diff)
downloadsamba-12fdb5eb4628db08a665791fb76d15e9f5894478.tar.gz
samba-12fdb5eb4628db08a665791fb76d15e9f5894478.tar.bz2
samba-12fdb5eb4628db08a665791fb76d15e9f5894478.zip
s3-ntsvcs: use pidl for _PNP_GetDeviceRegProp.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_ntsvcs.c18
-rw-r--r--source3/rpc_server/srv_ntsvcs_nt.c43
2 files changed, 23 insertions, 38 deletions
diff --git a/source3/rpc_server/srv_ntsvcs.c b/source3/rpc_server/srv_ntsvcs.c
index 5010990b58..840da3eec4 100644
--- a/source3/rpc_server/srv_ntsvcs.c
+++ b/source3/rpc_server/srv_ntsvcs.c
@@ -97,23 +97,7 @@ static bool api_ntsvcs_validate_device_instance(pipes_struct *p)
static bool api_ntsvcs_get_device_reg_property(pipes_struct *p)
{
- NTSVCS_Q_GET_DEVICE_REG_PROPERTY q_u;
- NTSVCS_R_GET_DEVICE_REG_PROPERTY 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_reg_property("", &q_u, data, 0))
- return False;
-
- r_u.status = _ntsvcs_get_device_reg_property(p, &q_u, &r_u);
-
- if(!ntsvcs_io_r_get_device_reg_property("", &r_u, rdata, 0))
- return False;
-
- return True;
+ return proxy_ntsvcs_call(p, NDR_PNP_GETDEVICEREGPROP);
}
/*******************************************************************
diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index 268da52896..abeb2ca856 100644
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/srv_ntsvcs_nt.c
@@ -93,26 +93,26 @@ WERROR _ntsvcs_get_device_list( pipes_struct *p, NTSVCS_Q_GET_DEVICE_LIST *q_u,
}
/********************************************************************
+_PNP_GetDeviceRegProp
********************************************************************/
-WERROR _ntsvcs_get_device_reg_property( pipes_struct *p, NTSVCS_Q_GET_DEVICE_REG_PROPERTY *q_u, NTSVCS_R_GET_DEVICE_REG_PROPERTY *r_u )
+WERROR _PNP_GetDeviceRegProp(pipes_struct *p,
+ struct PNP_GetDeviceRegProp *r)
{
- fstring devicepath;
char *ptr;
REGVAL_CTR *values;
REGISTRY_VALUE *val;
- rpcstr_pull(devicepath, q_u->devicepath.buffer, sizeof(devicepath), q_u->devicepath.uni_str_len*2, 0);
-
- switch( q_u->property ) {
+ switch( r->in.property ) {
case DEV_REGPROP_DESC:
+
/* just parse the service name from the device path and then
lookup the display name */
- if ( !(ptr = strrchr_m( devicepath, '\\' )) )
+ if ( !(ptr = strrchr_m( r->in.devicepath, '\\' )) )
return WERR_GENERAL_FAILURE;
*ptr = '\0';
- if ( !(ptr = strrchr_m( devicepath, '_' )) )
+ if ( !(ptr = strrchr_m( r->in.devicepath, '_' )) )
return WERR_GENERAL_FAILURE;
ptr++;
@@ -124,16 +124,27 @@ WERROR _ntsvcs_get_device_reg_property( pipes_struct *p, NTSVCS_Q_GET_DEVICE_REG
return WERR_GENERAL_FAILURE;
}
- r_u->unknown1 = 0x1; /* always 1...tested using a remove device manager connection */
- r_u->size = reg_init_regval_buffer( &r_u->value, val );
- r_u->needed = r_u->size;
+ if (*r->in.buffer_size < val->size) {
+ *r->out.needed = val->size;
+ *r->out.buffer_size = 0;
+ TALLOC_FREE( values );
+ return WERR_CM_BUFFER_SMALL;
+ }
+ r->out.buffer = (uint8_t *)talloc_memdup(p->mem_ctx, val->data_p, val->size);
TALLOC_FREE(values);
+ if (!r->out.buffer) {
+ return WERR_NOMEM;
+ }
+
+ *r->out.reg_data_type = REG_SZ; /* always 1...tested using a remove device manager connection */
+ *r->out.buffer_size = val->size;
+ *r->out.needed = val->size;
break;
default:
- r_u->unknown1 = 0x00437c98;
+ *r->out.reg_data_type = 0x00437c98; /* ??? */
return WERR_CM_NO_SUCH_VALUE;
}
@@ -279,16 +290,6 @@ WERROR _PNP_GetDepth(pipes_struct *p,
/****************************************************************
****************************************************************/
-WERROR _PNP_GetDeviceRegProp(pipes_struct *p,
- struct PNP_GetDeviceRegProp *r)
-{
- p->rng_fault_state = true;
- return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
-****************************************************************/
-
WERROR _PNP_SetDeviceRegProp(pipes_struct *p,
struct PNP_SetDeviceRegProp *r)
{