From: Günther Deschner <gd@samba.org>
Date: Fri, 17 Jul 2009 11:44:55 +0000 (+0200)
Subject: s3-lsa: Fix policy handle memleak and handle type check in _lsa_DeleteObject().
X-Git-Tag: tevent-0.9.8~710^2~67
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=d1903cb7f2269c3eeb27ae05f734cbd8a542ee7f

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 1a6d3bae16e..50bafc93494 100644
--- 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;
 }