summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-19 02:50:01 +0100
committerGünther Deschner <gd@samba.org>2008-02-19 03:13:50 +0100
commit5894d5e99a23a1a700ef5319bcfe822b125ccbb0 (patch)
treef547c3abbdb88d00d511e8bb56680c6d7646e3e7
parent35a30ac841583326e81c27a18e93e53de9bdfc4f (diff)
downloadsamba-5894d5e99a23a1a700ef5319bcfe822b125ccbb0.tar.gz
samba-5894d5e99a23a1a700ef5319bcfe822b125ccbb0.tar.bz2
samba-5894d5e99a23a1a700ef5319bcfe822b125ccbb0.zip
Use pidl for _svcctl_UnlockServiceDatabase().
Guenther (This used to be commit 300bf76a79bfa0a9cf55505fd1e928aba9fec171)
-rw-r--r--source3/rpc_server/srv_svcctl.c18
-rw-r--r--source3/rpc_server/srv_svcctl_nt.c14
2 files changed, 6 insertions, 26 deletions
diff --git a/source3/rpc_server/srv_svcctl.c b/source3/rpc_server/srv_svcctl.c
index 4689e38dea..565c93fa77 100644
--- a/source3/rpc_server/srv_svcctl.c
+++ b/source3/rpc_server/srv_svcctl.c
@@ -228,23 +228,7 @@ static bool api_svcctl_lock_service_db(pipes_struct *p)
static bool api_svcctl_unlock_service_db(pipes_struct *p)
{
- SVCCTL_Q_UNLOCK_SERVICE_DB q_u;
- SVCCTL_R_UNLOCK_SERVICE_DB 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(!svcctl_io_q_unlock_service_db("", &q_u, data, 0))
- return False;
-
- r_u.status = _svcctl_unlock_service_db(p, &q_u, &r_u);
-
- if(!svcctl_io_r_unlock_service_db("", &r_u, rdata, 0))
- return False;
-
- return True;
+ return proxy_svcctl_call(p, NDR_SVCCTL_UNLOCKSERVICEDATABASE);
}
/*******************************************************************
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 96eafe4215..53154ef0c9 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -786,17 +786,19 @@ WERROR _svcctl_LockServiceDatabase(pipes_struct *p,
}
/********************************************************************
+ _svcctl_UnlockServiceDatabase
********************************************************************/
-WERROR _svcctl_unlock_service_db( pipes_struct *p, SVCCTL_Q_UNLOCK_SERVICE_DB *q_u, SVCCTL_R_UNLOCK_SERVICE_DB *r_u )
+WERROR _svcctl_UnlockServiceDatabase(pipes_struct *p,
+ struct svcctl_UnlockServiceDatabase *r)
{
- SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->h_lock );
+ SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.lock );
if ( !info || (info->type != SVC_HANDLE_IS_DBLOCK) )
return WERR_BADFID;
- return close_policy_hnd( p, &q_u->h_lock) ? WERR_OK : WERR_BADFID;
+ return close_policy_hnd( p, r->out.lock) ? WERR_OK : WERR_BADFID;
}
/********************************************************************
@@ -919,12 +921,6 @@ WERROR _svcctl_SetServiceStatus(pipes_struct *p, struct svcctl_SetServiceStatus
return WERR_NOT_SUPPORTED;
}
-WERROR _svcctl_UnlockServiceDatabase(pipes_struct *p, struct svcctl_UnlockServiceDatabase *r)
-{
- p->rng_fault_state = True;
- return WERR_NOT_SUPPORTED;
-}
-
WERROR _svcctl_NotifyBootConfigStatus(pipes_struct *p, struct svcctl_NotifyBootConfigStatus *r)
{
p->rng_fault_state = True;