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

(This used to be commit 840485686d2b3765bd01fbe442f712803d1f4c0f)

1 files changed, 35 insertions, 35 deletions

diff --git a/source3/librpc/gen_ndr/srv_netlogon.c b/source3/librpc/gen_ndr/srv_netlogon.c
index 2a33db9f19..a07e30a7ee 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.c
+++ b/source3/librpc/gen_ndr/srv_netlogon.c
@@ -37,7 +37,7 @@ static BOOL api_netr_LogonUasLogon(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_LogonUasLogon, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, struct netr_UasInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -108,7 +108,7 @@ static BOOL api_netr_LogonUasLogoff(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_LogonUasLogoff, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, struct netr_UasLogoffInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -180,13 +180,13 @@ static BOOL api_netr_LogonSamLogon(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
-	r.out.validation = talloc_zero_size(mem_ctx, sizeof(*r.out.validation));
+	r.out.validation = talloc_zero(mem_ctx, union netr_Validation);
 	if (r.out.validation == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.authoritative = talloc_zero_size(mem_ctx, sizeof(*r.out.authoritative));
+	r.out.authoritative = talloc_zero(mem_ctx, uint8_t);
 	if (r.out.authoritative == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -455,7 +455,7 @@ static BOOL api_netr_ServerPasswordSet(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_ServerPasswordSet, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.return_authenticator = talloc_zero_size(mem_ctx, sizeof(*r.out.return_authenticator));
+	r.out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 	if (r.out.return_authenticator == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -528,7 +528,7 @@ static BOOL api_netr_DatabaseDeltas(pipes_struct *p)
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
 	r.out.sequence_num = r.in.sequence_num;
-	r.out.delta_enum_array = talloc_zero_size(mem_ctx, sizeof(*r.out.delta_enum_array));
+	r.out.delta_enum_array = talloc_zero(mem_ctx, struct netr_DELTA_ENUM_ARRAY);
 	if (r.out.delta_enum_array == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -601,7 +601,7 @@ static BOOL api_netr_DatabaseSync(pipes_struct *p)
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
 	r.out.sync_context = r.in.sync_context;
-	r.out.delta_enum_array = talloc_zero_size(mem_ctx, sizeof(*r.out.delta_enum_array));
+	r.out.delta_enum_array = talloc_zero(mem_ctx, struct netr_DELTA_ENUM_ARRAY);
 	if (r.out.delta_enum_array == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -673,25 +673,25 @@ static BOOL api_netr_AccountDeltas(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
-	r.out.buffer = talloc_zero_size(mem_ctx, sizeof(*r.out.buffer));
+	r.out.buffer = talloc_zero(mem_ctx, struct netr_AccountBuffer);
 	if (r.out.buffer == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.count_returned = talloc_zero_size(mem_ctx, sizeof(*r.out.count_returned));
+	r.out.count_returned = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.count_returned == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.total_entries = talloc_zero_size(mem_ctx, sizeof(*r.out.total_entries));
+	r.out.total_entries = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.total_entries == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.recordid = talloc_zero_size(mem_ctx, sizeof(*r.out.recordid));
+	r.out.recordid = talloc_zero(mem_ctx, struct netr_UAS_INFO_0);
 	if (r.out.recordid == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -763,25 +763,25 @@ static BOOL api_netr_AccountSync(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
-	r.out.buffer = talloc_zero_size(mem_ctx, sizeof(*r.out.buffer));
+	r.out.buffer = talloc_zero(mem_ctx, struct netr_AccountBuffer);
 	if (r.out.buffer == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.count_returned = talloc_zero_size(mem_ctx, sizeof(*r.out.count_returned));
+	r.out.count_returned = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.count_returned == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.total_entries = talloc_zero_size(mem_ctx, sizeof(*r.out.total_entries));
+	r.out.total_entries = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.total_entries == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.next_reference = talloc_zero_size(mem_ctx, sizeof(*r.out.next_reference));
+	r.out.next_reference = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.next_reference == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -853,7 +853,7 @@ static BOOL api_netr_GetDcName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_GetDcName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.dcname = talloc_zero_size(mem_ctx, sizeof(*r.out.dcname));
+	r.out.dcname = talloc_zero(mem_ctx, const char *);
 	if (r.out.dcname == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -924,7 +924,7 @@ static BOOL api_netr_LogonControl(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_LogonControl, &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 netr_CONTROL_QUERY_INFORMATION);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -995,7 +995,7 @@ static BOOL api_netr_GetAnyDCName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_GetAnyDCName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.dcname = talloc_zero_size(mem_ctx, sizeof(*r.out.dcname));
+	r.out.dcname = talloc_zero(mem_ctx, const char *);
 	if (r.out.dcname == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1066,7 +1066,7 @@ static BOOL api_netr_LogonControl2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_LogonControl2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.query = talloc_zero_size(mem_ctx, sizeof(*r.out.query));
+	r.out.query = talloc_zero(mem_ctx, union netr_CONTROL_QUERY_INFORMATION);
 	if (r.out.query == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1206,7 +1206,7 @@ static BOOL api_netr_DatabaseSync2(pipes_struct *p)
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
 	r.out.sync_context = r.in.sync_context;
-	r.out.delta_enum_array = talloc_zero_size(mem_ctx, sizeof(*r.out.delta_enum_array));
+	r.out.delta_enum_array = talloc_zero(mem_ctx, struct netr_DELTA_ENUM_ARRAY);
 	if (r.out.delta_enum_array == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1278,7 +1278,7 @@ static BOOL api_netr_DatabaseRedo(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
-	r.out.delta_enum_array = talloc_zero_size(mem_ctx, sizeof(*r.out.delta_enum_array));
+	r.out.delta_enum_array = talloc_zero(mem_ctx, struct netr_DELTA_ENUM_ARRAY);
 	if (r.out.delta_enum_array == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1349,7 +1349,7 @@ static BOOL api_netr_LogonControl2Ex(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_LogonControl2Ex, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.query = talloc_zero_size(mem_ctx, sizeof(*r.out.query));
+	r.out.query = talloc_zero(mem_ctx, union netr_CONTROL_QUERY_INFORMATION);
 	if (r.out.query == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1484,7 +1484,7 @@ static BOOL api_netr_DsRGetDCName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_DsRGetDCName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1877,7 +1877,7 @@ static BOOL api_netr_ServerAuthenticate3(pipes_struct *p)
 	ZERO_STRUCT(r.out);
 	r.out.credentials = r.in.credentials;
 	r.out.negotiate_flags = r.in.negotiate_flags;
-	r.out.rid = talloc_zero_size(mem_ctx, sizeof(*r.out.rid));
+	r.out.rid = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.rid == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -1948,7 +1948,7 @@ static BOOL api_netr_DsRGetDCNameEx(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_DsRGetDCNameEx, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2019,7 +2019,7 @@ static BOOL api_netr_DsRGetSiteName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_DsRGetSiteName, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.site = talloc_zero_size(mem_ctx, sizeof(*r.out.site));
+	r.out.site = talloc_zero(mem_ctx, const char *);
 	if (r.out.site == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2091,7 +2091,7 @@ static BOOL api_netr_LogonGetDomainInfo(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, union netr_DomainInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2162,7 +2162,7 @@ static BOOL api_netr_ServerPasswordSet2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_ServerPasswordSet2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.return_authenticator = talloc_zero_size(mem_ctx, sizeof(*r.out.return_authenticator));
+	r.out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 	if (r.out.return_authenticator == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2425,7 +2425,7 @@ static BOOL api_netr_DsRGetDCNameEx2(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_DsRGetDCNameEx2, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.info = talloc_zero_size(mem_ctx, sizeof(*r.out.info));
+	r.out.info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo);
 	if (r.out.info == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2752,13 +2752,13 @@ static BOOL api_netr_LogonSamLogonEx(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_LogonSamLogonEx, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.validation = talloc_zero_size(mem_ctx, sizeof(*r.out.validation));
+	r.out.validation = talloc_zero(mem_ctx, union netr_Validation);
 	if (r.out.validation == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.authoritative = talloc_zero_size(mem_ctx, sizeof(*r.out.authoritative));
+	r.out.authoritative = talloc_zero(mem_ctx, uint8_t);
 	if (r.out.authoritative == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -2830,13 +2830,13 @@ static BOOL api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(netr_DsrEnumerateDomainTrusts, &r);
 	
 	ZERO_STRUCT(r.out);
-	r.out.count = talloc_zero_size(mem_ctx, sizeof(*r.out.count));
+	r.out.count = talloc_zero(mem_ctx, uint32_t);
 	if (r.out.count == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.trusts = talloc_zero_size(mem_ctx, sizeof(*r.out.trusts) * count);
+	r.out.trusts = talloc_zero_array(mem_ctx, struct netr_DomainTrust *, count);
 	if (r.out.trusts == NULL) {
 		talloc_free(mem_ctx);
 		return False;
@@ -3164,13 +3164,13 @@ static BOOL api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 	
 	ZERO_STRUCT(r.out);
 	r.out.return_authenticator = r.in.return_authenticator;
-	r.out.validation = talloc_zero_size(mem_ctx, sizeof(*r.out.validation));
+	r.out.validation = talloc_zero(mem_ctx, union netr_Validation);
 	if (r.out.validation == NULL) {
 		talloc_free(mem_ctx);
 		return False;
 	}
 	
-	r.out.authoritative = talloc_zero_size(mem_ctx, sizeof(*r.out.authoritative));
+	r.out.authoritative = talloc_zero(mem_ctx, uint8_t);
 	if (r.out.authoritative == NULL) {
 		talloc_free(mem_ctx);
 		return False;