r9410: - a winreg_CloseKey() should return a zero key on success (zeroing the

callers key). This is the normal pattern with rpc handles.

- fixed reference to undefined error variable in winreg_DeleteKey()
(This used to be commit 6757d51a280d6c393648a384f1ef3ca403517352)

1 files changed, 4 insertions, 7 deletions

diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index f1dced3817b..e20d9aa6b66 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -85,6 +85,8 @@ static WERROR winreg_CloseKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 
 	talloc_free(h);
 
+	ZERO_STRUCTP(r->out.handle);
+
 	return WERR_OK;
 }
 
@@ -123,15 +125,10 @@ static WERROR winreg_DeleteKey(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
 		       struct winreg_DeleteKey *r)
 {
 	struct dcesrv_handle *h;
-	WERROR result;
 
 	DCESRV_PULL_HANDLE_FAULT(h, r->in.handle, HTYPE_REGKEY);
-
-	if (W_ERROR_IS_OK(result)) {
-		return reg_key_del((struct registry_key *)h->data, r->in.key.name);
-	}
-
-	return result;
+	
+	return reg_key_del((struct registry_key *)h->data, r->in.key.name);
 }