s3-winbind: Make sure we close all policy handles in sam.

1 files changed, 83 insertions, 0 deletions

diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 35d4c00181..6eeb83da11 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -188,6 +188,8 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_enum_dom_groups\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	if (pnum_info) {
 		*pnum_info = 0;
 	}
@@ -220,6 +222,9 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
 	}
 
 error:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -239,6 +244,8 @@ static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
 
 	DEBUG(3,("samr_query_user_list\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	if (pnum_info) {
 		*pnum_info = 0;
 	}
@@ -272,6 +279,10 @@ static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -289,6 +300,8 @@ static NTSTATUS sam_query_user(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_query_user\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	/* Paranoia check */
 	if (!sid_check_is_in_our_domain(user_sid)) {
 		return NT_STATUS_NO_SUCH_USER;
@@ -318,6 +331,10 @@ static NTSTATUS sam_query_user(struct winbindd_domain *domain,
 				user_info);
 
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -336,6 +353,8 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
 
 	DEBUG(3,("samr: trusted domains\n"));
 
+	ZERO_STRUCT(lsa_policy);
+
 	if (ptrust_list) {
 		ZERO_STRUCTP(ptrust_list);
 	}
@@ -365,6 +384,10 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&lsa_policy)) {
+		rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -392,6 +415,8 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_lookup_groupmem\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	/* Paranoia check */
 	if (sid_check_is_in_builtin(group_sid) && (type != SID_NAME_ALIAS)) {
 		/* There's no groups, only aliases in BUILTIN */
@@ -441,6 +466,10 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -510,6 +539,8 @@ static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
 
 	DEBUG(3,("samr: enum local groups\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	if (pnum_info) {
 		*pnum_info = 0;
 	}
@@ -542,6 +573,10 @@ static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -564,6 +599,8 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_name_to_sid\n"));
 
+	ZERO_STRUCT(lsa_policy);
+
 	tmp_ctx = talloc_stackframe();
 	if (tmp_ctx == NULL) {
 		return NT_STATUS_NO_MEMORY;
@@ -594,6 +631,10 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&lsa_policy)) {
+		rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -616,6 +657,8 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_sid_to_name\n"));
 
+	ZERO_STRUCT(lsa_policy);
+
 	/* Paranoia check */
 	if (!sid_check_is_in_builtin(sid) &&
 	    !sid_check_is_in_our_domain(sid) &&
@@ -661,6 +704,10 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&lsa_policy)) {
+		rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -684,6 +731,8 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_rids_to_names for %s\n", domain->name));
 
+	ZERO_STRUCT(lsa_policy);
+
 	/* Paranoia check */
 	if (!sid_check_is_in_builtin(sid) &&
 	    !sid_check_is_in_our_domain(sid) &&
@@ -734,6 +783,10 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&lsa_policy)) {
+		rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -750,6 +803,8 @@ static NTSTATUS sam_lockout_policy(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_lockout_policy\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	tmp_ctx = talloc_stackframe();
 	if (tmp_ctx == NULL) {
 		return NT_STATUS_NO_MEMORY;
@@ -772,6 +827,10 @@ static NTSTATUS sam_lockout_policy(struct winbindd_domain *domain,
 	*lockout_policy = info->info12;
 
 error:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -788,6 +847,8 @@ static NTSTATUS sam_password_policy(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_password_policy\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	tmp_ctx = talloc_stackframe();
 	if (tmp_ctx == NULL) {
 		return NT_STATUS_NO_MEMORY;
@@ -810,6 +871,10 @@ static NTSTATUS sam_password_policy(struct winbindd_domain *domain,
 	*passwd_policy = info->info1;
 
 error:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -830,6 +895,8 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_lookup_usergroups\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	if (pnum_groups) {
 		*pnum_groups = 0;
 	}
@@ -864,6 +931,10 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -884,6 +955,8 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
 
 	DEBUG(3,("sam_lookup_useraliases\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	if (pnum_aliases) {
 		*pnum_aliases = 0;
 	}
@@ -918,6 +991,10 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
 	}
 
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }
@@ -934,6 +1011,8 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
 
 	DEBUG(3,("samr: sequence number\n"));
 
+	ZERO_STRUCT(dom_pol);
+
 	if (pseq) {
 		*pseq = DOM_SEQUENCE_NONE;
 	}
@@ -961,6 +1040,10 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
 		*pseq = seq;
 	}
 done:
+	if (is_valid_policy_hnd(&dom_pol)) {
+		rpccli_samr_Close(samr_pipe, tmp_ctx, &dom_pol);
+	}
+
 	TALLOC_FREE(tmp_ctx);
 	return status;
 }