diff options
| -rw-r--r-- | source/rpc_server/srv_reg.c | 10 | ||||
| -rw-r--r-- | source/winregd/srv_reg_nt.c | 35 |
2 files changed, 6 insertions, 39 deletions
diff --git a/source/rpc_server/srv_reg.c b/source/rpc_server/srv_reg.c index 7a33e647acf..2e5b3a0a847 100644 --- a/source/rpc_server/srv_reg.c +++ b/source/rpc_server/srv_reg.c @@ -128,6 +128,8 @@ static BOOL api_reg_open( rpcsrv_struct *p, prs_struct *data, static BOOL api_reg_open_entry( rpcsrv_struct *p, prs_struct *data, prs_struct *rdata ) { + uint32 status; + POLICY_HND entry_pol; REG_Q_OPEN_ENTRY q_u; REG_R_OPEN_ENTRY r_u; @@ -140,14 +142,10 @@ static BOOL api_reg_open_entry( rpcsrv_struct *p, prs_struct *data, return False; } - /* is that neccesary? lars*/ - memcpy(&r_u.pol, &q_u.pol, sizeof(POLICY_HND)); - /* construct reply. */ + status = _reg_open_entry(&q_u.pol,&q_u.uni_name,q_u.unknown_0,q_u.access_mask,&entry_pol); - r_u.status = _reg_open_entry(&q_u.pol,&q_u.uni_name,q_u.unknown_0,q_u.access_mask,&entry_pol); - - make_reg_r_open_entry(&r_u, &entry_pol, r_u.status); + make_reg_r_open_entry(&r_u, &entry_pol, status); /* store the response in the SMB stream */ return reg_io_r_open_entry("", &r_u, rdata, 0); diff --git a/source/winregd/srv_reg_nt.c b/source/winregd/srv_reg_nt.c index e1ef5ae826a..34809599f38 100644 --- a/source/winregd/srv_reg_nt.c +++ b/source/winregd/srv_reg_nt.c @@ -102,7 +102,7 @@ static void reg_reply_close(REG_Q_CLOSE *q_r, #endif /******************************************************************* - reg_reply_unknown_1 + _reg_close ********************************************************************/ uint32 _reg_close(POLICY_HND *pol) { @@ -115,7 +115,7 @@ uint32 _reg_close(POLICY_HND *pol) } /******************************************************************* - reg_reply_open + _reg_open ********************************************************************/ uint32 _reg_open(POLICY_HND *pol, uint32 access_mask) { @@ -168,37 +168,6 @@ uint32 _reg_open_entry(const POLICY_HND* pol, const UNISTR2* uni_name, uint32 un #if 0 /******************************************************************* - api_reg_open_entry - ********************************************************************/ -static BOOL api_reg_open_entry( rpcsrv_struct *p, prs_struct *data, - prs_struct *rdata ) -{ - POLICY_HND entry_pol; - REG_Q_OPEN_ENTRY q_u; - REG_R_OPEN_ENTRY r_u; - ZERO_STRUCT(q_u); - ZERO_STRUCT(r_u); - - /* grab the reg open entry */ - if (!reg_io_q_open_entry("", &q_u, data, 0)) - { - return False; - } - - memcpy(&r_u.pol, &q_u.pol, sizeof(POLICY_HND)); - - /* construct reply. */ - - r_u.status = _reg_open_entry(&q_u.pol,&q_u.uni_name,q_u.unknown_0,q_u.access_mask,&entry_pol); - - make_reg_r_open_entry(&r_u, &entry_pol, r_u.status); - - /* store the response in the SMB stream */ - return reg_io_r_open_entry("", &r_u, rdata, 0); -} - - -/******************************************************************* reg_reply_info ********************************************************************/ static void reg_reply_info(REG_Q_INFO *q_u, |