svn commit: samba r9410 - in branches/SAMBA_4_0/source/rpc_server/winreg: .

tridge at samba.org tridge at samba.org
Sat Aug 20 04:40:09 GMT 2005


Author: tridge
Date: 2005-08-20 04:40:08 +0000 (Sat, 20 Aug 2005)
New Revision: 9410

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9410

Log:
- 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()

Modified:
   branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c	2005-08-20 04:38:35 UTC (rev 9409)
+++ branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c	2005-08-20 04:40:08 UTC (rev 9410)
@@ -85,6 +85,8 @@
 
 	talloc_free(h);
 
+	ZERO_STRUCTP(r->out.handle);
+
 	return WERR_OK;
 }
 
@@ -123,15 +125,10 @@
 		       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);
 }
 
 



More information about the samba-cvs mailing list