r20837: Use real type name, to fix compilation with -WC++-compat

(This used to be commit 840485686d2b3765bd01fbe442f712803d1f4c0f)

1 files changed, 33 insertions, 33 deletions

diff --git a/source3/librpc/gen_ndr/srv_lsa.c b/source3/librpc/gen_ndr/srv_lsa.c
index 7caa149dd6..6a4f991b99 100644
--- a/source3/librpc/gen_ndr/srv_lsa.c
+++ b/source3/librpc/gen_ndr/srv_lsa.c
@@ -168,7 +168,7 @@ static BOOL api_lsa_EnumPrivs(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.resume_handle = r.in.resume_handle;
-	r.out.privs = talloc_zero_size(mem_ctx, sizeof(*r.out.privs));
+	r.out.privs = talloc_zero(mem_ctx, struct lsa_PrivArray);
 	if (r.out.privs == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -239,7 +239,7 @@ static BOOL api_lsa_QuerySecurity(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QuerySecurity, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.sdbuf = talloc_zero_size(mem_ctx, sizeof(*r.out.sdbuf));
+	r.out.sdbuf = talloc_zero(mem_ctx, struct sec_desc_buf);
 	if (r.out.sdbuf == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -438,7 +438,7 @@ static BOOL api_lsa_OpenPolicy(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_OpenPolicy, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.handle = talloc_zero_size(mem_ctx, sizeof(*r.out.handle));
+	r.out.handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -509,7 +509,7 @@ static BOOL api_lsa_QueryInfoPolicy(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QueryInfoPolicy, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union lsa_PolicyInformation);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -708,7 +708,7 @@ static BOOL api_lsa_CreateAccount(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_CreateAccount, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.acct_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.acct_handle));
+	r.out.acct_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.acct_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -780,7 +780,7 @@ static BOOL api_lsa_EnumAccounts(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.resume_handle = r.in.resume_handle;
-	r.out.sids = talloc_zero_size(mem_ctx, sizeof(*r.out.sids));
+	r.out.sids = talloc_zero(mem_ctx, struct lsa_SidArray);
 	if (r.out.sids == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -851,7 +851,7 @@ static BOOL api_lsa_CreateTrustedDomain(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_CreateTrustedDomain, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.trustdom_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.trustdom_handle));
+	r.out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.trustdom_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -923,7 +923,7 @@ static BOOL api_lsa_EnumTrustDom(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.resume_handle = r.in.resume_handle;
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_DomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -994,7 +994,7 @@ static BOOL api_lsa_LookupNames(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupNames, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1067,7 +1067,7 @@ static BOOL api_lsa_LookupSids(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupSids, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1140,7 +1140,7 @@ static BOOL api_lsa_CreateSecret(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_CreateSecret, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.sec_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.sec_handle));
+	r.out.sec_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.sec_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1211,7 +1211,7 @@ static BOOL api_lsa_OpenAccount(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_OpenAccount, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.acct_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.acct_handle));
+	r.out.acct_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.acct_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1282,7 +1282,7 @@ static BOOL api_lsa_EnumPrivsAccount(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_EnumPrivsAccount, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.privs = talloc_zero_size(mem_ctx, sizeof(*r.out.privs));
+	r.out.privs = talloc_zero(mem_ctx, struct lsa_PrivilegeSet);
 	if (r.out.privs == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1737,7 +1737,7 @@ static BOOL api_lsa_OpenTrustedDomain(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_OpenTrustedDomain, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.trustdom_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.trustdom_handle));
+	r.out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.trustdom_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1808,7 +1808,7 @@ static BOOL api_lsa_QueryTrustedDomainInfo(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QueryTrustedDomainInfo, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1943,7 +1943,7 @@ static BOOL api_lsa_OpenSecret(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_OpenSecret, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.sec_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.sec_handle));
+	r.out.sec_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.sec_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2147,7 +2147,7 @@ static BOOL api_lsa_LookupPrivValue(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupPrivValue, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.luid = talloc_zero_size(mem_ctx, sizeof(*r.out.luid));
+	r.out.luid = talloc_zero(mem_ctx, struct lsa_LUID);
 	if (r.out.luid == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2218,7 +2218,7 @@ static BOOL api_lsa_LookupPrivName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupPrivName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.name = talloc_zero_size(mem_ctx, sizeof(*r.out.name));
+	r.out.name = talloc_zero(mem_ctx, struct lsa_StringLarge);
 	if (r.out.name == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2289,7 +2289,7 @@ static BOOL api_lsa_LookupPrivDisplayName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupPrivDisplayName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.disp_name = talloc_zero_size(mem_ctx, sizeof(*r.out.disp_name));
+	r.out.disp_name = talloc_zero(mem_ctx, struct lsa_StringLarge);
 	if (r.out.disp_name == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2425,7 +2425,7 @@ static BOOL api_lsa_EnumAccountsWithUserRight(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_EnumAccountsWithUserRight, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.sids = talloc_zero_size(mem_ctx, sizeof(*r.out.sids));
+	r.out.sids = talloc_zero(mem_ctx, struct lsa_SidArray);
 	if (r.out.sids == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2496,7 +2496,7 @@ static BOOL api_lsa_EnumAccountRights(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_EnumAccountRights, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.rights = talloc_zero_size(mem_ctx, sizeof(*r.out.rights));
+	r.out.rights = talloc_zero(mem_ctx, struct lsa_RightSet);
 	if (r.out.rights == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2695,7 +2695,7 @@ static BOOL api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QueryTrustedDomainInfoBySid, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3022,7 +3022,7 @@ static BOOL api_lsa_OpenPolicy2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_OpenPolicy2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.handle = talloc_zero_size(mem_ctx, sizeof(*r.out.handle));
+	r.out.handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3160,7 +3160,7 @@ static BOOL api_lsa_QueryInfoPolicy2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QueryInfoPolicy2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union lsa_PolicyInformation);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3295,7 +3295,7 @@ static BOOL api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QueryTrustedDomainInfoByName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3431,7 +3431,7 @@ static BOOL api_lsa_EnumTrustedDomainsEx(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.resume_handle = r.in.resume_handle;
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_DomainListEx);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3632,7 +3632,7 @@ static BOOL api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_QueryDomainInformationPolicy, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union lsa_DomainInformationPolicy);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3767,7 +3767,7 @@ static BOOL api_lsa_OpenTrustedDomainByName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_OpenTrustedDomainByName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.trustdom_handle = talloc_zero_size(mem_ctx, sizeof(*r.out.trustdom_handle));
+	r.out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 	if (r.out.trustdom_handle == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3902,7 +3902,7 @@ static BOOL api_lsa_LookupSids2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupSids2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3975,7 +3975,7 @@ static BOOL api_lsa_LookupNames2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupNames2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -4624,7 +4624,7 @@ static BOOL api_lsa_LookupNames3(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupNames3, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -5145,7 +5145,7 @@ static BOOL api_lsa_LookupSids3(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupSids3, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -5218,7 +5218,7 @@ static BOOL api_lsa_LookupNames4(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(lsa_LookupNames4, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.domains = talloc_zero_size(mem_ctx, sizeof(*r.out.domains));
+	r.out.domains = talloc_zero(mem_ctx, struct lsa_RefDomainList);
 	if (r.out.domains == NULL) {
 		talloc_free(mem_ctx);
 		return False;