s3-lsa: Fix policy handle memleak and handle type check in _lsa_DeleteObject().

Guenther

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 1a6d3bae16e7848f7fbd59c6b562bb8b3faee756..50bafc934949238411a3847a7795b4a2fdf3b1bf 100644 (file)
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -1304,12 +1304,22 @@ NTSTATUS _lsa_DeleteObject(pipes_struct *p,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       status = privilege_delete_account(&info->sid);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10,("_lsa_DeleteObject: privilege_delete_account gave: %s\n",
-                       nt_errstr(status)));
+       switch (info->type) {
+       case LSA_HANDLE_ACCOUNT_TYPE:
+               status = privilege_delete_account(&info->sid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(10,("_lsa_DeleteObject: privilege_delete_account gave: %s\n",
+                               nt_errstr(status)));
+                       return status;
+               }
+               break;
+       default:
+               return NT_STATUS_INVALID_HANDLE;
        }
 
+       close_policy_hnd(p, r->in.handle);
+       ZERO_STRUCTP(r->out.handle);
+
        return status;
 }