rerun 'make idl'

metze
(This used to be commit 55c74832f3a4052d8b15f01b233aab97f7001bbe)

24 files changed, 1217 insertions, 1217 deletions

diff --git a/source3/librpc/gen_ndr/ndr_dfs.c b/source3/librpc/gen_ndr/ndr_dfs.c
index c373a4364c..f5ce913bd2 100644
--- a/source3/librpc/gen_ndr/ndr_dfs.c
+++ b/source3/librpc/gen_ndr/ndr_dfs.c
@@ -1562,65 +1562,65 @@ static enum ndr_err_code ndr_push_dfs_Info(struct ndr_push *ndr, int ndr_flags,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info4));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info5));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info6));
-			break;
+			break; }
 
-			case 7:
+			case 7: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info7));
-			break;
+			break; }
 
-			case 100:
+			case 100: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info100));
-			break;
+			break; }
 
-			case 101:
+			case 101: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info101));
-			break;
+			break; }
 
-			case 102:
+			case 102: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info102));
-			break;
+			break; }
 
-			case 103:
+			case 103: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info103));
-			break;
+			break; }
 
-			case 104:
+			case 104: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info104));
-			break;
+			break; }
 
-			case 105:
+			case 105: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info105));
-			break;
+			break; }
 
-			case 106:
+			case 106: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info106));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -2898,37 +2898,37 @@ static enum ndr_err_code ndr_push_dfs_EnumInfo(struct ndr_push *ndr, int ndr_fla
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info4));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info5));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info6));
-			break;
+			break; }
 
-			case 200:
+			case 200: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info200));
-			break;
+			break; }
 
-			case 300:
+			case 300: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info300));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/ndr_dssetup.c b/source3/librpc/gen_ndr/ndr_dssetup.c
index 37586549a6..bdad3c44f6 100644
--- a/source3/librpc/gen_ndr/ndr_dssetup.c
+++ b/source3/librpc/gen_ndr/ndr_dssetup.c
@@ -365,17 +365,17 @@ static enum ndr_err_code ndr_push_dssetup_DsRoleInfo(struct ndr_push *ndr, int n
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_dssetup_DsRoleInfoLevel(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case DS_ROLE_BASIC_INFORMATION:
+			case DS_ROLE_BASIC_INFORMATION: {
 				NDR_CHECK(ndr_push_dssetup_DsRolePrimaryDomInfoBasic(ndr, NDR_SCALARS, &r->basic));
-			break;
+			break; }
 
-			case DS_ROLE_UPGRADE_STATUS:
+			case DS_ROLE_UPGRADE_STATUS: {
 				NDR_CHECK(ndr_push_dssetup_DsRoleUpgradeStatus(ndr, NDR_SCALARS, &r->upgrade));
-			break;
+			break; }
 
-			case DS_ROLE_OP_STATUS:
+			case DS_ROLE_OP_STATUS: {
 				NDR_CHECK(ndr_push_dssetup_DsRoleOpStatus(ndr, NDR_SCALARS, &r->opstatus));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/ndr_echo.c b/source3/librpc/gen_ndr/ndr_echo.c
index dda9813e23..67ff0f2df4 100644
--- a/source3/librpc/gen_ndr/ndr_echo.c
+++ b/source3/librpc/gen_ndr/ndr_echo.c
@@ -228,33 +228,33 @@ static enum ndr_err_code ndr_push_echo_Info(struct ndr_push *ndr, int ndr_flags,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_echo_info1(ndr, NDR_SCALARS, &r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_echo_info2(ndr, NDR_SCALARS, &r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_echo_info3(ndr, NDR_SCALARS, &r->info3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_STRUCT_echo_info4(ndr, NDR_SCALARS, &r->info4));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_echo_info5(ndr, NDR_SCALARS, &r->info5));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_echo_info6(ndr, NDR_SCALARS, &r->info6));
-			break;
+			break; }
 
-			case 7:
+			case 7: {
 				NDR_CHECK(ndr_push_echo_info7(ndr, NDR_SCALARS, &r->info7));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -492,13 +492,13 @@ static enum ndr_err_code ndr_push_echo_Enum3(struct ndr_push *ndr, int ndr_flags
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case ECHO_ENUM1:
+			case ECHO_ENUM1: {
 				NDR_CHECK(ndr_push_echo_Enum1(ndr, NDR_SCALARS, r->e1));
-			break;
+			break; }
 
-			case ECHO_ENUM2:
+			case ECHO_ENUM2: {
 				NDR_CHECK(ndr_push_echo_Enum2(ndr, NDR_SCALARS, &r->e2));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/ndr_epmapper.c b/source3/librpc/gen_ndr/ndr_epmapper.c
index 17f4426279..4f9422ea57 100644
--- a/source3/librpc/gen_ndr/ndr_epmapper.c
+++ b/source3/librpc/gen_ndr/ndr_epmapper.c
@@ -867,118 +867,118 @@ static enum ndr_err_code ndr_push_epm_rhs(struct ndr_push *ndr, int ndr_flags, c
 		if (ndr_flags & NDR_SCALARS) {
 			int level = ndr_push_get_switch_value(ndr, r);
 			switch (level) {
-				case EPM_PROTOCOL_DNET_NSP:
+				case EPM_PROTOCOL_DNET_NSP: {
 					NDR_CHECK(ndr_push_epm_rhs_dnet_nsp(ndr, NDR_SCALARS, &r->dnet_nsp));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_OSI_TP4:
+				case EPM_PROTOCOL_OSI_TP4: {
 					NDR_CHECK(ndr_push_epm_rhs_osi_tp4(ndr, NDR_SCALARS, &r->osi_tp4));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_OSI_CLNS:
+				case EPM_PROTOCOL_OSI_CLNS: {
 					NDR_CHECK(ndr_push_epm_rhs_osi_clns(ndr, NDR_SCALARS, &r->osi_clns));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_TCP:
+				case EPM_PROTOCOL_TCP: {
 					NDR_CHECK(ndr_push_epm_rhs_tcp(ndr, NDR_SCALARS, &r->tcp));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_UDP:
+				case EPM_PROTOCOL_UDP: {
 					NDR_CHECK(ndr_push_epm_rhs_udp(ndr, NDR_SCALARS, &r->udp));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_IP:
+				case EPM_PROTOCOL_IP: {
 					NDR_CHECK(ndr_push_epm_rhs_ip(ndr, NDR_SCALARS, &r->ip));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NCADG:
+				case EPM_PROTOCOL_NCADG: {
 					NDR_CHECK(ndr_push_epm_rhs_ncadg(ndr, NDR_SCALARS, &r->ncadg));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NCACN:
+				case EPM_PROTOCOL_NCACN: {
 					NDR_CHECK(ndr_push_epm_rhs_ncacn(ndr, NDR_SCALARS, &r->ncacn));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NCALRPC:
+				case EPM_PROTOCOL_NCALRPC: {
 					NDR_CHECK(ndr_push_epm_rhs_ncalrpc(ndr, NDR_SCALARS, &r->ncalrpc));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_UUID:
+				case EPM_PROTOCOL_UUID: {
 					NDR_CHECK(ndr_push_epm_rhs_uuid(ndr, NDR_SCALARS, &r->uuid));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_IPX:
+				case EPM_PROTOCOL_IPX: {
 					NDR_CHECK(ndr_push_epm_rhs_ipx(ndr, NDR_SCALARS, &r->ipx));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_SMB:
+				case EPM_PROTOCOL_SMB: {
 					NDR_CHECK(ndr_push_epm_rhs_smb(ndr, NDR_SCALARS, &r->smb));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_PIPE:
+				case EPM_PROTOCOL_PIPE: {
 					NDR_CHECK(ndr_push_epm_rhs_pipe(ndr, NDR_SCALARS, &r->pipe));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NETBIOS:
+				case EPM_PROTOCOL_NETBIOS: {
 					NDR_CHECK(ndr_push_epm_rhs_netbios(ndr, NDR_SCALARS, &r->netbios));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NETBEUI:
+				case EPM_PROTOCOL_NETBEUI: {
 					NDR_CHECK(ndr_push_epm_rhs_netbeui(ndr, NDR_SCALARS, &r->netbeui));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_SPX:
+				case EPM_PROTOCOL_SPX: {
 					NDR_CHECK(ndr_push_epm_rhs_spx(ndr, NDR_SCALARS, &r->spx));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NB_IPX:
+				case EPM_PROTOCOL_NB_IPX: {
 					NDR_CHECK(ndr_push_epm_rhs_nb_ipx(ndr, NDR_SCALARS, &r->nb_ipx));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_DSP:
+				case EPM_PROTOCOL_DSP: {
 					NDR_CHECK(ndr_push_epm_rhs_atalk_stream(ndr, NDR_SCALARS, &r->atalk_stream));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_DDP:
+				case EPM_PROTOCOL_DDP: {
 					NDR_CHECK(ndr_push_epm_rhs_atalk_datagram(ndr, NDR_SCALARS, &r->atalk_datagram));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_APPLETALK:
+				case EPM_PROTOCOL_APPLETALK: {
 					NDR_CHECK(ndr_push_epm_rhs_appletalk(ndr, NDR_SCALARS, &r->appletalk));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_VINES_SPP:
+				case EPM_PROTOCOL_VINES_SPP: {
 					NDR_CHECK(ndr_push_epm_rhs_vines_spp(ndr, NDR_SCALARS, &r->vines_spp));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_VINES_IPC:
+				case EPM_PROTOCOL_VINES_IPC: {
 					NDR_CHECK(ndr_push_epm_rhs_vines_ipc(ndr, NDR_SCALARS, &r->vines_ipc));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_STREETTALK:
+				case EPM_PROTOCOL_STREETTALK: {
 					NDR_CHECK(ndr_push_epm_rhs_streettalk(ndr, NDR_SCALARS, &r->streettalk));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_HTTP:
+				case EPM_PROTOCOL_HTTP: {
 					NDR_CHECK(ndr_push_epm_rhs_http(ndr, NDR_SCALARS, &r->http));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_UNIX_DS:
+				case EPM_PROTOCOL_UNIX_DS: {
 					NDR_CHECK(ndr_push_epm_rhs_unix_ds(ndr, NDR_SCALARS, &r->unix_ds));
-				break;
+				break; }
 
-				case EPM_PROTOCOL_NULL:
+				case EPM_PROTOCOL_NULL: {
 					NDR_CHECK(ndr_push_epm_rhs_null(ndr, NDR_SCALARS, &r->null));
-				break;
+				break; }
 
-				default:
+				default: {
 					{
 						uint32_t _flags_save_DATA_BLOB = ndr->flags;
 						ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
 						NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->unknown));
 						ndr->flags = _flags_save_DATA_BLOB;
 					}
-				break;
+				break; }
 
 			}
 		}
diff --git a/source3/librpc/gen_ndr/ndr_lsa.c b/source3/librpc/gen_ndr/ndr_lsa.c
index a3565c8f2c..ef93d6b60c 100644
--- a/source3/librpc/gen_ndr/ndr_lsa.c
+++ b/source3/librpc/gen_ndr/ndr_lsa.c
@@ -1216,53 +1216,53 @@ static enum ndr_err_code ndr_push_lsa_PolicyInformation(struct ndr_push *ndr, in
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case LSA_POLICY_INFO_AUDIT_LOG:
+			case LSA_POLICY_INFO_AUDIT_LOG: {
 				NDR_CHECK(ndr_push_lsa_AuditLogInfo(ndr, NDR_SCALARS, &r->audit_log));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_AUDIT_EVENTS:
+			case LSA_POLICY_INFO_AUDIT_EVENTS: {
 				NDR_CHECK(ndr_push_lsa_AuditEventsInfo(ndr, NDR_SCALARS, &r->audit_events));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_DOMAIN:
+			case LSA_POLICY_INFO_DOMAIN: {
 				NDR_CHECK(ndr_push_lsa_DomainInfo(ndr, NDR_SCALARS, &r->domain));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_PD:
+			case LSA_POLICY_INFO_PD: {
 				NDR_CHECK(ndr_push_lsa_PDAccountInfo(ndr, NDR_SCALARS, &r->pd));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_ACCOUNT_DOMAIN:
+			case LSA_POLICY_INFO_ACCOUNT_DOMAIN: {
 				NDR_CHECK(ndr_push_lsa_DomainInfo(ndr, NDR_SCALARS, &r->account_domain));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_ROLE:
+			case LSA_POLICY_INFO_ROLE: {
 				NDR_CHECK(ndr_push_lsa_ServerRole(ndr, NDR_SCALARS, &r->role));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_REPLICA:
+			case LSA_POLICY_INFO_REPLICA: {
 				NDR_CHECK(ndr_push_lsa_ReplicaSourceInfo(ndr, NDR_SCALARS, &r->replica));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_QUOTA:
+			case LSA_POLICY_INFO_QUOTA: {
 				NDR_CHECK(ndr_push_lsa_DefaultQuotaInfo(ndr, NDR_SCALARS, &r->quota));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_DB:
+			case LSA_POLICY_INFO_DB: {
 				NDR_CHECK(ndr_push_lsa_ModificationInfo(ndr, NDR_SCALARS, &r->db));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_AUDIT_FULL_SET:
+			case LSA_POLICY_INFO_AUDIT_FULL_SET: {
 				NDR_CHECK(ndr_push_lsa_AuditFullSetInfo(ndr, NDR_SCALARS, &r->auditfullset));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
+			case LSA_POLICY_INFO_AUDIT_FULL_QUERY: {
 				NDR_CHECK(ndr_push_lsa_AuditFullQueryInfo(ndr, NDR_SCALARS, &r->auditfullquery));
-			break;
+			break; }
 
-			case LSA_POLICY_INFO_DNS:
+			case LSA_POLICY_INFO_DNS: {
 				NDR_CHECK(ndr_push_lsa_DnsDomainInfo(ndr, NDR_SCALARS, &r->dns));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -2979,41 +2979,41 @@ static enum ndr_err_code ndr_push_lsa_TrustedDomainInfo(struct ndr_push *ndr, in
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_lsa_TrustDomInfoEnum(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case LSA_TRUSTED_DOMAIN_INFO_NAME:
+			case LSA_TRUSTED_DOMAIN_INFO_NAME: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoName(ndr, NDR_SCALARS, &r->name));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET:
+			case LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoPosixOffset(ndr, NDR_SCALARS, &r->posix_offset));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_PASSWORD:
+			case LSA_TRUSTED_DOMAIN_INFO_PASSWORD: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoPassword(ndr, NDR_SCALARS, &r->password));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_BASIC:
+			case LSA_TRUSTED_DOMAIN_INFO_BASIC: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoBasic(ndr, NDR_SCALARS, &r->info_basic));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_INFO_EX:
+			case LSA_TRUSTED_DOMAIN_INFO_INFO_EX: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoInfoEx(ndr, NDR_SCALARS, &r->info_ex));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO:
+			case LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoAuthInfo(ndr, NDR_SCALARS, &r->auth_info));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_FULL_INFO:
+			case LSA_TRUSTED_DOMAIN_INFO_FULL_INFO: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoFullInfo(ndr, NDR_SCALARS, &r->full_info));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_11:
+			case LSA_TRUSTED_DOMAIN_INFO_11: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfo11(ndr, NDR_SCALARS, &r->info11));
-			break;
+			break; }
 
-			case LSA_TRUSTED_DOMAIN_INFO_INFO_ALL:
+			case LSA_TRUSTED_DOMAIN_INFO_INFO_ALL: {
 				NDR_CHECK(ndr_push_lsa_TrustDomainInfoInfoAll(ndr, NDR_SCALARS, &r->info_all));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -3593,13 +3593,13 @@ static enum ndr_err_code ndr_push_lsa_DomainInformationPolicy(struct ndr_push *n
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case LSA_DOMAIN_INFO_POLICY_EFS:
+			case LSA_DOMAIN_INFO_POLICY_EFS: {
 				NDR_CHECK(ndr_push_lsa_DomainInfoEfs(ndr, NDR_SCALARS, &r->efs_info));
-			break;
+			break; }
 
-			case LSA_DOMAIN_INFO_POLICY_KERBEROS:
+			case LSA_DOMAIN_INFO_POLICY_KERBEROS: {
 				NDR_CHECK(ndr_push_lsa_DomainInfoKerberos(ndr, NDR_SCALARS, &r->kerberos_info));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -4214,21 +4214,21 @@ static enum ndr_err_code ndr_push_lsa_ForestTrustData(struct ndr_push *ndr, int
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case LSA_FOREST_TRUST_TOP_LEVEL_NAME:
+			case LSA_FOREST_TRUST_TOP_LEVEL_NAME: {
 				NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->top_level_name));
-			break;
+			break; }
 
-			case LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX:
+			case LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX: {
 				NDR_CHECK(ndr_push_lsa_StringLarge(ndr, NDR_SCALARS, &r->top_level_name_ex));
-			break;
+			break; }
 
-			case LSA_FOREST_TRUST_DOMAIN_INFO:
+			case LSA_FOREST_TRUST_DOMAIN_INFO: {
 				NDR_CHECK(ndr_push_lsa_ForestTrustDomainInfo(ndr, NDR_SCALARS, &r->domain_info));
-			break;
+			break; }
 
-			default:
+			default: {
 				NDR_CHECK(ndr_push_lsa_ForestTrustBinaryData(ndr, NDR_SCALARS, &r->data));
-			break;
+			break; }
 
 		}
 	}
diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/source3/librpc/gen_ndr/ndr_netlogon.c
index dd1d2cf387..b12a347ded 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/source3/librpc/gen_ndr/ndr_netlogon.c
@@ -600,25 +600,25 @@ _PUBLIC_ enum ndr_err_code ndr_push_netr_LogonLevel(struct ndr_push *ndr, int nd
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->password));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->network));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->password));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->password));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->network));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -1578,25 +1578,25 @@ _PUBLIC_ enum ndr_err_code ndr_push_netr_Validation(struct ndr_push *ndr, int nd
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sam2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sam3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->pac));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->pac));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sam6));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -3790,90 +3790,90 @@ static enum ndr_err_code ndr_push_netr_DELTA_UNION(struct ndr_push *ndr, int ndr
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_netr_DeltaEnum(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case NETR_DELTA_DOMAIN:
+			case NETR_DELTA_DOMAIN: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->domain));
-			break;
+			break; }
 
-			case NETR_DELTA_GROUP:
+			case NETR_DELTA_GROUP: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->group));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_GROUP:
-			break;
+			case NETR_DELTA_DELETE_GROUP: {
+			break; }
 
-			case NETR_DELTA_RENAME_GROUP:
+			case NETR_DELTA_RENAME_GROUP: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->rename_group));
-			break;
+			break; }
 
-			case NETR_DELTA_USER:
+			case NETR_DELTA_USER: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->user));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_USER:
-			break;
+			case NETR_DELTA_DELETE_USER: {
+			break; }
 
-			case NETR_DELTA_RENAME_USER:
+			case NETR_DELTA_RENAME_USER: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->rename_user));
-			break;
+			break; }
 
-			case NETR_DELTA_GROUP_MEMBER:
+			case NETR_DELTA_GROUP_MEMBER: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->group_member));
-			break;
+			break; }
 
-			case NETR_DELTA_ALIAS:
+			case NETR_DELTA_ALIAS: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->alias));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_ALIAS:
-			break;
+			case NETR_DELTA_DELETE_ALIAS: {
+			break; }
 
-			case NETR_DELTA_RENAME_ALIAS:
+			case NETR_DELTA_RENAME_ALIAS: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->rename_alias));
-			break;
+			break; }
 
-			case NETR_DELTA_ALIAS_MEMBER:
+			case NETR_DELTA_ALIAS_MEMBER: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->alias_member));
-			break;
+			break; }
 
-			case NETR_DELTA_POLICY:
+			case NETR_DELTA_POLICY: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->policy));
-			break;
+			break; }
 
-			case NETR_DELTA_TRUSTED_DOMAIN:
+			case NETR_DELTA_TRUSTED_DOMAIN: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->trusted_domain));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_TRUST:
+			case NETR_DELTA_DELETE_TRUST: {
 				NDR_CHECK(ndr_push_netr_DELTA_DELETE_TRUST(ndr, NDR_SCALARS, &r->delete_trust));
-			break;
+			break; }
 
-			case NETR_DELTA_ACCOUNT:
+			case NETR_DELTA_ACCOUNT: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->account));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_ACCOUNT:
+			case NETR_DELTA_DELETE_ACCOUNT: {
 				NDR_CHECK(ndr_push_netr_DELTA_DELETE_ACCOUNT(ndr, NDR_SCALARS, &r->delete_account));
-			break;
+			break; }
 
-			case NETR_DELTA_SECRET:
+			case NETR_DELTA_SECRET: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->secret));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_SECRET:
+			case NETR_DELTA_DELETE_SECRET: {
 				NDR_CHECK(ndr_push_netr_DELTA_DELETE_SECRET(ndr, NDR_SCALARS, &r->delete_secret));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_GROUP2:
+			case NETR_DELTA_DELETE_GROUP2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->delete_group));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_USER2:
+			case NETR_DELTA_DELETE_USER2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->delete_user));
-			break;
+			break; }
 
-			case NETR_DELTA_MODIFY_COUNT:
+			case NETR_DELTA_MODIFY_COUNT: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->modified_count));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -4568,92 +4568,92 @@ static enum ndr_err_code ndr_push_netr_DELTA_ID_UNION(struct ndr_push *ndr, int
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_netr_DeltaEnum(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case NETR_DELTA_DOMAIN:
+			case NETR_DELTA_DOMAIN: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_GROUP:
+			case NETR_DELTA_GROUP: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_GROUP:
+			case NETR_DELTA_DELETE_GROUP: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_RENAME_GROUP:
+			case NETR_DELTA_RENAME_GROUP: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_USER:
+			case NETR_DELTA_USER: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_USER:
+			case NETR_DELTA_DELETE_USER: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_RENAME_USER:
+			case NETR_DELTA_RENAME_USER: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_GROUP_MEMBER:
+			case NETR_DELTA_GROUP_MEMBER: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_ALIAS:
+			case NETR_DELTA_ALIAS: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_ALIAS:
+			case NETR_DELTA_DELETE_ALIAS: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_RENAME_ALIAS:
+			case NETR_DELTA_RENAME_ALIAS: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_ALIAS_MEMBER:
+			case NETR_DELTA_ALIAS_MEMBER: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_POLICY:
+			case NETR_DELTA_POLICY: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid));
-			break;
+			break; }
 
-			case NETR_DELTA_TRUSTED_DOMAIN:
+			case NETR_DELTA_TRUSTED_DOMAIN: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_TRUST:
+			case NETR_DELTA_DELETE_TRUST: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid));
-			break;
+			break; }
 
-			case NETR_DELTA_ACCOUNT:
+			case NETR_DELTA_ACCOUNT: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_ACCOUNT:
+			case NETR_DELTA_DELETE_ACCOUNT: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->sid));
-			break;
+			break; }
 
-			case NETR_DELTA_SECRET:
+			case NETR_DELTA_SECRET: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_SECRET:
+			case NETR_DELTA_DELETE_SECRET: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_GROUP2:
+			case NETR_DELTA_DELETE_GROUP2: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_DELETE_USER2:
+			case NETR_DELTA_DELETE_USER2: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->rid));
-			break;
+			break; }
 
-			case NETR_DELTA_MODIFY_COUNT:
-			break;
+			case NETR_DELTA_MODIFY_COUNT: {
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -5529,17 +5529,17 @@ static enum ndr_err_code ndr_push_netr_CONTROL_QUERY_INFORMATION(struct ndr_push
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info3));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -5728,21 +5728,21 @@ static enum ndr_err_code ndr_push_netr_CONTROL_DATA_INFORMATION(struct ndr_push
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case NETLOGON_CONTROL_REDISCOVER:
+			case NETLOGON_CONTROL_REDISCOVER: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->domain));
-			break;
+			break; }
 
-			case NETLOGON_CONTROL_TC_QUERY:
+			case NETLOGON_CONTROL_TC_QUERY: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->domain));
-			break;
+			break; }
 
-			case NETLOGON_CONTROL_TRANSPORT_NOTIFY:
+			case NETLOGON_CONTROL_TRANSPORT_NOTIFY: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->domain));
-			break;
+			break; }
 
-			case NETLOGON_CONTROL_SET_DBFLAG:
+			case NETLOGON_CONTROL_SET_DBFLAG: {
 				NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->debug_level));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -6718,13 +6718,13 @@ static enum ndr_err_code ndr_push_netr_DomainQuery(struct ndr_push *ndr, int ndr
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->query1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->query1));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -7079,13 +7079,13 @@ static enum ndr_err_code ndr_push_netr_DomainInfo(struct ndr_push *ndr, int ndr_
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/ndr_samr.c b/source3/librpc/gen_ndr/ndr_samr.c
index 8c97ea1d95..13227f75d1 100644
--- a/source3/librpc/gen_ndr/ndr_samr.c
+++ b/source3/librpc/gen_ndr/ndr_samr.c
@@ -814,53 +814,53 @@ static enum ndr_err_code ndr_push_samr_DomainInfo(struct ndr_push *ndr, int ndr_
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_samr_DomInfo1(ndr, NDR_SCALARS, &r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_samr_DomInfo2(ndr, NDR_SCALARS, &r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_samr_DomInfo3(ndr, NDR_SCALARS, &r->info3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_samr_DomInfo4(ndr, NDR_SCALARS, &r->info4));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_samr_DomInfo5(ndr, NDR_SCALARS, &r->info5));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_samr_DomInfo6(ndr, NDR_SCALARS, &r->info6));
-			break;
+			break; }
 
-			case 7:
+			case 7: {
 				NDR_CHECK(ndr_push_samr_DomInfo7(ndr, NDR_SCALARS, &r->info7));
-			break;
+			break; }
 
-			case 8:
+			case 8: {
 				NDR_CHECK(ndr_push_samr_DomInfo8(ndr, NDR_SCALARS, &r->info8));
-			break;
+			break; }
 
-			case 9:
+			case 9: {
 				NDR_CHECK(ndr_push_samr_DomInfo9(ndr, NDR_SCALARS, &r->info9));
-			break;
+			break; }
 
-			case 11:
+			case 11: {
 				NDR_CHECK(ndr_push_samr_DomInfo11(ndr, NDR_SCALARS, &r->info11));
-			break;
+			break; }
 
-			case 12:
+			case 12: {
 				NDR_CHECK(ndr_push_samr_DomInfo12(ndr, NDR_SCALARS, &r->info12));
-			break;
+			break; }
 
-			case 13:
+			case 13: {
 				NDR_CHECK(ndr_push_samr_DomInfo13(ndr, NDR_SCALARS, &r->info13));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -1308,25 +1308,25 @@ static enum ndr_err_code ndr_push_samr_GroupInfo(struct ndr_push *ndr, int ndr_f
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_samr_GroupInfoEnum(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case GROUPINFOALL:
+			case GROUPINFOALL: {
 				NDR_CHECK(ndr_push_samr_GroupInfoAll(ndr, NDR_SCALARS, &r->all));
-			break;
+			break; }
 
-			case GROUPINFONAME:
+			case GROUPINFONAME: {
 				NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->name));
-			break;
+			break; }
 
-			case GROUPINFOATTRIBUTES:
+			case GROUPINFOATTRIBUTES: {
 				NDR_CHECK(ndr_push_samr_GroupInfoAttributes(ndr, NDR_SCALARS, &r->attributes));
-			break;
+			break; }
 
-			case GROUPINFODESCRIPTION:
+			case GROUPINFODESCRIPTION: {
 				NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->description));
-			break;
+			break; }
 
-			case GROUPINFOALL2:
+			case GROUPINFOALL2: {
 				NDR_CHECK(ndr_push_samr_GroupInfoAll(ndr, NDR_SCALARS, &r->all2));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -1659,17 +1659,17 @@ static enum ndr_err_code ndr_push_samr_AliasInfo(struct ndr_push *ndr, int ndr_f
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_samr_AliasInfoEnum(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case ALIASINFOALL:
+			case ALIASINFOALL: {
 				NDR_CHECK(ndr_push_samr_AliasInfoAll(ndr, NDR_SCALARS, &r->all));
-			break;
+			break; }
 
-			case ALIASINFONAME:
+			case ALIASINFONAME: {
 				NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->name));
-			break;
+			break; }
 
-			case ALIASINFODESCRIPTION:
+			case ALIASINFODESCRIPTION: {
 				NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->description));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -3112,97 +3112,97 @@ static enum ndr_err_code ndr_push_samr_UserInfo(struct ndr_push *ndr, int ndr_fl
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_samr_UserInfo1(ndr, NDR_SCALARS, &r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_samr_UserInfo2(ndr, NDR_SCALARS, &r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_samr_UserInfo3(ndr, NDR_SCALARS, &r->info3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_samr_UserInfo4(ndr, NDR_SCALARS, &r->info4));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_samr_UserInfo5(ndr, NDR_SCALARS, &r->info5));
-			break;
+			break; }
 
-			case 6:
+			case 6: {
 				NDR_CHECK(ndr_push_samr_UserInfo6(ndr, NDR_SCALARS, &r->info6));
-			break;
+			break; }
 
-			case 7:
+			case 7: {
 				NDR_CHECK(ndr_push_samr_UserInfo7(ndr, NDR_SCALARS, &r->info7));
-			break;
+			break; }
 
-			case 8:
+			case 8: {
 				NDR_CHECK(ndr_push_samr_UserInfo8(ndr, NDR_SCALARS, &r->info8));
-			break;
+			break; }
 
-			case 9:
+			case 9: {
 				NDR_CHECK(ndr_push_samr_UserInfo9(ndr, NDR_SCALARS, &r->info9));
-			break;
+			break; }
 
-			case 10:
+			case 10: {
 				NDR_CHECK(ndr_push_samr_UserInfo10(ndr, NDR_SCALARS, &r->info10));
-			break;
+			break; }
 
-			case 11:
+			case 11: {
 				NDR_CHECK(ndr_push_samr_UserInfo11(ndr, NDR_SCALARS, &r->info11));
-			break;
+			break; }
 
-			case 12:
+			case 12: {
 				NDR_CHECK(ndr_push_samr_UserInfo12(ndr, NDR_SCALARS, &r->info12));
-			break;
+			break; }
 
-			case 13:
+			case 13: {
 				NDR_CHECK(ndr_push_samr_UserInfo13(ndr, NDR_SCALARS, &r->info13));
-			break;
+			break; }
 
-			case 14:
+			case 14: {
 				NDR_CHECK(ndr_push_samr_UserInfo14(ndr, NDR_SCALARS, &r->info14));
-			break;
+			break; }
 
-			case 16:
+			case 16: {
 				NDR_CHECK(ndr_push_samr_UserInfo16(ndr, NDR_SCALARS, &r->info16));
-			break;
+			break; }
 
-			case 17:
+			case 17: {
 				NDR_CHECK(ndr_push_samr_UserInfo17(ndr, NDR_SCALARS, &r->info17));
-			break;
+			break; }
 
-			case 18:
+			case 18: {
 				NDR_CHECK(ndr_push_samr_UserInfo18(ndr, NDR_SCALARS, &r->info18));
-			break;
+			break; }
 
-			case 20:
+			case 20: {
 				NDR_CHECK(ndr_push_samr_UserInfo20(ndr, NDR_SCALARS, &r->info20));
-			break;
+			break; }
 
-			case 21:
+			case 21: {
 				NDR_CHECK(ndr_push_samr_UserInfo21(ndr, NDR_SCALARS, &r->info21));
-			break;
+			break; }
 
-			case 23:
+			case 23: {
 				NDR_CHECK(ndr_push_samr_UserInfo23(ndr, NDR_SCALARS, &r->info23));
-			break;
+			break; }
 
-			case 24:
+			case 24: {
 				NDR_CHECK(ndr_push_samr_UserInfo24(ndr, NDR_SCALARS, &r->info24));
-			break;
+			break; }
 
-			case 25:
+			case 25: {
 				NDR_CHECK(ndr_push_samr_UserInfo25(ndr, NDR_SCALARS, &r->info25));
-			break;
+			break; }
 
-			case 26:
+			case 26: {
 				NDR_CHECK(ndr_push_samr_UserInfo26(ndr, NDR_SCALARS, &r->info26));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -4255,25 +4255,25 @@ static enum ndr_err_code ndr_push_samr_DispInfo(struct ndr_push *ndr, int ndr_fl
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_samr_DispInfoGeneral(ndr, NDR_SCALARS, &r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_samr_DispInfoFull(ndr, NDR_SCALARS, &r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_samr_DispInfoFullGroups(ndr, NDR_SCALARS, &r->info3));
-			break;
+			break; }
 
-			case 4:
+			case 4: {
 				NDR_CHECK(ndr_push_samr_DispInfoAscii(ndr, NDR_SCALARS, &r->info4));
-			break;
+			break; }
 
-			case 5:
+			case 5: {
 				NDR_CHECK(ndr_push_samr_DispInfoAscii(ndr, NDR_SCALARS, &r->info5));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -4538,9 +4538,9 @@ static enum ndr_err_code ndr_push_samr_ConnectInfo(struct ndr_push *ndr, int ndr
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_samr_ConnectInfo1(ndr, NDR_SCALARS, &r->info1));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -4893,17 +4893,17 @@ static enum ndr_err_code ndr_push_samr_ValidatePasswordRep(struct ndr_push *ndr,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_samr_ValidatePasswordRepCtr(ndr, NDR_SCALARS, &r->ctr1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_samr_ValidatePasswordRepCtr(ndr, NDR_SCALARS, &r->ctr2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_samr_ValidatePasswordRepCtr(ndr, NDR_SCALARS, &r->ctr3));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -5146,17 +5146,17 @@ static enum ndr_err_code ndr_push_samr_ValidatePasswordReq(struct ndr_push *ndr,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_samr_ValidatePasswordReq1(ndr, NDR_SCALARS, &r->req1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_samr_ValidatePasswordReq2(ndr, NDR_SCALARS, &r->req2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_samr_ValidatePasswordReq3(ndr, NDR_SCALARS, &r->req3));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/ndr_security.c b/source3/librpc/gen_ndr/ndr_security.c
index a6ee1a5ddb..8ab56dd914 100644
--- a/source3/librpc/gen_ndr/ndr_security.c
+++ b/source3/librpc/gen_ndr/ndr_security.c
@@ -93,12 +93,12 @@ static enum ndr_err_code ndr_push_security_ace_object_type(struct ndr_push *ndr,
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
 		switch (level) {
-			case SEC_ACE_OBJECT_TYPE_PRESENT:
+			case SEC_ACE_OBJECT_TYPE_PRESENT: {
 				NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->type));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -165,12 +165,12 @@ static enum ndr_err_code ndr_push_security_ace_object_inherited_type(struct ndr_
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
 		switch (level) {
-			case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT:
+			case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT: {
 				NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->inherited_type));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -283,24 +283,24 @@ static enum ndr_err_code ndr_push_security_ace_object_ctr(struct ndr_push *ndr,
 	if (ndr_flags & NDR_SCALARS) {
 		int level = ndr_push_get_switch_value(ndr, r);
 		switch (level) {
-			case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+			case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT: {
 				NDR_CHECK(ndr_push_security_ace_object(ndr, NDR_SCALARS, &r->object));
-			break;
+			break; }
 
-			case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+			case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT: {
 				NDR_CHECK(ndr_push_security_ace_object(ndr, NDR_SCALARS, &r->object));
-			break;
+			break; }
 
-			case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+			case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT: {
 				NDR_CHECK(ndr_push_security_ace_object(ndr, NDR_SCALARS, &r->object));
-			break;
+			break; }
 
-			case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+			case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT: {
 				NDR_CHECK(ndr_push_security_ace_object(ndr, NDR_SCALARS, &r->object));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/source3/librpc/gen_ndr/ndr_srvsvc.c
index 2675ac2206..86d47a856c 100644
--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
@@ -344,16 +344,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetCharDevInfo(struct ndr_push *ndr, in
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -482,16 +482,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetCharDevCtr(struct ndr_push *ndr, int
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -956,16 +956,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetCharDevQInfo(struct ndr_push *ndr, i
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -1094,16 +1094,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetCharDevQCtr(struct ndr_push *ndr, in
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -1538,16 +1538,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetConnCtr(struct ndr_push *ndr, int nd
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -1976,16 +1976,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetFileInfo(struct ndr_push *ndr, int n
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info3));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -2114,16 +2114,16 @@ static enum ndr_err_code ndr_push_srvsvc_NetFileCtr(struct ndr_push *ndr, int nd
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr3));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -3260,28 +3260,28 @@ static enum ndr_err_code ndr_push_srvsvc_NetSessCtr(struct ndr_push *ndr, int nd
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr2));
-			break;
+			break; }
 
-			case 10:
+			case 10: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr10));
-			break;
+			break; }
 
-			case 502:
+			case 502: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr502));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -5263,48 +5263,48 @@ static enum ndr_err_code ndr_push_srvsvc_NetShareInfo(struct ndr_push *ndr, int
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info2));
-			break;
+			break; }
 
-			case 501:
+			case 501: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info501));
-			break;
+			break; }
 
-			case 502:
+			case 502: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info502));
-			break;
+			break; }
 
-			case 1004:
+			case 1004: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1004));
-			break;
+			break; }
 
-			case 1005:
+			case 1005: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1005));
-			break;
+			break; }
 
-			case 1006:
+			case 1006: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1006));
-			break;
+			break; }
 
-			case 1007:
+			case 1007: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1007));
-			break;
+			break; }
 
-			case 1501:
+			case 1501: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1501));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -5713,48 +5713,48 @@ static enum ndr_err_code ndr_push_srvsvc_NetShareCtr(struct ndr_push *ndr, int n
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr2));
-			break;
+			break; }
 
-			case 501:
+			case 501: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr501));
-			break;
+			break; }
 
-			case 502:
+			case 502: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr502));
-			break;
+			break; }
 
-			case 1004:
+			case 1004: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1004));
-			break;
+			break; }
 
-			case 1005:
+			case 1005: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1005));
-			break;
+			break; }
 
-			case 1006:
+			case 1006: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1006));
-			break;
+			break; }
 
-			case 1007:
+			case 1007: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1007));
-			break;
+			break; }
 
-			case 1501:
+			case 1501: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1501));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -9014,244 +9014,244 @@ static enum ndr_err_code ndr_push_srvsvc_NetSrvInfo(struct ndr_push *ndr, int nd
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 100:
+			case 100: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info100));
-			break;
+			break; }
 
-			case 101:
+			case 101: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info101));
-			break;
+			break; }
 
-			case 102:
+			case 102: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info102));
-			break;
+			break; }
 
-			case 402:
+			case 402: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info402));
-			break;
+			break; }
 
-			case 403:
+			case 403: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info403));
-			break;
+			break; }
 
-			case 502:
+			case 502: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info502));
-			break;
+			break; }
 
-			case 503:
+			case 503: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info503));
-			break;
+			break; }
 
-			case 599:
+			case 599: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info599));
-			break;
+			break; }
 
-			case 1005:
+			case 1005: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1005));
-			break;
+			break; }
 
-			case 1010:
+			case 1010: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1010));
-			break;
+			break; }
 
-			case 1016:
+			case 1016: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1016));
-			break;
+			break; }
 
-			case 1017:
+			case 1017: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1017));
-			break;
+			break; }
 
-			case 1018:
+			case 1018: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1018));
-			break;
+			break; }
 
-			case 1107:
+			case 1107: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1107));
-			break;
+			break; }
 
-			case 1501:
+			case 1501: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1501));
-			break;
+			break; }
 
-			case 1502:
+			case 1502: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1502));
-			break;
+			break; }
 
-			case 1503:
+			case 1503: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1503));
-			break;
+			break; }
 
-			case 1506:
+			case 1506: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1506));
-			break;
+			break; }
 
-			case 1509:
+			case 1509: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1509));
-			break;
+			break; }
 
-			case 1510:
+			case 1510: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1510));
-			break;
+			break; }
 
-			case 1511:
+			case 1511: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1511));
-			break;
+			break; }
 
-			case 1512:
+			case 1512: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1512));
-			break;
+			break; }
 
-			case 1513:
+			case 1513: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1513));
-			break;
+			break; }
 
-			case 1514:
+			case 1514: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1514));
-			break;
+			break; }
 
-			case 1515:
+			case 1515: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1515));
-			break;
+			break; }
 
-			case 1516:
+			case 1516: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1516));
-			break;
+			break; }
 
-			case 1518:
+			case 1518: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1518));
-			break;
+			break; }
 
-			case 1520:
+			case 1520: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1520));
-			break;
+			break; }
 
-			case 1521:
+			case 1521: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1521));
-			break;
+			break; }
 
-			case 1522:
+			case 1522: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1522));
-			break;
+			break; }
 
-			case 1523:
+			case 1523: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1523));
-			break;
+			break; }
 
-			case 1524:
+			case 1524: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1524));
-			break;
+			break; }
 
-			case 1525:
+			case 1525: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1525));
-			break;
+			break; }
 
-			case 1528:
+			case 1528: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1528));
-			break;
+			break; }
 
-			case 1529:
+			case 1529: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1529));
-			break;
+			break; }
 
-			case 1530:
+			case 1530: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1530));
-			break;
+			break; }
 
-			case 1533:
+			case 1533: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1533));
-			break;
+			break; }
 
-			case 1534:
+			case 1534: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1534));
-			break;
+			break; }
 
-			case 1535:
+			case 1535: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1535));
-			break;
+			break; }
 
-			case 1536:
+			case 1536: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1536));
-			break;
+			break; }
 
-			case 1537:
+			case 1537: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1537));
-			break;
+			break; }
 
-			case 1538:
+			case 1538: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1538));
-			break;
+			break; }
 
-			case 1539:
+			case 1539: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1539));
-			break;
+			break; }
 
-			case 1540:
+			case 1540: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1540));
-			break;
+			break; }
 
-			case 1541:
+			case 1541: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1541));
-			break;
+			break; }
 
-			case 1542:
+			case 1542: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1542));
-			break;
+			break; }
 
-			case 1543:
+			case 1543: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1543));
-			break;
+			break; }
 
-			case 1544:
+			case 1544: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1544));
-			break;
+			break; }
 
-			case 1545:
+			case 1545: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1545));
-			break;
+			break; }
 
-			case 1546:
+			case 1546: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1546));
-			break;
+			break; }
 
-			case 1547:
+			case 1547: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1547));
-			break;
+			break; }
 
-			case 1548:
+			case 1548: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1548));
-			break;
+			break; }
 
-			case 1549:
+			case 1549: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1549));
-			break;
+			break; }
 
-			case 1550:
+			case 1550: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1550));
-			break;
+			break; }
 
-			case 1552:
+			case 1552: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1552));
-			break;
+			break; }
 
-			case 1553:
+			case 1553: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1553));
-			break;
+			break; }
 
-			case 1554:
+			case 1554: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1554));
-			break;
+			break; }
 
-			case 1555:
+			case 1555: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1555));
-			break;
+			break; }
 
-			case 1556:
+			case 1556: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1556));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -12558,24 +12558,24 @@ static enum ndr_err_code ndr_push_srvsvc_NetTransportCtr(struct ndr_push *ndr, i
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr3));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -12837,21 +12837,21 @@ static enum ndr_err_code ndr_push_srvsvc_NetTransportInfo(struct ndr_push *ndr,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_srvsvc_NetTransportInfo0(ndr, NDR_SCALARS, &r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_srvsvc_NetTransportInfo1(ndr, NDR_SCALARS, &r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_srvsvc_NetTransportInfo2(ndr, NDR_SCALARS, &r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_srvsvc_NetTransportInfo3(ndr, NDR_SCALARS, &r->info3));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/ndr_wkssvc.c b/source3/librpc/gen_ndr/ndr_wkssvc.c
index e96a980705..096c0b2c72 100644
--- a/source3/librpc/gen_ndr/ndr_wkssvc.c
+++ b/source3/librpc/gen_ndr/ndr_wkssvc.c
@@ -1478,152 +1478,152 @@ static enum ndr_err_code ndr_push_wkssvc_NetWkstaInfo(struct ndr_push *ndr, int
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 100:
+			case 100: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info100));
-			break;
+			break; }
 
-			case 101:
+			case 101: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info101));
-			break;
+			break; }
 
-			case 102:
+			case 102: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info102));
-			break;
+			break; }
 
-			case 502:
+			case 502: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info502));
-			break;
+			break; }
 
-			case 1010:
+			case 1010: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1010));
-			break;
+			break; }
 
-			case 1011:
+			case 1011: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1011));
-			break;
+			break; }
 
-			case 1012:
+			case 1012: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1012));
-			break;
+			break; }
 
-			case 1013:
+			case 1013: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1013));
-			break;
+			break; }
 
-			case 1018:
+			case 1018: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1018));
-			break;
+			break; }
 
-			case 1023:
+			case 1023: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1023));
-			break;
+			break; }
 
-			case 1027:
+			case 1027: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1027));
-			break;
+			break; }
 
-			case 1028:
+			case 1028: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1028));
-			break;
+			break; }
 
-			case 1032:
+			case 1032: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1032));
-			break;
+			break; }
 
-			case 1033:
+			case 1033: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1033));
-			break;
+			break; }
 
-			case 1041:
+			case 1041: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1041));
-			break;
+			break; }
 
-			case 1042:
+			case 1042: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1042));
-			break;
+			break; }
 
-			case 1043:
+			case 1043: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1043));
-			break;
+			break; }
 
-			case 1044:
+			case 1044: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1044));
-			break;
+			break; }
 
-			case 1045:
+			case 1045: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1045));
-			break;
+			break; }
 
-			case 1046:
+			case 1046: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1046));
-			break;
+			break; }
 
-			case 1047:
+			case 1047: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1047));
-			break;
+			break; }
 
-			case 1048:
+			case 1048: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1048));
-			break;
+			break; }
 
-			case 1049:
+			case 1049: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1049));
-			break;
+			break; }
 
-			case 1050:
+			case 1050: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1050));
-			break;
+			break; }
 
-			case 1051:
+			case 1051: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1051));
-			break;
+			break; }
 
-			case 1052:
+			case 1052: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1052));
-			break;
+			break; }
 
-			case 1053:
+			case 1053: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1053));
-			break;
+			break; }
 
-			case 1054:
+			case 1054: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1054));
-			break;
+			break; }
 
-			case 1055:
+			case 1055: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1055));
-			break;
+			break; }
 
-			case 1056:
+			case 1056: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1056));
-			break;
+			break; }
 
-			case 1057:
+			case 1057: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1057));
-			break;
+			break; }
 
-			case 1058:
+			case 1058: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1058));
-			break;
+			break; }
 
-			case 1059:
+			case 1059: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1059));
-			break;
+			break; }
 
-			case 1060:
+			case 1060: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1060));
-			break;
+			break; }
 
-			case 1061:
+			case 1061: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1061));
-			break;
+			break; }
 
-			case 1062:
+			case 1062: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1062));
-			break;
+			break; }
 
-			default:
-			break;
+			default: {
+			break; }
 
 		}
 	}
@@ -3335,13 +3335,13 @@ static enum ndr_err_code ndr_push_wkssvc_NetWkstaEnumUsersCtr(struct ndr_push *n
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->user0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->user1));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -3566,17 +3566,17 @@ static enum ndr_err_code ndr_push_wkssvc_NetrWkstaUserInfo(struct ndr_push *ndr,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 1101:
+			case 1101: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1101));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -3927,9 +3927,9 @@ static enum ndr_err_code ndr_push_wkssvc_NetWkstaTransportCtr(struct ndr_push *n
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -4587,21 +4587,21 @@ static enum ndr_err_code ndr_push_wkssvc_NetrUseGetInfoCtr(struct ndr_push *ndr,
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info2));
-			break;
+			break; }
 
-			case 3:
+			case 3: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->info3));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
@@ -5059,17 +5059,17 @@ static enum ndr_err_code ndr_push_wkssvc_NetrUseEnumCtr(struct ndr_push *ndr, in
 		int level = ndr_push_get_switch_value(ndr, r);
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, level));
 		switch (level) {
-			case 0:
+			case 0: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr0));
-			break;
+			break; }
 
-			case 1:
+			case 1: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr1));
-			break;
+			break; }
 
-			case 2:
+			case 2: {
 				NDR_CHECK(ndr_push_unique_ptr(ndr, r->ctr2));
-			break;
+			break; }
 
 			default:
 				return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
diff --git a/source3/librpc/gen_ndr/srv_dfs.c b/source3/librpc/gen_ndr/srv_dfs.c
index ad6e0af059..1ecd687e3a 100644
--- a/source3/librpc/gen_ndr/srv_dfs.c
+++ b/source3/librpc/gen_ndr/srv_dfs.c
@@ -17,7 +17,7 @@ static bool api_dfs_GetManagerVersion(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_GETMANAGERVERSION];
 
-	r = talloc(NULL, struct dfs_GetManagerVersion);
+	r = talloc(talloc_tos(), struct dfs_GetManagerVersion);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_dfs_Add(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ADD];
 
-	r = talloc(NULL, struct dfs_Add);
+	r = talloc(talloc_tos(), struct dfs_Add);
 	if (r == NULL) {
 		return false;
 	}
@@ -170,7 +170,7 @@ static bool api_dfs_Remove(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVE];
 
-	r = talloc(NULL, struct dfs_Remove);
+	r = talloc(talloc_tos(), struct dfs_Remove);
 	if (r == NULL) {
 		return false;
 	}
@@ -243,7 +243,7 @@ static bool api_dfs_SetInfo(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_SETINFO];
 
-	r = talloc(NULL, struct dfs_SetInfo);
+	r = talloc(talloc_tos(), struct dfs_SetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -316,7 +316,7 @@ static bool api_dfs_GetInfo(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_GETINFO];
 
-	r = talloc(NULL, struct dfs_GetInfo);
+	r = talloc(talloc_tos(), struct dfs_GetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -396,7 +396,7 @@ static bool api_dfs_Enum(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ENUM];
 
-	r = talloc(NULL, struct dfs_Enum);
+	r = talloc(talloc_tos(), struct dfs_Enum);
 	if (r == NULL) {
 		return false;
 	}
@@ -472,7 +472,7 @@ static bool api_dfs_Rename(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_RENAME];
 
-	r = talloc(NULL, struct dfs_Rename);
+	r = talloc(talloc_tos(), struct dfs_Rename);
 	if (r == NULL) {
 		return false;
 	}
@@ -545,7 +545,7 @@ static bool api_dfs_Move(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_MOVE];
 
-	r = talloc(NULL, struct dfs_Move);
+	r = talloc(talloc_tos(), struct dfs_Move);
 	if (r == NULL) {
 		return false;
 	}
@@ -618,7 +618,7 @@ static bool api_dfs_ManagerGetConfigInfo(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_MANAGERGETCONFIGINFO];
 
-	r = talloc(NULL, struct dfs_ManagerGetConfigInfo);
+	r = talloc(talloc_tos(), struct dfs_ManagerGetConfigInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -691,7 +691,7 @@ static bool api_dfs_ManagerSendSiteInfo(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_MANAGERSENDSITEINFO];
 
-	r = talloc(NULL, struct dfs_ManagerSendSiteInfo);
+	r = talloc(talloc_tos(), struct dfs_ManagerSendSiteInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -764,7 +764,7 @@ static bool api_dfs_AddFtRoot(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ADDFTROOT];
 
-	r = talloc(NULL, struct dfs_AddFtRoot);
+	r = talloc(talloc_tos(), struct dfs_AddFtRoot);
 	if (r == NULL) {
 		return false;
 	}
@@ -839,7 +839,7 @@ static bool api_dfs_RemoveFtRoot(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVEFTROOT];
 
-	r = talloc(NULL, struct dfs_RemoveFtRoot);
+	r = talloc(talloc_tos(), struct dfs_RemoveFtRoot);
 	if (r == NULL) {
 		return false;
 	}
@@ -914,7 +914,7 @@ static bool api_dfs_AddStdRoot(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ADDSTDROOT];
 
-	r = talloc(NULL, struct dfs_AddStdRoot);
+	r = talloc(talloc_tos(), struct dfs_AddStdRoot);
 	if (r == NULL) {
 		return false;
 	}
@@ -987,7 +987,7 @@ static bool api_dfs_RemoveStdRoot(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVESTDROOT];
 
-	r = talloc(NULL, struct dfs_RemoveStdRoot);
+	r = talloc(talloc_tos(), struct dfs_RemoveStdRoot);
 	if (r == NULL) {
 		return false;
 	}
@@ -1060,7 +1060,7 @@ static bool api_dfs_ManagerInitialize(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_MANAGERINITIALIZE];
 
-	r = talloc(NULL, struct dfs_ManagerInitialize);
+	r = talloc(talloc_tos(), struct dfs_ManagerInitialize);
 	if (r == NULL) {
 		return false;
 	}
@@ -1133,7 +1133,7 @@ static bool api_dfs_AddStdRootForced(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ADDSTDROOTFORCED];
 
-	r = talloc(NULL, struct dfs_AddStdRootForced);
+	r = talloc(talloc_tos(), struct dfs_AddStdRootForced);
 	if (r == NULL) {
 		return false;
 	}
@@ -1206,7 +1206,7 @@ static bool api_dfs_GetDcAddress(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_GETDCADDRESS];
 
-	r = talloc(NULL, struct dfs_GetDcAddress);
+	r = talloc(talloc_tos(), struct dfs_GetDcAddress);
 	if (r == NULL) {
 		return false;
 	}
@@ -1283,7 +1283,7 @@ static bool api_dfs_SetDcAddress(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_SETDCADDRESS];
 
-	r = talloc(NULL, struct dfs_SetDcAddress);
+	r = talloc(talloc_tos(), struct dfs_SetDcAddress);
 	if (r == NULL) {
 		return false;
 	}
@@ -1356,7 +1356,7 @@ static bool api_dfs_FlushFtTable(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_FLUSHFTTABLE];
 
-	r = talloc(NULL, struct dfs_FlushFtTable);
+	r = talloc(talloc_tos(), struct dfs_FlushFtTable);
 	if (r == NULL) {
 		return false;
 	}
@@ -1429,7 +1429,7 @@ static bool api_dfs_Add2(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ADD2];
 
-	r = talloc(NULL, struct dfs_Add2);
+	r = talloc(talloc_tos(), struct dfs_Add2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1502,7 +1502,7 @@ static bool api_dfs_Remove2(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVE2];
 
-	r = talloc(NULL, struct dfs_Remove2);
+	r = talloc(talloc_tos(), struct dfs_Remove2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1575,7 +1575,7 @@ static bool api_dfs_EnumEx(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_ENUMEX];
 
-	r = talloc(NULL, struct dfs_EnumEx);
+	r = talloc(talloc_tos(), struct dfs_EnumEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -1651,7 +1651,7 @@ static bool api_dfs_SetInfo2(pipes_struct *p)
 
 	call = &ndr_table_netdfs.calls[NDR_DFS_SETINFO2];
 
-	r = talloc(NULL, struct dfs_SetInfo2);
+	r = talloc(talloc_tos(), struct dfs_SetInfo2);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_dssetup.c b/source3/librpc/gen_ndr/srv_dssetup.c
index 9043566718..7a1cae9b5a 100644
--- a/source3/librpc/gen_ndr/srv_dssetup.c
+++ b/source3/librpc/gen_ndr/srv_dssetup.c
@@ -17,7 +17,7 @@ static bool api_dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION];
 
-	r = talloc(NULL, struct dssetup_DsRoleGetPrimaryDomainInformation);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleGetPrimaryDomainInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_dssetup_DsRoleDnsNameToFlatName(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME];
 
-	r = talloc(NULL, struct dssetup_DsRoleDnsNameToFlatName);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleDnsNameToFlatName);
 	if (r == NULL) {
 		return false;
 	}
@@ -170,7 +170,7 @@ static bool api_dssetup_DsRoleDcAsDc(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDCASDC];
 
-	r = talloc(NULL, struct dssetup_DsRoleDcAsDc);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleDcAsDc);
 	if (r == NULL) {
 		return false;
 	}
@@ -243,7 +243,7 @@ static bool api_dssetup_DsRoleDcAsReplica(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDCASREPLICA];
 
-	r = talloc(NULL, struct dssetup_DsRoleDcAsReplica);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleDcAsReplica);
 	if (r == NULL) {
 		return false;
 	}
@@ -316,7 +316,7 @@ static bool api_dssetup_DsRoleDemoteDc(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDEMOTEDC];
 
-	r = talloc(NULL, struct dssetup_DsRoleDemoteDc);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleDemoteDc);
 	if (r == NULL) {
 		return false;
 	}
@@ -389,7 +389,7 @@ static bool api_dssetup_DsRoleGetDcOperationProgress(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS];
 
-	r = talloc(NULL, struct dssetup_DsRoleGetDcOperationProgress);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleGetDcOperationProgress);
 	if (r == NULL) {
 		return false;
 	}
@@ -462,7 +462,7 @@ static bool api_dssetup_DsRoleGetDcOperationResults(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS];
 
-	r = talloc(NULL, struct dssetup_DsRoleGetDcOperationResults);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleGetDcOperationResults);
 	if (r == NULL) {
 		return false;
 	}
@@ -535,7 +535,7 @@ static bool api_dssetup_DsRoleCancel(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLECANCEL];
 
-	r = talloc(NULL, struct dssetup_DsRoleCancel);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleCancel);
 	if (r == NULL) {
 		return false;
 	}
@@ -608,7 +608,7 @@ static bool api_dssetup_DsRoleServerSaveStateForUpgrade(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE];
 
-	r = talloc(NULL, struct dssetup_DsRoleServerSaveStateForUpgrade);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleServerSaveStateForUpgrade);
 	if (r == NULL) {
 		return false;
 	}
@@ -681,7 +681,7 @@ static bool api_dssetup_DsRoleUpgradeDownlevelServer(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER];
 
-	r = talloc(NULL, struct dssetup_DsRoleUpgradeDownlevelServer);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleUpgradeDownlevelServer);
 	if (r == NULL) {
 		return false;
 	}
@@ -754,7 +754,7 @@ static bool api_dssetup_DsRoleAbortDownlevelServerUpgrade(pipes_struct *p)
 
 	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE];
 
-	r = talloc(NULL, struct dssetup_DsRoleAbortDownlevelServerUpgrade);
+	r = talloc(talloc_tos(), struct dssetup_DsRoleAbortDownlevelServerUpgrade);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_echo.c b/source3/librpc/gen_ndr/srv_echo.c
index de5fc9cd46..3f725049cd 100644
--- a/source3/librpc/gen_ndr/srv_echo.c
+++ b/source3/librpc/gen_ndr/srv_echo.c
@@ -17,7 +17,7 @@ static bool api_echo_AddOne(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_ADDONE];
 
-	r = talloc(NULL, struct echo_AddOne);
+	r = talloc(talloc_tos(), struct echo_AddOne);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_echo_EchoData(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_ECHODATA];
 
-	r = talloc(NULL, struct echo_EchoData);
+	r = talloc(talloc_tos(), struct echo_EchoData);
 	if (r == NULL) {
 		return false;
 	}
@@ -177,7 +177,7 @@ static bool api_echo_SinkData(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_SINKDATA];
 
-	r = talloc(NULL, struct echo_SinkData);
+	r = talloc(talloc_tos(), struct echo_SinkData);
 	if (r == NULL) {
 		return false;
 	}
@@ -250,7 +250,7 @@ static bool api_echo_SourceData(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_SOURCEDATA];
 
-	r = talloc(NULL, struct echo_SourceData);
+	r = talloc(talloc_tos(), struct echo_SourceData);
 	if (r == NULL) {
 		return false;
 	}
@@ -330,7 +330,7 @@ static bool api_echo_TestCall(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL];
 
-	r = talloc(NULL, struct echo_TestCall);
+	r = talloc(talloc_tos(), struct echo_TestCall);
 	if (r == NULL) {
 		return false;
 	}
@@ -410,7 +410,7 @@ static bool api_echo_TestCall2(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL2];
 
-	r = talloc(NULL, struct echo_TestCall2);
+	r = talloc(talloc_tos(), struct echo_TestCall2);
 	if (r == NULL) {
 		return false;
 	}
@@ -490,7 +490,7 @@ static bool api_echo_TestSleep(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSLEEP];
 
-	r = talloc(NULL, struct echo_TestSleep);
+	r = talloc(talloc_tos(), struct echo_TestSleep);
 	if (r == NULL) {
 		return false;
 	}
@@ -563,7 +563,7 @@ static bool api_echo_TestEnum(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTENUM];
 
-	r = talloc(NULL, struct echo_TestEnum);
+	r = talloc(talloc_tos(), struct echo_TestEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -640,7 +640,7 @@ static bool api_echo_TestSurrounding(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSURROUNDING];
 
-	r = talloc(NULL, struct echo_TestSurrounding);
+	r = talloc(talloc_tos(), struct echo_TestSurrounding);
 	if (r == NULL) {
 		return false;
 	}
@@ -715,7 +715,7 @@ static bool api_echo_TestDoublePointer(pipes_struct *p)
 
 	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTDOUBLEPOINTER];
 
-	r = talloc(NULL, struct echo_TestDoublePointer);
+	r = talloc(talloc_tos(), struct echo_TestDoublePointer);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_epmapper.c b/source3/librpc/gen_ndr/srv_epmapper.c
index af768d9555..e6c89a553f 100644
--- a/source3/librpc/gen_ndr/srv_epmapper.c
+++ b/source3/librpc/gen_ndr/srv_epmapper.c
@@ -17,7 +17,7 @@ static bool api_epm_Insert(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_INSERT];
 
-	r = talloc(NULL, struct epm_Insert);
+	r = talloc(talloc_tos(), struct epm_Insert);
 	if (r == NULL) {
 		return false;
 	}
@@ -90,7 +90,7 @@ static bool api_epm_Delete(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_DELETE];
 
-	r = talloc(NULL, struct epm_Delete);
+	r = talloc(talloc_tos(), struct epm_Delete);
 	if (r == NULL) {
 		return false;
 	}
@@ -163,7 +163,7 @@ static bool api_epm_Lookup(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_LOOKUP];
 
-	r = talloc(NULL, struct epm_Lookup);
+	r = talloc(talloc_tos(), struct epm_Lookup);
 	if (r == NULL) {
 		return false;
 	}
@@ -250,7 +250,7 @@ static bool api_epm_Map(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_MAP];
 
-	r = talloc(NULL, struct epm_Map);
+	r = talloc(talloc_tos(), struct epm_Map);
 	if (r == NULL) {
 		return false;
 	}
@@ -337,7 +337,7 @@ static bool api_epm_LookupHandleFree(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_LOOKUPHANDLEFREE];
 
-	r = talloc(NULL, struct epm_LookupHandleFree);
+	r = talloc(talloc_tos(), struct epm_LookupHandleFree);
 	if (r == NULL) {
 		return false;
 	}
@@ -412,7 +412,7 @@ static bool api_epm_InqObject(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_INQOBJECT];
 
-	r = talloc(NULL, struct epm_InqObject);
+	r = talloc(talloc_tos(), struct epm_InqObject);
 	if (r == NULL) {
 		return false;
 	}
@@ -485,7 +485,7 @@ static bool api_epm_MgmtDelete(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_MGMTDELETE];
 
-	r = talloc(NULL, struct epm_MgmtDelete);
+	r = talloc(talloc_tos(), struct epm_MgmtDelete);
 	if (r == NULL) {
 		return false;
 	}
@@ -558,7 +558,7 @@ static bool api_epm_MapAuth(pipes_struct *p)
 
 	call = &ndr_table_epmapper.calls[NDR_EPM_MAPAUTH];
 
-	r = talloc(NULL, struct epm_MapAuth);
+	r = talloc(talloc_tos(), struct epm_MapAuth);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_eventlog.c b/source3/librpc/gen_ndr/srv_eventlog.c
index fc94993cee..4d0722bdd7 100644
--- a/source3/librpc/gen_ndr/srv_eventlog.c
+++ b/source3/librpc/gen_ndr/srv_eventlog.c
@@ -17,7 +17,7 @@ static bool api_eventlog_ClearEventLogW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CLEAREVENTLOGW];
 
-	r = talloc(NULL, struct eventlog_ClearEventLogW);
+	r = talloc(talloc_tos(), struct eventlog_ClearEventLogW);
 	if (r == NULL) {
 		return false;
 	}
@@ -90,7 +90,7 @@ static bool api_eventlog_BackupEventLogW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_BACKUPEVENTLOGW];
 
-	r = talloc(NULL, struct eventlog_BackupEventLogW);
+	r = talloc(talloc_tos(), struct eventlog_BackupEventLogW);
 	if (r == NULL) {
 		return false;
 	}
@@ -163,7 +163,7 @@ static bool api_eventlog_CloseEventLog(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CLOSEEVENTLOG];
 
-	r = talloc(NULL, struct eventlog_CloseEventLog);
+	r = talloc(talloc_tos(), struct eventlog_CloseEventLog);
 	if (r == NULL) {
 		return false;
 	}
@@ -238,7 +238,7 @@ static bool api_eventlog_DeregisterEventSource(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_DEREGISTEREVENTSOURCE];
 
-	r = talloc(NULL, struct eventlog_DeregisterEventSource);
+	r = talloc(talloc_tos(), struct eventlog_DeregisterEventSource);
 	if (r == NULL) {
 		return false;
 	}
@@ -311,7 +311,7 @@ static bool api_eventlog_GetNumRecords(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETNUMRECORDS];
 
-	r = talloc(NULL, struct eventlog_GetNumRecords);
+	r = talloc(talloc_tos(), struct eventlog_GetNumRecords);
 	if (r == NULL) {
 		return false;
 	}
@@ -391,7 +391,7 @@ static bool api_eventlog_GetOldestRecord(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETOLDESTRECORD];
 
-	r = talloc(NULL, struct eventlog_GetOldestRecord);
+	r = talloc(talloc_tos(), struct eventlog_GetOldestRecord);
 	if (r == NULL) {
 		return false;
 	}
@@ -471,7 +471,7 @@ static bool api_eventlog_ChangeNotify(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CHANGENOTIFY];
 
-	r = talloc(NULL, struct eventlog_ChangeNotify);
+	r = talloc(talloc_tos(), struct eventlog_ChangeNotify);
 	if (r == NULL) {
 		return false;
 	}
@@ -544,7 +544,7 @@ static bool api_eventlog_OpenEventLogW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENEVENTLOGW];
 
-	r = talloc(NULL, struct eventlog_OpenEventLogW);
+	r = talloc(talloc_tos(), struct eventlog_OpenEventLogW);
 	if (r == NULL) {
 		return false;
 	}
@@ -624,7 +624,7 @@ static bool api_eventlog_RegisterEventSourceW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REGISTEREVENTSOURCEW];
 
-	r = talloc(NULL, struct eventlog_RegisterEventSourceW);
+	r = talloc(talloc_tos(), struct eventlog_RegisterEventSourceW);
 	if (r == NULL) {
 		return false;
 	}
@@ -697,7 +697,7 @@ static bool api_eventlog_OpenBackupEventLogW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENBACKUPEVENTLOGW];
 
-	r = talloc(NULL, struct eventlog_OpenBackupEventLogW);
+	r = talloc(talloc_tos(), struct eventlog_OpenBackupEventLogW);
 	if (r == NULL) {
 		return false;
 	}
@@ -770,7 +770,7 @@ static bool api_eventlog_ReadEventLogW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_READEVENTLOGW];
 
-	r = talloc(NULL, struct eventlog_ReadEventLogW);
+	r = talloc(talloc_tos(), struct eventlog_ReadEventLogW);
 	if (r == NULL) {
 		return false;
 	}
@@ -862,7 +862,7 @@ static bool api_eventlog_ReportEventW(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REPORTEVENTW];
 
-	r = talloc(NULL, struct eventlog_ReportEventW);
+	r = talloc(talloc_tos(), struct eventlog_ReportEventW);
 	if (r == NULL) {
 		return false;
 	}
@@ -935,7 +935,7 @@ static bool api_eventlog_ClearEventLogA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CLEAREVENTLOGA];
 
-	r = talloc(NULL, struct eventlog_ClearEventLogA);
+	r = talloc(talloc_tos(), struct eventlog_ClearEventLogA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1008,7 +1008,7 @@ static bool api_eventlog_BackupEventLogA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_BACKUPEVENTLOGA];
 
-	r = talloc(NULL, struct eventlog_BackupEventLogA);
+	r = talloc(talloc_tos(), struct eventlog_BackupEventLogA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1081,7 +1081,7 @@ static bool api_eventlog_OpenEventLogA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENEVENTLOGA];
 
-	r = talloc(NULL, struct eventlog_OpenEventLogA);
+	r = talloc(talloc_tos(), struct eventlog_OpenEventLogA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1154,7 +1154,7 @@ static bool api_eventlog_RegisterEventSourceA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REGISTEREVENTSOURCEA];
 
-	r = talloc(NULL, struct eventlog_RegisterEventSourceA);
+	r = talloc(talloc_tos(), struct eventlog_RegisterEventSourceA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1227,7 +1227,7 @@ static bool api_eventlog_OpenBackupEventLogA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENBACKUPEVENTLOGA];
 
-	r = talloc(NULL, struct eventlog_OpenBackupEventLogA);
+	r = talloc(talloc_tos(), struct eventlog_OpenBackupEventLogA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1300,7 +1300,7 @@ static bool api_eventlog_ReadEventLogA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_READEVENTLOGA];
 
-	r = talloc(NULL, struct eventlog_ReadEventLogA);
+	r = talloc(talloc_tos(), struct eventlog_ReadEventLogA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1373,7 +1373,7 @@ static bool api_eventlog_ReportEventA(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REPORTEVENTA];
 
-	r = talloc(NULL, struct eventlog_ReportEventA);
+	r = talloc(talloc_tos(), struct eventlog_ReportEventA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1446,7 +1446,7 @@ static bool api_eventlog_RegisterClusterSvc(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REGISTERCLUSTERSVC];
 
-	r = talloc(NULL, struct eventlog_RegisterClusterSvc);
+	r = talloc(talloc_tos(), struct eventlog_RegisterClusterSvc);
 	if (r == NULL) {
 		return false;
 	}
@@ -1519,7 +1519,7 @@ static bool api_eventlog_DeregisterClusterSvc(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_DEREGISTERCLUSTERSVC];
 
-	r = talloc(NULL, struct eventlog_DeregisterClusterSvc);
+	r = talloc(talloc_tos(), struct eventlog_DeregisterClusterSvc);
 	if (r == NULL) {
 		return false;
 	}
@@ -1592,7 +1592,7 @@ static bool api_eventlog_WriteClusterEvents(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_WRITECLUSTEREVENTS];
 
-	r = talloc(NULL, struct eventlog_WriteClusterEvents);
+	r = talloc(talloc_tos(), struct eventlog_WriteClusterEvents);
 	if (r == NULL) {
 		return false;
 	}
@@ -1665,7 +1665,7 @@ static bool api_eventlog_GetLogIntormation(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETLOGINTORMATION];
 
-	r = talloc(NULL, struct eventlog_GetLogIntormation);
+	r = talloc(talloc_tos(), struct eventlog_GetLogIntormation);
 	if (r == NULL) {
 		return false;
 	}
@@ -1738,7 +1738,7 @@ static bool api_eventlog_FlushEventLog(pipes_struct *p)
 
 	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_FLUSHEVENTLOG];
 
-	r = talloc(NULL, struct eventlog_FlushEventLog);
+	r = talloc(talloc_tos(), struct eventlog_FlushEventLog);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_initshutdown.c b/source3/librpc/gen_ndr/srv_initshutdown.c
index 794adea81b..f24530c1c1 100644
--- a/source3/librpc/gen_ndr/srv_initshutdown.c
+++ b/source3/librpc/gen_ndr/srv_initshutdown.c
@@ -17,7 +17,7 @@ static bool api_initshutdown_Init(pipes_struct *p)
 
 	call = &ndr_table_initshutdown.calls[NDR_INITSHUTDOWN_INIT];
 
-	r = talloc(NULL, struct initshutdown_Init);
+	r = talloc(talloc_tos(), struct initshutdown_Init);
 	if (r == NULL) {
 		return false;
 	}
@@ -90,7 +90,7 @@ static bool api_initshutdown_Abort(pipes_struct *p)
 
 	call = &ndr_table_initshutdown.calls[NDR_INITSHUTDOWN_ABORT];
 
-	r = talloc(NULL, struct initshutdown_Abort);
+	r = talloc(talloc_tos(), struct initshutdown_Abort);
 	if (r == NULL) {
 		return false;
 	}
@@ -163,7 +163,7 @@ static bool api_initshutdown_InitEx(pipes_struct *p)
 
 	call = &ndr_table_initshutdown.calls[NDR_INITSHUTDOWN_INITEX];
 
-	r = talloc(NULL, struct initshutdown_InitEx);
+	r = talloc(talloc_tos(), struct initshutdown_InitEx);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_lsa.c b/source3/librpc/gen_ndr/srv_lsa.c
index d02bdb786b..50830ff545 100644
--- a/source3/librpc/gen_ndr/srv_lsa.c
+++ b/source3/librpc/gen_ndr/srv_lsa.c
@@ -17,7 +17,7 @@ static bool api_lsa_Close(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CLOSE];
 
-	r = talloc(NULL, struct lsa_Close);
+	r = talloc(talloc_tos(), struct lsa_Close);
 	if (r == NULL) {
 		return false;
 	}
@@ -92,7 +92,7 @@ static bool api_lsa_Delete(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_DELETE];
 
-	r = talloc(NULL, struct lsa_Delete);
+	r = talloc(talloc_tos(), struct lsa_Delete);
 	if (r == NULL) {
 		return false;
 	}
@@ -165,7 +165,7 @@ static bool api_lsa_EnumPrivs(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMPRIVS];
 
-	r = talloc(NULL, struct lsa_EnumPrivs);
+	r = talloc(talloc_tos(), struct lsa_EnumPrivs);
 	if (r == NULL) {
 		return false;
 	}
@@ -246,7 +246,7 @@ static bool api_lsa_QuerySecurity(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYSECURITY];
 
-	r = talloc(NULL, struct lsa_QuerySecurity);
+	r = talloc(talloc_tos(), struct lsa_QuerySecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -326,7 +326,7 @@ static bool api_lsa_SetSecObj(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETSECOBJ];
 
-	r = talloc(NULL, struct lsa_SetSecObj);
+	r = talloc(talloc_tos(), struct lsa_SetSecObj);
 	if (r == NULL) {
 		return false;
 	}
@@ -399,7 +399,7 @@ static bool api_lsa_ChangePassword(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CHANGEPASSWORD];
 
-	r = talloc(NULL, struct lsa_ChangePassword);
+	r = talloc(talloc_tos(), struct lsa_ChangePassword);
 	if (r == NULL) {
 		return false;
 	}
@@ -472,7 +472,7 @@ static bool api_lsa_OpenPolicy(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENPOLICY];
 
-	r = talloc(NULL, struct lsa_OpenPolicy);
+	r = talloc(talloc_tos(), struct lsa_OpenPolicy);
 	if (r == NULL) {
 		return false;
 	}
@@ -552,7 +552,7 @@ static bool api_lsa_QueryInfoPolicy(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYINFOPOLICY];
 
-	r = talloc(NULL, struct lsa_QueryInfoPolicy);
+	r = talloc(talloc_tos(), struct lsa_QueryInfoPolicy);
 	if (r == NULL) {
 		return false;
 	}
@@ -632,7 +632,7 @@ static bool api_lsa_SetInfoPolicy(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETINFOPOLICY];
 
-	r = talloc(NULL, struct lsa_SetInfoPolicy);
+	r = talloc(talloc_tos(), struct lsa_SetInfoPolicy);
 	if (r == NULL) {
 		return false;
 	}
@@ -705,7 +705,7 @@ static bool api_lsa_ClearAuditLog(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CLEARAUDITLOG];
 
-	r = talloc(NULL, struct lsa_ClearAuditLog);
+	r = talloc(talloc_tos(), struct lsa_ClearAuditLog);
 	if (r == NULL) {
 		return false;
 	}
@@ -778,7 +778,7 @@ static bool api_lsa_CreateAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATEACCOUNT];
 
-	r = talloc(NULL, struct lsa_CreateAccount);
+	r = talloc(talloc_tos(), struct lsa_CreateAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -858,7 +858,7 @@ static bool api_lsa_EnumAccounts(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMACCOUNTS];
 
-	r = talloc(NULL, struct lsa_EnumAccounts);
+	r = talloc(talloc_tos(), struct lsa_EnumAccounts);
 	if (r == NULL) {
 		return false;
 	}
@@ -939,7 +939,7 @@ static bool api_lsa_CreateTrustedDomain(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATETRUSTEDDOMAIN];
 
-	r = talloc(NULL, struct lsa_CreateTrustedDomain);
+	r = talloc(talloc_tos(), struct lsa_CreateTrustedDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -1019,7 +1019,7 @@ static bool api_lsa_EnumTrustDom(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMTRUSTDOM];
 
-	r = talloc(NULL, struct lsa_EnumTrustDom);
+	r = talloc(talloc_tos(), struct lsa_EnumTrustDom);
 	if (r == NULL) {
 		return false;
 	}
@@ -1100,7 +1100,7 @@ static bool api_lsa_LookupNames(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES];
 
-	r = talloc(NULL, struct lsa_LookupNames);
+	r = talloc(talloc_tos(), struct lsa_LookupNames);
 	if (r == NULL) {
 		return false;
 	}
@@ -1182,7 +1182,7 @@ static bool api_lsa_LookupSids(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPSIDS];
 
-	r = talloc(NULL, struct lsa_LookupSids);
+	r = talloc(talloc_tos(), struct lsa_LookupSids);
 	if (r == NULL) {
 		return false;
 	}
@@ -1264,7 +1264,7 @@ static bool api_lsa_CreateSecret(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATESECRET];
 
-	r = talloc(NULL, struct lsa_CreateSecret);
+	r = talloc(talloc_tos(), struct lsa_CreateSecret);
 	if (r == NULL) {
 		return false;
 	}
@@ -1344,7 +1344,7 @@ static bool api_lsa_OpenAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENACCOUNT];
 
-	r = talloc(NULL, struct lsa_OpenAccount);
+	r = talloc(talloc_tos(), struct lsa_OpenAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1424,7 +1424,7 @@ static bool api_lsa_EnumPrivsAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMPRIVSACCOUNT];
 
-	r = talloc(NULL, struct lsa_EnumPrivsAccount);
+	r = talloc(talloc_tos(), struct lsa_EnumPrivsAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1504,7 +1504,7 @@ static bool api_lsa_AddPrivilegesToAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ADDPRIVILEGESTOACCOUNT];
 
-	r = talloc(NULL, struct lsa_AddPrivilegesToAccount);
+	r = talloc(talloc_tos(), struct lsa_AddPrivilegesToAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1577,7 +1577,7 @@ static bool api_lsa_RemovePrivilegesFromAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT];
 
-	r = talloc(NULL, struct lsa_RemovePrivilegesFromAccount);
+	r = talloc(talloc_tos(), struct lsa_RemovePrivilegesFromAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1650,7 +1650,7 @@ static bool api_lsa_GetQuotasForAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_GETQUOTASFORACCOUNT];
 
-	r = talloc(NULL, struct lsa_GetQuotasForAccount);
+	r = talloc(talloc_tos(), struct lsa_GetQuotasForAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1723,7 +1723,7 @@ static bool api_lsa_SetQuotasForAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETQUOTASFORACCOUNT];
 
-	r = talloc(NULL, struct lsa_SetQuotasForAccount);
+	r = talloc(talloc_tos(), struct lsa_SetQuotasForAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1796,7 +1796,7 @@ static bool api_lsa_GetSystemAccessAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_GETSYSTEMACCESSACCOUNT];
 
-	r = talloc(NULL, struct lsa_GetSystemAccessAccount);
+	r = talloc(talloc_tos(), struct lsa_GetSystemAccessAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1876,7 +1876,7 @@ static bool api_lsa_SetSystemAccessAccount(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETSYSTEMACCESSACCOUNT];
 
-	r = talloc(NULL, struct lsa_SetSystemAccessAccount);
+	r = talloc(talloc_tos(), struct lsa_SetSystemAccessAccount);
 	if (r == NULL) {
 		return false;
 	}
@@ -1949,7 +1949,7 @@ static bool api_lsa_OpenTrustedDomain(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENTRUSTEDDOMAIN];
 
-	r = talloc(NULL, struct lsa_OpenTrustedDomain);
+	r = talloc(talloc_tos(), struct lsa_OpenTrustedDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -2029,7 +2029,7 @@ static bool api_lsa_QueryTrustedDomainInfo(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYTRUSTEDDOMAININFO];
 
-	r = talloc(NULL, struct lsa_QueryTrustedDomainInfo);
+	r = talloc(talloc_tos(), struct lsa_QueryTrustedDomainInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -2109,7 +2109,7 @@ static bool api_lsa_SetInformationTrustedDomain(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN];
 
-	r = talloc(NULL, struct lsa_SetInformationTrustedDomain);
+	r = talloc(talloc_tos(), struct lsa_SetInformationTrustedDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -2182,7 +2182,7 @@ static bool api_lsa_OpenSecret(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENSECRET];
 
-	r = talloc(NULL, struct lsa_OpenSecret);
+	r = talloc(talloc_tos(), struct lsa_OpenSecret);
 	if (r == NULL) {
 		return false;
 	}
@@ -2262,7 +2262,7 @@ static bool api_lsa_SetSecret(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETSECRET];
 
-	r = talloc(NULL, struct lsa_SetSecret);
+	r = talloc(talloc_tos(), struct lsa_SetSecret);
 	if (r == NULL) {
 		return false;
 	}
@@ -2335,7 +2335,7 @@ static bool api_lsa_QuerySecret(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYSECRET];
 
-	r = talloc(NULL, struct lsa_QuerySecret);
+	r = talloc(talloc_tos(), struct lsa_QuerySecret);
 	if (r == NULL) {
 		return false;
 	}
@@ -2413,7 +2413,7 @@ static bool api_lsa_LookupPrivValue(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPPRIVVALUE];
 
-	r = talloc(NULL, struct lsa_LookupPrivValue);
+	r = talloc(talloc_tos(), struct lsa_LookupPrivValue);
 	if (r == NULL) {
 		return false;
 	}
@@ -2493,7 +2493,7 @@ static bool api_lsa_LookupPrivName(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPPRIVNAME];
 
-	r = talloc(NULL, struct lsa_LookupPrivName);
+	r = talloc(talloc_tos(), struct lsa_LookupPrivName);
 	if (r == NULL) {
 		return false;
 	}
@@ -2573,7 +2573,7 @@ static bool api_lsa_LookupPrivDisplayName(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPPRIVDISPLAYNAME];
 
-	r = talloc(NULL, struct lsa_LookupPrivDisplayName);
+	r = talloc(talloc_tos(), struct lsa_LookupPrivDisplayName);
 	if (r == NULL) {
 		return false;
 	}
@@ -2654,7 +2654,7 @@ static bool api_lsa_DeleteObject(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_DELETEOBJECT];
 
-	r = talloc(NULL, struct lsa_DeleteObject);
+	r = talloc(talloc_tos(), struct lsa_DeleteObject);
 	if (r == NULL) {
 		return false;
 	}
@@ -2729,7 +2729,7 @@ static bool api_lsa_EnumAccountsWithUserRight(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT];
 
-	r = talloc(NULL, struct lsa_EnumAccountsWithUserRight);
+	r = talloc(talloc_tos(), struct lsa_EnumAccountsWithUserRight);
 	if (r == NULL) {
 		return false;
 	}
@@ -2809,7 +2809,7 @@ static bool api_lsa_EnumAccountRights(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMACCOUNTRIGHTS];
 
-	r = talloc(NULL, struct lsa_EnumAccountRights);
+	r = talloc(talloc_tos(), struct lsa_EnumAccountRights);
 	if (r == NULL) {
 		return false;
 	}
@@ -2889,7 +2889,7 @@ static bool api_lsa_AddAccountRights(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ADDACCOUNTRIGHTS];
 
-	r = talloc(NULL, struct lsa_AddAccountRights);
+	r = talloc(talloc_tos(), struct lsa_AddAccountRights);
 	if (r == NULL) {
 		return false;
 	}
@@ -2962,7 +2962,7 @@ static bool api_lsa_RemoveAccountRights(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_REMOVEACCOUNTRIGHTS];
 
-	r = talloc(NULL, struct lsa_RemoveAccountRights);
+	r = talloc(talloc_tos(), struct lsa_RemoveAccountRights);
 	if (r == NULL) {
 		return false;
 	}
@@ -3035,7 +3035,7 @@ static bool api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID];
 
-	r = talloc(NULL, struct lsa_QueryTrustedDomainInfoBySid);
+	r = talloc(talloc_tos(), struct lsa_QueryTrustedDomainInfoBySid);
 	if (r == NULL) {
 		return false;
 	}
@@ -3115,7 +3115,7 @@ static bool api_lsa_SetTrustedDomainInfo(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETTRUSTEDDOMAININFO];
 
-	r = talloc(NULL, struct lsa_SetTrustedDomainInfo);
+	r = talloc(talloc_tos(), struct lsa_SetTrustedDomainInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -3188,7 +3188,7 @@ static bool api_lsa_DeleteTrustedDomain(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_DELETETRUSTEDDOMAIN];
 
-	r = talloc(NULL, struct lsa_DeleteTrustedDomain);
+	r = talloc(talloc_tos(), struct lsa_DeleteTrustedDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -3261,7 +3261,7 @@ static bool api_lsa_StorePrivateData(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_STOREPRIVATEDATA];
 
-	r = talloc(NULL, struct lsa_StorePrivateData);
+	r = talloc(talloc_tos(), struct lsa_StorePrivateData);
 	if (r == NULL) {
 		return false;
 	}
@@ -3334,7 +3334,7 @@ static bool api_lsa_RetrievePrivateData(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_RETRIEVEPRIVATEDATA];
 
-	r = talloc(NULL, struct lsa_RetrievePrivateData);
+	r = talloc(talloc_tos(), struct lsa_RetrievePrivateData);
 	if (r == NULL) {
 		return false;
 	}
@@ -3407,7 +3407,7 @@ static bool api_lsa_OpenPolicy2(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENPOLICY2];
 
-	r = talloc(NULL, struct lsa_OpenPolicy2);
+	r = talloc(talloc_tos(), struct lsa_OpenPolicy2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3487,7 +3487,7 @@ static bool api_lsa_GetUserName(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_GETUSERNAME];
 
-	r = talloc(NULL, struct lsa_GetUserName);
+	r = talloc(talloc_tos(), struct lsa_GetUserName);
 	if (r == NULL) {
 		return false;
 	}
@@ -3563,7 +3563,7 @@ static bool api_lsa_QueryInfoPolicy2(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYINFOPOLICY2];
 
-	r = talloc(NULL, struct lsa_QueryInfoPolicy2);
+	r = talloc(talloc_tos(), struct lsa_QueryInfoPolicy2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3643,7 +3643,7 @@ static bool api_lsa_SetInfoPolicy2(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETINFOPOLICY2];
 
-	r = talloc(NULL, struct lsa_SetInfoPolicy2);
+	r = talloc(talloc_tos(), struct lsa_SetInfoPolicy2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3716,7 +3716,7 @@ static bool api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME];
 
-	r = talloc(NULL, struct lsa_QueryTrustedDomainInfoByName);
+	r = talloc(talloc_tos(), struct lsa_QueryTrustedDomainInfoByName);
 	if (r == NULL) {
 		return false;
 	}
@@ -3796,7 +3796,7 @@ static bool api_lsa_SetTrustedDomainInfoByName(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETTRUSTEDDOMAININFOBYNAME];
 
-	r = talloc(NULL, struct lsa_SetTrustedDomainInfoByName);
+	r = talloc(talloc_tos(), struct lsa_SetTrustedDomainInfoByName);
 	if (r == NULL) {
 		return false;
 	}
@@ -3869,7 +3869,7 @@ static bool api_lsa_EnumTrustedDomainsEx(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMTRUSTEDDOMAINSEX];
 
-	r = talloc(NULL, struct lsa_EnumTrustedDomainsEx);
+	r = talloc(talloc_tos(), struct lsa_EnumTrustedDomainsEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -3950,7 +3950,7 @@ static bool api_lsa_CreateTrustedDomainEx(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATETRUSTEDDOMAINEX];
 
-	r = talloc(NULL, struct lsa_CreateTrustedDomainEx);
+	r = talloc(talloc_tos(), struct lsa_CreateTrustedDomainEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -4023,7 +4023,7 @@ static bool api_lsa_CloseTrustedDomainEx(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CLOSETRUSTEDDOMAINEX];
 
-	r = talloc(NULL, struct lsa_CloseTrustedDomainEx);
+	r = talloc(talloc_tos(), struct lsa_CloseTrustedDomainEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -4098,7 +4098,7 @@ static bool api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYDOMAININFORMATIONPOLICY];
 
-	r = talloc(NULL, struct lsa_QueryDomainInformationPolicy);
+	r = talloc(talloc_tos(), struct lsa_QueryDomainInformationPolicy);
 	if (r == NULL) {
 		return false;
 	}
@@ -4178,7 +4178,7 @@ static bool api_lsa_SetDomainInformationPolicy(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_SETDOMAININFORMATIONPOLICY];
 
-	r = talloc(NULL, struct lsa_SetDomainInformationPolicy);
+	r = talloc(talloc_tos(), struct lsa_SetDomainInformationPolicy);
 	if (r == NULL) {
 		return false;
 	}
@@ -4251,7 +4251,7 @@ static bool api_lsa_OpenTrustedDomainByName(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENTRUSTEDDOMAINBYNAME];
 
-	r = talloc(NULL, struct lsa_OpenTrustedDomainByName);
+	r = talloc(talloc_tos(), struct lsa_OpenTrustedDomainByName);
 	if (r == NULL) {
 		return false;
 	}
@@ -4331,7 +4331,7 @@ static bool api_lsa_TestCall(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_TESTCALL];
 
-	r = talloc(NULL, struct lsa_TestCall);
+	r = talloc(talloc_tos(), struct lsa_TestCall);
 	if (r == NULL) {
 		return false;
 	}
@@ -4404,7 +4404,7 @@ static bool api_lsa_LookupSids2(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPSIDS2];
 
-	r = talloc(NULL, struct lsa_LookupSids2);
+	r = talloc(talloc_tos(), struct lsa_LookupSids2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4486,7 +4486,7 @@ static bool api_lsa_LookupNames2(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES2];
 
-	r = talloc(NULL, struct lsa_LookupNames2);
+	r = talloc(talloc_tos(), struct lsa_LookupNames2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4568,7 +4568,7 @@ static bool api_lsa_CreateTrustedDomainEx2(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATETRUSTEDDOMAINEX2];
 
-	r = talloc(NULL, struct lsa_CreateTrustedDomainEx2);
+	r = talloc(talloc_tos(), struct lsa_CreateTrustedDomainEx2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4641,7 +4641,7 @@ static bool api_lsa_CREDRWRITE(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRWRITE];
 
-	r = talloc(NULL, struct lsa_CREDRWRITE);
+	r = talloc(talloc_tos(), struct lsa_CREDRWRITE);
 	if (r == NULL) {
 		return false;
 	}
@@ -4714,7 +4714,7 @@ static bool api_lsa_CREDRREAD(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRREAD];
 
-	r = talloc(NULL, struct lsa_CREDRREAD);
+	r = talloc(talloc_tos(), struct lsa_CREDRREAD);
 	if (r == NULL) {
 		return false;
 	}
@@ -4787,7 +4787,7 @@ static bool api_lsa_CREDRENUMERATE(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRENUMERATE];
 
-	r = talloc(NULL, struct lsa_CREDRENUMERATE);
+	r = talloc(talloc_tos(), struct lsa_CREDRENUMERATE);
 	if (r == NULL) {
 		return false;
 	}
@@ -4860,7 +4860,7 @@ static bool api_lsa_CREDRWRITEDOMAINCREDENTIALS(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRWRITEDOMAINCREDENTIALS];
 
-	r = talloc(NULL, struct lsa_CREDRWRITEDOMAINCREDENTIALS);
+	r = talloc(talloc_tos(), struct lsa_CREDRWRITEDOMAINCREDENTIALS);
 	if (r == NULL) {
 		return false;
 	}
@@ -4933,7 +4933,7 @@ static bool api_lsa_CREDRREADDOMAINCREDENTIALS(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRREADDOMAINCREDENTIALS];
 
-	r = talloc(NULL, struct lsa_CREDRREADDOMAINCREDENTIALS);
+	r = talloc(talloc_tos(), struct lsa_CREDRREADDOMAINCREDENTIALS);
 	if (r == NULL) {
 		return false;
 	}
@@ -5006,7 +5006,7 @@ static bool api_lsa_CREDRDELETE(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRDELETE];
 
-	r = talloc(NULL, struct lsa_CREDRDELETE);
+	r = talloc(talloc_tos(), struct lsa_CREDRDELETE);
 	if (r == NULL) {
 		return false;
 	}
@@ -5079,7 +5079,7 @@ static bool api_lsa_CREDRGETTARGETINFO(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRGETTARGETINFO];
 
-	r = talloc(NULL, struct lsa_CREDRGETTARGETINFO);
+	r = talloc(talloc_tos(), struct lsa_CREDRGETTARGETINFO);
 	if (r == NULL) {
 		return false;
 	}
@@ -5152,7 +5152,7 @@ static bool api_lsa_CREDRPROFILELOADED(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRPROFILELOADED];
 
-	r = talloc(NULL, struct lsa_CREDRPROFILELOADED);
+	r = talloc(talloc_tos(), struct lsa_CREDRPROFILELOADED);
 	if (r == NULL) {
 		return false;
 	}
@@ -5225,7 +5225,7 @@ static bool api_lsa_LookupNames3(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES3];
 
-	r = talloc(NULL, struct lsa_LookupNames3);
+	r = talloc(talloc_tos(), struct lsa_LookupNames3);
 	if (r == NULL) {
 		return false;
 	}
@@ -5307,7 +5307,7 @@ static bool api_lsa_CREDRGETSESSIONTYPES(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRGETSESSIONTYPES];
 
-	r = talloc(NULL, struct lsa_CREDRGETSESSIONTYPES);
+	r = talloc(talloc_tos(), struct lsa_CREDRGETSESSIONTYPES);
 	if (r == NULL) {
 		return false;
 	}
@@ -5380,7 +5380,7 @@ static bool api_lsa_LSARREGISTERAUDITEVENT(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARREGISTERAUDITEVENT];
 
-	r = talloc(NULL, struct lsa_LSARREGISTERAUDITEVENT);
+	r = talloc(talloc_tos(), struct lsa_LSARREGISTERAUDITEVENT);
 	if (r == NULL) {
 		return false;
 	}
@@ -5453,7 +5453,7 @@ static bool api_lsa_LSARGENAUDITEVENT(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARGENAUDITEVENT];
 
-	r = talloc(NULL, struct lsa_LSARGENAUDITEVENT);
+	r = talloc(talloc_tos(), struct lsa_LSARGENAUDITEVENT);
 	if (r == NULL) {
 		return false;
 	}
@@ -5526,7 +5526,7 @@ static bool api_lsa_LSARUNREGISTERAUDITEVENT(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARUNREGISTERAUDITEVENT];
 
-	r = talloc(NULL, struct lsa_LSARUNREGISTERAUDITEVENT);
+	r = talloc(talloc_tos(), struct lsa_LSARUNREGISTERAUDITEVENT);
 	if (r == NULL) {
 		return false;
 	}
@@ -5599,7 +5599,7 @@ static bool api_lsa_lsaRQueryForestTrustInformation(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION];
 
-	r = talloc(NULL, struct lsa_lsaRQueryForestTrustInformation);
+	r = talloc(talloc_tos(), struct lsa_lsaRQueryForestTrustInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -5679,7 +5679,7 @@ static bool api_lsa_LSARSETFORESTTRUSTINFORMATION(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARSETFORESTTRUSTINFORMATION];
 
-	r = talloc(NULL, struct lsa_LSARSETFORESTTRUSTINFORMATION);
+	r = talloc(talloc_tos(), struct lsa_LSARSETFORESTTRUSTINFORMATION);
 	if (r == NULL) {
 		return false;
 	}
@@ -5752,7 +5752,7 @@ static bool api_lsa_CREDRRENAME(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRRENAME];
 
-	r = talloc(NULL, struct lsa_CREDRRENAME);
+	r = talloc(talloc_tos(), struct lsa_CREDRRENAME);
 	if (r == NULL) {
 		return false;
 	}
@@ -5825,7 +5825,7 @@ static bool api_lsa_LookupSids3(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPSIDS3];
 
-	r = talloc(NULL, struct lsa_LookupSids3);
+	r = talloc(talloc_tos(), struct lsa_LookupSids3);
 	if (r == NULL) {
 		return false;
 	}
@@ -5907,7 +5907,7 @@ static bool api_lsa_LookupNames4(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES4];
 
-	r = talloc(NULL, struct lsa_LookupNames4);
+	r = talloc(talloc_tos(), struct lsa_LookupNames4);
 	if (r == NULL) {
 		return false;
 	}
@@ -5989,7 +5989,7 @@ static bool api_lsa_LSAROPENPOLICYSCE(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSAROPENPOLICYSCE];
 
-	r = talloc(NULL, struct lsa_LSAROPENPOLICYSCE);
+	r = talloc(talloc_tos(), struct lsa_LSAROPENPOLICYSCE);
 	if (r == NULL) {
 		return false;
 	}
@@ -6062,7 +6062,7 @@ static bool api_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE];
 
-	r = talloc(NULL, struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE);
+	r = talloc(talloc_tos(), struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE);
 	if (r == NULL) {
 		return false;
 	}
@@ -6135,7 +6135,7 @@ static bool api_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE];
 
-	r = talloc(NULL, struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE);
+	r = talloc(talloc_tos(), struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE);
 	if (r == NULL) {
 		return false;
 	}
@@ -6208,7 +6208,7 @@ static bool api_lsa_LSARADTREPORTSECURITYEVENT(pipes_struct *p)
 
 	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARADTREPORTSECURITYEVENT];
 
-	r = talloc(NULL, struct lsa_LSARADTREPORTSECURITYEVENT);
+	r = talloc(talloc_tos(), struct lsa_LSARADTREPORTSECURITYEVENT);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_netlogon.c b/source3/librpc/gen_ndr/srv_netlogon.c
index 673f9503df..808493463a 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.c
+++ b/source3/librpc/gen_ndr/srv_netlogon.c
@@ -17,7 +17,7 @@ static bool api_netr_LogonUasLogon(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONUASLOGON];
 
-	r = talloc(NULL, struct netr_LogonUasLogon);
+	r = talloc(talloc_tos(), struct netr_LogonUasLogon);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_netr_LogonUasLogoff(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONUASLOGOFF];
 
-	r = talloc(NULL, struct netr_LogonUasLogoff);
+	r = talloc(talloc_tos(), struct netr_LogonUasLogoff);
 	if (r == NULL) {
 		return false;
 	}
@@ -177,7 +177,7 @@ static bool api_netr_LogonSamLogon(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGON];
 
-	r = talloc(NULL, struct netr_LogonSamLogon);
+	r = talloc(talloc_tos(), struct netr_LogonSamLogon);
 	if (r == NULL) {
 		return false;
 	}
@@ -264,7 +264,7 @@ static bool api_netr_LogonSamLogoff(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGOFF];
 
-	r = talloc(NULL, struct netr_LogonSamLogoff);
+	r = talloc(talloc_tos(), struct netr_LogonSamLogoff);
 	if (r == NULL) {
 		return false;
 	}
@@ -339,7 +339,7 @@ static bool api_netr_ServerReqChallenge(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERREQCHALLENGE];
 
-	r = talloc(NULL, struct netr_ServerReqChallenge);
+	r = talloc(talloc_tos(), struct netr_ServerReqChallenge);
 	if (r == NULL) {
 		return false;
 	}
@@ -414,7 +414,7 @@ static bool api_netr_ServerAuthenticate(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERAUTHENTICATE];
 
-	r = talloc(NULL, struct netr_ServerAuthenticate);
+	r = talloc(talloc_tos(), struct netr_ServerAuthenticate);
 	if (r == NULL) {
 		return false;
 	}
@@ -489,7 +489,7 @@ static bool api_netr_ServerPasswordSet(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERPASSWORDSET];
 
-	r = talloc(NULL, struct netr_ServerPasswordSet);
+	r = talloc(talloc_tos(), struct netr_ServerPasswordSet);
 	if (r == NULL) {
 		return false;
 	}
@@ -569,7 +569,7 @@ static bool api_netr_DatabaseDeltas(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASEDELTAS];
 
-	r = talloc(NULL, struct netr_DatabaseDeltas);
+	r = talloc(talloc_tos(), struct netr_DatabaseDeltas);
 	if (r == NULL) {
 		return false;
 	}
@@ -651,7 +651,7 @@ static bool api_netr_DatabaseSync(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASESYNC];
 
-	r = talloc(NULL, struct netr_DatabaseSync);
+	r = talloc(talloc_tos(), struct netr_DatabaseSync);
 	if (r == NULL) {
 		return false;
 	}
@@ -733,7 +733,7 @@ static bool api_netr_AccountDeltas(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_ACCOUNTDELTAS];
 
-	r = talloc(NULL, struct netr_AccountDeltas);
+	r = talloc(talloc_tos(), struct netr_AccountDeltas);
 	if (r == NULL) {
 		return false;
 	}
@@ -832,7 +832,7 @@ static bool api_netr_AccountSync(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_ACCOUNTSYNC];
 
-	r = talloc(NULL, struct netr_AccountSync);
+	r = talloc(talloc_tos(), struct netr_AccountSync);
 	if (r == NULL) {
 		return false;
 	}
@@ -932,7 +932,7 @@ static bool api_netr_GetDcName(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_GETDCNAME];
 
-	r = talloc(NULL, struct netr_GetDcName);
+	r = talloc(talloc_tos(), struct netr_GetDcName);
 	if (r == NULL) {
 		return false;
 	}
@@ -1012,7 +1012,7 @@ static bool api_netr_LogonControl(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONCONTROL];
 
-	r = talloc(NULL, struct netr_LogonControl);
+	r = talloc(talloc_tos(), struct netr_LogonControl);
 	if (r == NULL) {
 		return false;
 	}
@@ -1092,7 +1092,7 @@ static bool api_netr_GetAnyDCName(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_GETANYDCNAME];
 
-	r = talloc(NULL, struct netr_GetAnyDCName);
+	r = talloc(talloc_tos(), struct netr_GetAnyDCName);
 	if (r == NULL) {
 		return false;
 	}
@@ -1172,7 +1172,7 @@ static bool api_netr_LogonControl2(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONCONTROL2];
 
-	r = talloc(NULL, struct netr_LogonControl2);
+	r = talloc(talloc_tos(), struct netr_LogonControl2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1252,7 +1252,7 @@ static bool api_netr_ServerAuthenticate2(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERAUTHENTICATE2];
 
-	r = talloc(NULL, struct netr_ServerAuthenticate2);
+	r = talloc(talloc_tos(), struct netr_ServerAuthenticate2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1328,7 +1328,7 @@ static bool api_netr_DatabaseSync2(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASESYNC2];
 
-	r = talloc(NULL, struct netr_DatabaseSync2);
+	r = talloc(talloc_tos(), struct netr_DatabaseSync2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1410,7 +1410,7 @@ static bool api_netr_DatabaseRedo(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASEREDO];
 
-	r = talloc(NULL, struct netr_DatabaseRedo);
+	r = talloc(talloc_tos(), struct netr_DatabaseRedo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1491,7 +1491,7 @@ static bool api_netr_LogonControl2Ex(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONCONTROL2EX];
 
-	r = talloc(NULL, struct netr_LogonControl2Ex);
+	r = talloc(talloc_tos(), struct netr_LogonControl2Ex);
 	if (r == NULL) {
 		return false;
 	}
@@ -1571,7 +1571,7 @@ static bool api_netr_NetrEnumerateTrustedDomains(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRENUMERATETRUSTEDDOMAINS];
 
-	r = talloc(NULL, struct netr_NetrEnumerateTrustedDomains);
+	r = talloc(talloc_tos(), struct netr_NetrEnumerateTrustedDomains);
 	if (r == NULL) {
 		return false;
 	}
@@ -1651,7 +1651,7 @@ static bool api_netr_DsRGetDCName(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCNAME];
 
-	r = talloc(NULL, struct netr_DsRGetDCName);
+	r = talloc(talloc_tos(), struct netr_DsRGetDCName);
 	if (r == NULL) {
 		return false;
 	}
@@ -1731,7 +1731,7 @@ static bool api_netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONDUMMYROUTINE1];
 
-	r = talloc(NULL, struct netr_NETRLOGONDUMMYROUTINE1);
+	r = talloc(talloc_tos(), struct netr_NETRLOGONDUMMYROUTINE1);
 	if (r == NULL) {
 		return false;
 	}
@@ -1804,7 +1804,7 @@ static bool api_netr_NETRLOGONSETSERVICEBITS(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONSETSERVICEBITS];
 
-	r = talloc(NULL, struct netr_NETRLOGONSETSERVICEBITS);
+	r = talloc(talloc_tos(), struct netr_NETRLOGONSETSERVICEBITS);
 	if (r == NULL) {
 		return false;
 	}
@@ -1877,7 +1877,7 @@ static bool api_netr_LogonGetTrustRid(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONGETTRUSTRID];
 
-	r = talloc(NULL, struct netr_LogonGetTrustRid);
+	r = talloc(talloc_tos(), struct netr_LogonGetTrustRid);
 	if (r == NULL) {
 		return false;
 	}
@@ -1957,7 +1957,7 @@ static bool api_netr_NETRLOGONCOMPUTESERVERDIGEST(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST];
 
-	r = talloc(NULL, struct netr_NETRLOGONCOMPUTESERVERDIGEST);
+	r = talloc(talloc_tos(), struct netr_NETRLOGONCOMPUTESERVERDIGEST);
 	if (r == NULL) {
 		return false;
 	}
@@ -2030,7 +2030,7 @@ static bool api_netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST];
 
-	r = talloc(NULL, struct netr_NETRLOGONCOMPUTECLIENTDIGEST);
+	r = talloc(talloc_tos(), struct netr_NETRLOGONCOMPUTECLIENTDIGEST);
 	if (r == NULL) {
 		return false;
 	}
@@ -2103,7 +2103,7 @@ static bool api_netr_ServerAuthenticate3(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERAUTHENTICATE3];
 
-	r = talloc(NULL, struct netr_ServerAuthenticate3);
+	r = talloc(talloc_tos(), struct netr_ServerAuthenticate3);
 	if (r == NULL) {
 		return false;
 	}
@@ -2185,7 +2185,7 @@ static bool api_netr_DsRGetDCNameEx(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCNAMEEX];
 
-	r = talloc(NULL, struct netr_DsRGetDCNameEx);
+	r = talloc(talloc_tos(), struct netr_DsRGetDCNameEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -2265,7 +2265,7 @@ static bool api_netr_DsRGetSiteName(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETSITENAME];
 
-	r = talloc(NULL, struct netr_DsRGetSiteName);
+	r = talloc(talloc_tos(), struct netr_DsRGetSiteName);
 	if (r == NULL) {
 		return false;
 	}
@@ -2345,7 +2345,7 @@ static bool api_netr_LogonGetDomainInfo(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONGETDOMAININFO];
 
-	r = talloc(NULL, struct netr_LogonGetDomainInfo);
+	r = talloc(talloc_tos(), struct netr_LogonGetDomainInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -2426,7 +2426,7 @@ static bool api_netr_ServerPasswordSet2(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERPASSWORDSET2];
 
-	r = talloc(NULL, struct netr_ServerPasswordSet2);
+	r = talloc(talloc_tos(), struct netr_ServerPasswordSet2);
 	if (r == NULL) {
 		return false;
 	}
@@ -2506,7 +2506,7 @@ static bool api_netr_ServerPasswordGet(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERPASSWORDGET];
 
-	r = talloc(NULL, struct netr_ServerPasswordGet);
+	r = talloc(talloc_tos(), struct netr_ServerPasswordGet);
 	if (r == NULL) {
 		return false;
 	}
@@ -2592,7 +2592,7 @@ static bool api_netr_NETRLOGONSENDTOSAM(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONSENDTOSAM];
 
-	r = talloc(NULL, struct netr_NETRLOGONSENDTOSAM);
+	r = talloc(talloc_tos(), struct netr_NETRLOGONSENDTOSAM);
 	if (r == NULL) {
 		return false;
 	}
@@ -2665,7 +2665,7 @@ static bool api_netr_DsRAddressToSitenamesW(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRADDRESSTOSITENAMESW];
 
-	r = talloc(NULL, struct netr_DsRAddressToSitenamesW);
+	r = talloc(talloc_tos(), struct netr_DsRAddressToSitenamesW);
 	if (r == NULL) {
 		return false;
 	}
@@ -2745,7 +2745,7 @@ static bool api_netr_DsRGetDCNameEx2(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCNAMEEX2];
 
-	r = talloc(NULL, struct netr_DsRGetDCNameEx2);
+	r = talloc(talloc_tos(), struct netr_DsRGetDCNameEx2);
 	if (r == NULL) {
 		return false;
 	}
@@ -2825,7 +2825,7 @@ static bool api_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN];
 
-	r = talloc(NULL, struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN);
+	r = talloc(talloc_tos(), struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN);
 	if (r == NULL) {
 		return false;
 	}
@@ -2898,7 +2898,7 @@ static bool api_netr_NetrEnumerateTrustedDomainsEx(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX];
 
-	r = talloc(NULL, struct netr_NetrEnumerateTrustedDomainsEx);
+	r = talloc(talloc_tos(), struct netr_NetrEnumerateTrustedDomainsEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -2978,7 +2978,7 @@ static bool api_netr_DsRAddressToSitenamesExW(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRADDRESSTOSITENAMESEXW];
 
-	r = talloc(NULL, struct netr_DsRAddressToSitenamesExW);
+	r = talloc(talloc_tos(), struct netr_DsRAddressToSitenamesExW);
 	if (r == NULL) {
 		return false;
 	}
@@ -3058,7 +3058,7 @@ static bool api_netr_DsrGetDcSiteCoverageW(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCSITECOVERAGEW];
 
-	r = talloc(NULL, struct netr_DsrGetDcSiteCoverageW);
+	r = talloc(talloc_tos(), struct netr_DsrGetDcSiteCoverageW);
 	if (r == NULL) {
 		return false;
 	}
@@ -3138,7 +3138,7 @@ static bool api_netr_LogonSamLogonEx(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGONEX];
 
-	r = talloc(NULL, struct netr_LogonSamLogonEx);
+	r = talloc(talloc_tos(), struct netr_LogonSamLogonEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -3225,7 +3225,7 @@ static bool api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRENUMERATEDOMAINTRUSTS];
 
-	r = talloc(NULL, struct netr_DsrEnumerateDomainTrusts);
+	r = talloc(talloc_tos(), struct netr_DsrEnumerateDomainTrusts);
 	if (r == NULL) {
 		return false;
 	}
@@ -3305,7 +3305,7 @@ static bool api_netr_DsrDeregisterDNSHostRecords(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS];
 
-	r = talloc(NULL, struct netr_DsrDeregisterDNSHostRecords);
+	r = talloc(talloc_tos(), struct netr_DsrDeregisterDNSHostRecords);
 	if (r == NULL) {
 		return false;
 	}
@@ -3378,7 +3378,7 @@ static bool api_netr_ServerTrustPasswordsGet(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERTRUSTPASSWORDSGET];
 
-	r = talloc(NULL, struct netr_ServerTrustPasswordsGet);
+	r = talloc(talloc_tos(), struct netr_ServerTrustPasswordsGet);
 	if (r == NULL) {
 		return false;
 	}
@@ -3470,7 +3470,7 @@ static bool api_netr_DsRGetForestTrustInformation(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETFORESTTRUSTINFORMATION];
 
-	r = talloc(NULL, struct netr_DsRGetForestTrustInformation);
+	r = talloc(talloc_tos(), struct netr_DsRGetForestTrustInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -3550,7 +3550,7 @@ static bool api_netr_GetForestTrustInformation(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_GETFORESTTRUSTINFORMATION];
 
-	r = talloc(NULL, struct netr_GetForestTrustInformation);
+	r = talloc(talloc_tos(), struct netr_GetForestTrustInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -3636,7 +3636,7 @@ static bool api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGONWITHFLAGS];
 
-	r = talloc(NULL, struct netr_LogonSamLogonWithFlags);
+	r = talloc(talloc_tos(), struct netr_LogonSamLogonWithFlags);
 	if (r == NULL) {
 		return false;
 	}
@@ -3724,7 +3724,7 @@ static bool api_netr_NETRSERVERGETTRUSTINFO(pipes_struct *p)
 
 	call = &ndr_table_netlogon.calls[NDR_NETR_NETRSERVERGETTRUSTINFO];
 
-	r = talloc(NULL, struct netr_NETRSERVERGETTRUSTINFO);
+	r = talloc(talloc_tos(), struct netr_NETRSERVERGETTRUSTINFO);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_samr.c b/source3/librpc/gen_ndr/srv_samr.c
index 3312964178..47a51ed410 100644
--- a/source3/librpc/gen_ndr/srv_samr.c
+++ b/source3/librpc/gen_ndr/srv_samr.c
@@ -17,7 +17,7 @@ static bool api_samr_Connect(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT];
 
-	r = talloc(NULL, struct samr_Connect);
+	r = talloc(talloc_tos(), struct samr_Connect);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_samr_Close(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CLOSE];
 
-	r = talloc(NULL, struct samr_Close);
+	r = talloc(talloc_tos(), struct samr_Close);
 	if (r == NULL) {
 		return false;
 	}
@@ -172,7 +172,7 @@ static bool api_samr_SetSecurity(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETSECURITY];
 
-	r = talloc(NULL, struct samr_SetSecurity);
+	r = talloc(talloc_tos(), struct samr_SetSecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -245,7 +245,7 @@ static bool api_samr_QuerySecurity(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYSECURITY];
 
-	r = talloc(NULL, struct samr_QuerySecurity);
+	r = talloc(talloc_tos(), struct samr_QuerySecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -325,7 +325,7 @@ static bool api_samr_Shutdown(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SHUTDOWN];
 
-	r = talloc(NULL, struct samr_Shutdown);
+	r = talloc(talloc_tos(), struct samr_Shutdown);
 	if (r == NULL) {
 		return false;
 	}
@@ -398,7 +398,7 @@ static bool api_samr_LookupDomain(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_LOOKUPDOMAIN];
 
-	r = talloc(NULL, struct samr_LookupDomain);
+	r = talloc(talloc_tos(), struct samr_LookupDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -478,7 +478,7 @@ static bool api_samr_EnumDomains(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINS];
 
-	r = talloc(NULL, struct samr_EnumDomains);
+	r = talloc(talloc_tos(), struct samr_EnumDomains);
 	if (r == NULL) {
 		return false;
 	}
@@ -565,7 +565,7 @@ static bool api_samr_OpenDomain(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_OPENDOMAIN];
 
-	r = talloc(NULL, struct samr_OpenDomain);
+	r = talloc(talloc_tos(), struct samr_OpenDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -645,7 +645,7 @@ static bool api_samr_QueryDomainInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDOMAININFO];
 
-	r = talloc(NULL, struct samr_QueryDomainInfo);
+	r = talloc(talloc_tos(), struct samr_QueryDomainInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -725,7 +725,7 @@ static bool api_samr_SetDomainInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETDOMAININFO];
 
-	r = talloc(NULL, struct samr_SetDomainInfo);
+	r = talloc(talloc_tos(), struct samr_SetDomainInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -798,7 +798,7 @@ static bool api_samr_CreateDomainGroup(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CREATEDOMAINGROUP];
 
-	r = talloc(NULL, struct samr_CreateDomainGroup);
+	r = talloc(talloc_tos(), struct samr_CreateDomainGroup);
 	if (r == NULL) {
 		return false;
 	}
@@ -884,7 +884,7 @@ static bool api_samr_EnumDomainGroups(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINGROUPS];
 
-	r = talloc(NULL, struct samr_EnumDomainGroups);
+	r = talloc(talloc_tos(), struct samr_EnumDomainGroups);
 	if (r == NULL) {
 		return false;
 	}
@@ -971,7 +971,7 @@ static bool api_samr_CreateUser(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CREATEUSER];
 
-	r = talloc(NULL, struct samr_CreateUser);
+	r = talloc(talloc_tos(), struct samr_CreateUser);
 	if (r == NULL) {
 		return false;
 	}
@@ -1057,7 +1057,7 @@ static bool api_samr_EnumDomainUsers(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINUSERS];
 
-	r = talloc(NULL, struct samr_EnumDomainUsers);
+	r = talloc(talloc_tos(), struct samr_EnumDomainUsers);
 	if (r == NULL) {
 		return false;
 	}
@@ -1144,7 +1144,7 @@ static bool api_samr_CreateDomAlias(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CREATEDOMALIAS];
 
-	r = talloc(NULL, struct samr_CreateDomAlias);
+	r = talloc(talloc_tos(), struct samr_CreateDomAlias);
 	if (r == NULL) {
 		return false;
 	}
@@ -1230,7 +1230,7 @@ static bool api_samr_EnumDomainAliases(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINALIASES];
 
-	r = talloc(NULL, struct samr_EnumDomainAliases);
+	r = talloc(talloc_tos(), struct samr_EnumDomainAliases);
 	if (r == NULL) {
 		return false;
 	}
@@ -1317,7 +1317,7 @@ static bool api_samr_GetAliasMembership(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETALIASMEMBERSHIP];
 
-	r = talloc(NULL, struct samr_GetAliasMembership);
+	r = talloc(talloc_tos(), struct samr_GetAliasMembership);
 	if (r == NULL) {
 		return false;
 	}
@@ -1397,7 +1397,7 @@ static bool api_samr_LookupNames(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_LOOKUPNAMES];
 
-	r = talloc(NULL, struct samr_LookupNames);
+	r = talloc(talloc_tos(), struct samr_LookupNames);
 	if (r == NULL) {
 		return false;
 	}
@@ -1483,7 +1483,7 @@ static bool api_samr_LookupRids(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_LOOKUPRIDS];
 
-	r = talloc(NULL, struct samr_LookupRids);
+	r = talloc(talloc_tos(), struct samr_LookupRids);
 	if (r == NULL) {
 		return false;
 	}
@@ -1569,7 +1569,7 @@ static bool api_samr_OpenGroup(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_OPENGROUP];
 
-	r = talloc(NULL, struct samr_OpenGroup);
+	r = talloc(talloc_tos(), struct samr_OpenGroup);
 	if (r == NULL) {
 		return false;
 	}
@@ -1649,7 +1649,7 @@ static bool api_samr_QueryGroupInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYGROUPINFO];
 
-	r = talloc(NULL, struct samr_QueryGroupInfo);
+	r = talloc(talloc_tos(), struct samr_QueryGroupInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1729,7 +1729,7 @@ static bool api_samr_SetGroupInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETGROUPINFO];
 
-	r = talloc(NULL, struct samr_SetGroupInfo);
+	r = talloc(talloc_tos(), struct samr_SetGroupInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1802,7 +1802,7 @@ static bool api_samr_AddGroupMember(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ADDGROUPMEMBER];
 
-	r = talloc(NULL, struct samr_AddGroupMember);
+	r = talloc(talloc_tos(), struct samr_AddGroupMember);
 	if (r == NULL) {
 		return false;
 	}
@@ -1875,7 +1875,7 @@ static bool api_samr_DeleteDomainGroup(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_DELETEDOMAINGROUP];
 
-	r = talloc(NULL, struct samr_DeleteDomainGroup);
+	r = talloc(talloc_tos(), struct samr_DeleteDomainGroup);
 	if (r == NULL) {
 		return false;
 	}
@@ -1950,7 +1950,7 @@ static bool api_samr_DeleteGroupMember(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_DELETEGROUPMEMBER];
 
-	r = talloc(NULL, struct samr_DeleteGroupMember);
+	r = talloc(talloc_tos(), struct samr_DeleteGroupMember);
 	if (r == NULL) {
 		return false;
 	}
@@ -2023,7 +2023,7 @@ static bool api_samr_QueryGroupMember(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYGROUPMEMBER];
 
-	r = talloc(NULL, struct samr_QueryGroupMember);
+	r = talloc(talloc_tos(), struct samr_QueryGroupMember);
 	if (r == NULL) {
 		return false;
 	}
@@ -2103,7 +2103,7 @@ static bool api_samr_SetMemberAttributesOfGroup(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP];
 
-	r = talloc(NULL, struct samr_SetMemberAttributesOfGroup);
+	r = talloc(talloc_tos(), struct samr_SetMemberAttributesOfGroup);
 	if (r == NULL) {
 		return false;
 	}
@@ -2176,7 +2176,7 @@ static bool api_samr_OpenAlias(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_OPENALIAS];
 
-	r = talloc(NULL, struct samr_OpenAlias);
+	r = talloc(talloc_tos(), struct samr_OpenAlias);
 	if (r == NULL) {
 		return false;
 	}
@@ -2256,7 +2256,7 @@ static bool api_samr_QueryAliasInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYALIASINFO];
 
-	r = talloc(NULL, struct samr_QueryAliasInfo);
+	r = talloc(talloc_tos(), struct samr_QueryAliasInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -2336,7 +2336,7 @@ static bool api_samr_SetAliasInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETALIASINFO];
 
-	r = talloc(NULL, struct samr_SetAliasInfo);
+	r = talloc(talloc_tos(), struct samr_SetAliasInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -2409,7 +2409,7 @@ static bool api_samr_DeleteDomAlias(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_DELETEDOMALIAS];
 
-	r = talloc(NULL, struct samr_DeleteDomAlias);
+	r = talloc(talloc_tos(), struct samr_DeleteDomAlias);
 	if (r == NULL) {
 		return false;
 	}
@@ -2484,7 +2484,7 @@ static bool api_samr_AddAliasMember(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ADDALIASMEMBER];
 
-	r = talloc(NULL, struct samr_AddAliasMember);
+	r = talloc(talloc_tos(), struct samr_AddAliasMember);
 	if (r == NULL) {
 		return false;
 	}
@@ -2557,7 +2557,7 @@ static bool api_samr_DeleteAliasMember(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_DELETEALIASMEMBER];
 
-	r = talloc(NULL, struct samr_DeleteAliasMember);
+	r = talloc(talloc_tos(), struct samr_DeleteAliasMember);
 	if (r == NULL) {
 		return false;
 	}
@@ -2630,7 +2630,7 @@ static bool api_samr_GetMembersInAlias(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETMEMBERSINALIAS];
 
-	r = talloc(NULL, struct samr_GetMembersInAlias);
+	r = talloc(talloc_tos(), struct samr_GetMembersInAlias);
 	if (r == NULL) {
 		return false;
 	}
@@ -2710,7 +2710,7 @@ static bool api_samr_OpenUser(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_OPENUSER];
 
-	r = talloc(NULL, struct samr_OpenUser);
+	r = talloc(talloc_tos(), struct samr_OpenUser);
 	if (r == NULL) {
 		return false;
 	}
@@ -2790,7 +2790,7 @@ static bool api_samr_DeleteUser(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_DELETEUSER];
 
-	r = talloc(NULL, struct samr_DeleteUser);
+	r = talloc(talloc_tos(), struct samr_DeleteUser);
 	if (r == NULL) {
 		return false;
 	}
@@ -2865,7 +2865,7 @@ static bool api_samr_QueryUserInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYUSERINFO];
 
-	r = talloc(NULL, struct samr_QueryUserInfo);
+	r = talloc(talloc_tos(), struct samr_QueryUserInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -2945,7 +2945,7 @@ static bool api_samr_SetUserInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETUSERINFO];
 
-	r = talloc(NULL, struct samr_SetUserInfo);
+	r = talloc(talloc_tos(), struct samr_SetUserInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -3018,7 +3018,7 @@ static bool api_samr_ChangePasswordUser(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CHANGEPASSWORDUSER];
 
-	r = talloc(NULL, struct samr_ChangePasswordUser);
+	r = talloc(talloc_tos(), struct samr_ChangePasswordUser);
 	if (r == NULL) {
 		return false;
 	}
@@ -3091,7 +3091,7 @@ static bool api_samr_GetGroupsForUser(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETGROUPSFORUSER];
 
-	r = talloc(NULL, struct samr_GetGroupsForUser);
+	r = talloc(talloc_tos(), struct samr_GetGroupsForUser);
 	if (r == NULL) {
 		return false;
 	}
@@ -3171,7 +3171,7 @@ static bool api_samr_QueryDisplayInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDISPLAYINFO];
 
-	r = talloc(NULL, struct samr_QueryDisplayInfo);
+	r = talloc(talloc_tos(), struct samr_QueryDisplayInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -3263,7 +3263,7 @@ static bool api_samr_GetDisplayEnumerationIndex(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETDISPLAYENUMERATIONINDEX];
 
-	r = talloc(NULL, struct samr_GetDisplayEnumerationIndex);
+	r = talloc(talloc_tos(), struct samr_GetDisplayEnumerationIndex);
 	if (r == NULL) {
 		return false;
 	}
@@ -3343,7 +3343,7 @@ static bool api_samr_TestPrivateFunctionsDomain(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN];
 
-	r = talloc(NULL, struct samr_TestPrivateFunctionsDomain);
+	r = talloc(talloc_tos(), struct samr_TestPrivateFunctionsDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -3416,7 +3416,7 @@ static bool api_samr_TestPrivateFunctionsUser(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_TESTPRIVATEFUNCTIONSUSER];
 
-	r = talloc(NULL, struct samr_TestPrivateFunctionsUser);
+	r = talloc(talloc_tos(), struct samr_TestPrivateFunctionsUser);
 	if (r == NULL) {
 		return false;
 	}
@@ -3489,7 +3489,7 @@ static bool api_samr_GetUserPwInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETUSERPWINFO];
 
-	r = talloc(NULL, struct samr_GetUserPwInfo);
+	r = talloc(talloc_tos(), struct samr_GetUserPwInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -3569,7 +3569,7 @@ static bool api_samr_RemoveMemberFromForeignDomain(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN];
 
-	r = talloc(NULL, struct samr_RemoveMemberFromForeignDomain);
+	r = talloc(talloc_tos(), struct samr_RemoveMemberFromForeignDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -3642,7 +3642,7 @@ static bool api_samr_QueryDomainInfo2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDOMAININFO2];
 
-	r = talloc(NULL, struct samr_QueryDomainInfo2);
+	r = talloc(talloc_tos(), struct samr_QueryDomainInfo2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3722,7 +3722,7 @@ static bool api_samr_QueryUserInfo2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYUSERINFO2];
 
-	r = talloc(NULL, struct samr_QueryUserInfo2);
+	r = talloc(talloc_tos(), struct samr_QueryUserInfo2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3802,7 +3802,7 @@ static bool api_samr_QueryDisplayInfo2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDISPLAYINFO2];
 
-	r = talloc(NULL, struct samr_QueryDisplayInfo2);
+	r = talloc(talloc_tos(), struct samr_QueryDisplayInfo2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3894,7 +3894,7 @@ static bool api_samr_GetDisplayEnumerationIndex2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETDISPLAYENUMERATIONINDEX2];
 
-	r = talloc(NULL, struct samr_GetDisplayEnumerationIndex2);
+	r = talloc(talloc_tos(), struct samr_GetDisplayEnumerationIndex2);
 	if (r == NULL) {
 		return false;
 	}
@@ -3974,7 +3974,7 @@ static bool api_samr_CreateUser2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CREATEUSER2];
 
-	r = talloc(NULL, struct samr_CreateUser2);
+	r = talloc(talloc_tos(), struct samr_CreateUser2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4066,7 +4066,7 @@ static bool api_samr_QueryDisplayInfo3(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDISPLAYINFO3];
 
-	r = talloc(NULL, struct samr_QueryDisplayInfo3);
+	r = talloc(talloc_tos(), struct samr_QueryDisplayInfo3);
 	if (r == NULL) {
 		return false;
 	}
@@ -4158,7 +4158,7 @@ static bool api_samr_AddMultipleMembersToAlias(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS];
 
-	r = talloc(NULL, struct samr_AddMultipleMembersToAlias);
+	r = talloc(talloc_tos(), struct samr_AddMultipleMembersToAlias);
 	if (r == NULL) {
 		return false;
 	}
@@ -4231,7 +4231,7 @@ static bool api_samr_RemoveMultipleMembersFromAlias(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS];
 
-	r = talloc(NULL, struct samr_RemoveMultipleMembersFromAlias);
+	r = talloc(talloc_tos(), struct samr_RemoveMultipleMembersFromAlias);
 	if (r == NULL) {
 		return false;
 	}
@@ -4304,7 +4304,7 @@ static bool api_samr_OemChangePasswordUser2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_OEMCHANGEPASSWORDUSER2];
 
-	r = talloc(NULL, struct samr_OemChangePasswordUser2);
+	r = talloc(talloc_tos(), struct samr_OemChangePasswordUser2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4377,7 +4377,7 @@ static bool api_samr_ChangePasswordUser2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CHANGEPASSWORDUSER2];
 
-	r = talloc(NULL, struct samr_ChangePasswordUser2);
+	r = talloc(talloc_tos(), struct samr_ChangePasswordUser2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4450,7 +4450,7 @@ static bool api_samr_GetDomPwInfo(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETDOMPWINFO];
 
-	r = talloc(NULL, struct samr_GetDomPwInfo);
+	r = talloc(talloc_tos(), struct samr_GetDomPwInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -4530,7 +4530,7 @@ static bool api_samr_Connect2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT2];
 
-	r = talloc(NULL, struct samr_Connect2);
+	r = talloc(talloc_tos(), struct samr_Connect2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4610,7 +4610,7 @@ static bool api_samr_SetUserInfo2(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETUSERINFO2];
 
-	r = talloc(NULL, struct samr_SetUserInfo2);
+	r = talloc(talloc_tos(), struct samr_SetUserInfo2);
 	if (r == NULL) {
 		return false;
 	}
@@ -4683,7 +4683,7 @@ static bool api_samr_SetBootKeyInformation(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETBOOTKEYINFORMATION];
 
-	r = talloc(NULL, struct samr_SetBootKeyInformation);
+	r = talloc(talloc_tos(), struct samr_SetBootKeyInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -4756,7 +4756,7 @@ static bool api_samr_GetBootKeyInformation(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_GETBOOTKEYINFORMATION];
 
-	r = talloc(NULL, struct samr_GetBootKeyInformation);
+	r = talloc(talloc_tos(), struct samr_GetBootKeyInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -4836,7 +4836,7 @@ static bool api_samr_Connect3(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT3];
 
-	r = talloc(NULL, struct samr_Connect3);
+	r = talloc(talloc_tos(), struct samr_Connect3);
 	if (r == NULL) {
 		return false;
 	}
@@ -4916,7 +4916,7 @@ static bool api_samr_Connect4(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT4];
 
-	r = talloc(NULL, struct samr_Connect4);
+	r = talloc(talloc_tos(), struct samr_Connect4);
 	if (r == NULL) {
 		return false;
 	}
@@ -4996,7 +4996,7 @@ static bool api_samr_ChangePasswordUser3(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CHANGEPASSWORDUSER3];
 
-	r = talloc(NULL, struct samr_ChangePasswordUser3);
+	r = talloc(talloc_tos(), struct samr_ChangePasswordUser3);
 	if (r == NULL) {
 		return false;
 	}
@@ -5082,7 +5082,7 @@ static bool api_samr_Connect5(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT5];
 
-	r = talloc(NULL, struct samr_Connect5);
+	r = talloc(talloc_tos(), struct samr_Connect5);
 	if (r == NULL) {
 		return false;
 	}
@@ -5174,7 +5174,7 @@ static bool api_samr_RidToSid(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_RIDTOSID];
 
-	r = talloc(NULL, struct samr_RidToSid);
+	r = talloc(talloc_tos(), struct samr_RidToSid);
 	if (r == NULL) {
 		return false;
 	}
@@ -5254,7 +5254,7 @@ static bool api_samr_SetDsrmPassword(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_SETDSRMPASSWORD];
 
-	r = talloc(NULL, struct samr_SetDsrmPassword);
+	r = talloc(talloc_tos(), struct samr_SetDsrmPassword);
 	if (r == NULL) {
 		return false;
 	}
@@ -5327,7 +5327,7 @@ static bool api_samr_ValidatePassword(pipes_struct *p)
 
 	call = &ndr_table_samr.calls[NDR_SAMR_VALIDATEPASSWORD];
 
-	r = talloc(NULL, struct samr_ValidatePassword);
+	r = talloc(talloc_tos(), struct samr_ValidatePassword);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_srvsvc.c b/source3/librpc/gen_ndr/srv_srvsvc.c
index 44fe358a84..afd458765e 100644
--- a/source3/librpc/gen_ndr/srv_srvsvc.c
+++ b/source3/librpc/gen_ndr/srv_srvsvc.c
@@ -17,7 +17,7 @@ static bool api_srvsvc_NetCharDevEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVENUM];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -100,7 +100,7 @@ static bool api_srvsvc_NetCharDevGetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVGETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevGetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -180,7 +180,7 @@ static bool api_srvsvc_NetCharDevControl(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVCONTROL];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevControl);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevControl);
 	if (r == NULL) {
 		return false;
 	}
@@ -253,7 +253,7 @@ static bool api_srvsvc_NetCharDevQEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQENUM];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevQEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -336,7 +336,7 @@ static bool api_srvsvc_NetCharDevQGetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQGETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevQGetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -416,7 +416,7 @@ static bool api_srvsvc_NetCharDevQSetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQSETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevQSetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQSetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -491,7 +491,7 @@ static bool api_srvsvc_NetCharDevQPurge(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQPURGE];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevQPurge);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQPurge);
 	if (r == NULL) {
 		return false;
 	}
@@ -564,7 +564,7 @@ static bool api_srvsvc_NetCharDevQPurgeSelf(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQPURGESELF];
 
-	r = talloc(NULL, struct srvsvc_NetCharDevQPurgeSelf);
+	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQPurgeSelf);
 	if (r == NULL) {
 		return false;
 	}
@@ -637,7 +637,7 @@ static bool api_srvsvc_NetConnEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCONNENUM];
 
-	r = talloc(NULL, struct srvsvc_NetConnEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetConnEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -720,7 +720,7 @@ static bool api_srvsvc_NetFileEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETFILEENUM];
 
-	r = talloc(NULL, struct srvsvc_NetFileEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetFileEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -803,7 +803,7 @@ static bool api_srvsvc_NetFileGetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETFILEGETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetFileGetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetFileGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -883,7 +883,7 @@ static bool api_srvsvc_NetFileClose(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETFILECLOSE];
 
-	r = talloc(NULL, struct srvsvc_NetFileClose);
+	r = talloc(talloc_tos(), struct srvsvc_NetFileClose);
 	if (r == NULL) {
 		return false;
 	}
@@ -956,7 +956,7 @@ static bool api_srvsvc_NetSessEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSESSENUM];
 
-	r = talloc(NULL, struct srvsvc_NetSessEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetSessEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -1039,7 +1039,7 @@ static bool api_srvsvc_NetSessDel(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSESSDEL];
 
-	r = talloc(NULL, struct srvsvc_NetSessDel);
+	r = talloc(talloc_tos(), struct srvsvc_NetSessDel);
 	if (r == NULL) {
 		return false;
 	}
@@ -1112,7 +1112,7 @@ static bool api_srvsvc_NetShareAdd(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREADD];
 
-	r = talloc(NULL, struct srvsvc_NetShareAdd);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareAdd);
 	if (r == NULL) {
 		return false;
 	}
@@ -1187,7 +1187,7 @@ static bool api_srvsvc_NetShareEnumAll(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREENUMALL];
 
-	r = talloc(NULL, struct srvsvc_NetShareEnumAll);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareEnumAll);
 	if (r == NULL) {
 		return false;
 	}
@@ -1270,7 +1270,7 @@ static bool api_srvsvc_NetShareGetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREGETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetShareGetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1350,7 +1350,7 @@ static bool api_srvsvc_NetShareSetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHARESETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetShareSetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareSetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1425,7 +1425,7 @@ static bool api_srvsvc_NetShareDel(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDEL];
 
-	r = talloc(NULL, struct srvsvc_NetShareDel);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareDel);
 	if (r == NULL) {
 		return false;
 	}
@@ -1498,7 +1498,7 @@ static bool api_srvsvc_NetShareDelSticky(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDELSTICKY];
 
-	r = talloc(NULL, struct srvsvc_NetShareDelSticky);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareDelSticky);
 	if (r == NULL) {
 		return false;
 	}
@@ -1571,7 +1571,7 @@ static bool api_srvsvc_NetShareCheck(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHARECHECK];
 
-	r = talloc(NULL, struct srvsvc_NetShareCheck);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareCheck);
 	if (r == NULL) {
 		return false;
 	}
@@ -1651,7 +1651,7 @@ static bool api_srvsvc_NetSrvGetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSRVGETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetSrvGetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetSrvGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1731,7 +1731,7 @@ static bool api_srvsvc_NetSrvSetInfo(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSRVSETINFO];
 
-	r = talloc(NULL, struct srvsvc_NetSrvSetInfo);
+	r = talloc(talloc_tos(), struct srvsvc_NetSrvSetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -1806,7 +1806,7 @@ static bool api_srvsvc_NetDiskEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETDISKENUM];
 
-	r = talloc(NULL, struct srvsvc_NetDiskEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetDiskEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -1888,7 +1888,7 @@ static bool api_srvsvc_NetServerStatisticsGet(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSERVERSTATISTICSGET];
 
-	r = talloc(NULL, struct srvsvc_NetServerStatisticsGet);
+	r = talloc(talloc_tos(), struct srvsvc_NetServerStatisticsGet);
 	if (r == NULL) {
 		return false;
 	}
@@ -1968,7 +1968,7 @@ static bool api_srvsvc_NetTransportAdd(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETTRANSPORTADD];
 
-	r = talloc(NULL, struct srvsvc_NetTransportAdd);
+	r = talloc(talloc_tos(), struct srvsvc_NetTransportAdd);
 	if (r == NULL) {
 		return false;
 	}
@@ -2041,7 +2041,7 @@ static bool api_srvsvc_NetTransportEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETTRANSPORTENUM];
 
-	r = talloc(NULL, struct srvsvc_NetTransportEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetTransportEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -2124,7 +2124,7 @@ static bool api_srvsvc_NetTransportDel(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETTRANSPORTDEL];
 
-	r = talloc(NULL, struct srvsvc_NetTransportDel);
+	r = talloc(talloc_tos(), struct srvsvc_NetTransportDel);
 	if (r == NULL) {
 		return false;
 	}
@@ -2197,7 +2197,7 @@ static bool api_srvsvc_NetRemoteTOD(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETREMOTETOD];
 
-	r = talloc(NULL, struct srvsvc_NetRemoteTOD);
+	r = talloc(talloc_tos(), struct srvsvc_NetRemoteTOD);
 	if (r == NULL) {
 		return false;
 	}
@@ -2277,7 +2277,7 @@ static bool api_srvsvc_NetSetServiceBits(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSETSERVICEBITS];
 
-	r = talloc(NULL, struct srvsvc_NetSetServiceBits);
+	r = talloc(talloc_tos(), struct srvsvc_NetSetServiceBits);
 	if (r == NULL) {
 		return false;
 	}
@@ -2350,7 +2350,7 @@ static bool api_srvsvc_NetPathType(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPATHTYPE];
 
-	r = talloc(NULL, struct srvsvc_NetPathType);
+	r = talloc(talloc_tos(), struct srvsvc_NetPathType);
 	if (r == NULL) {
 		return false;
 	}
@@ -2430,7 +2430,7 @@ static bool api_srvsvc_NetPathCanonicalize(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPATHCANONICALIZE];
 
-	r = talloc(NULL, struct srvsvc_NetPathCanonicalize);
+	r = talloc(talloc_tos(), struct srvsvc_NetPathCanonicalize);
 	if (r == NULL) {
 		return false;
 	}
@@ -2511,7 +2511,7 @@ static bool api_srvsvc_NetPathCompare(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPATHCOMPARE];
 
-	r = talloc(NULL, struct srvsvc_NetPathCompare);
+	r = talloc(talloc_tos(), struct srvsvc_NetPathCompare);
 	if (r == NULL) {
 		return false;
 	}
@@ -2584,7 +2584,7 @@ static bool api_srvsvc_NetNameValidate(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETNAMEVALIDATE];
 
-	r = talloc(NULL, struct srvsvc_NetNameValidate);
+	r = talloc(talloc_tos(), struct srvsvc_NetNameValidate);
 	if (r == NULL) {
 		return false;
 	}
@@ -2657,7 +2657,7 @@ static bool api_srvsvc_NETRPRNAMECANONICALIZE(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRPRNAMECANONICALIZE];
 
-	r = talloc(NULL, struct srvsvc_NETRPRNAMECANONICALIZE);
+	r = talloc(talloc_tos(), struct srvsvc_NETRPRNAMECANONICALIZE);
 	if (r == NULL) {
 		return false;
 	}
@@ -2730,7 +2730,7 @@ static bool api_srvsvc_NetPRNameCompare(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPRNAMECOMPARE];
 
-	r = talloc(NULL, struct srvsvc_NetPRNameCompare);
+	r = talloc(talloc_tos(), struct srvsvc_NetPRNameCompare);
 	if (r == NULL) {
 		return false;
 	}
@@ -2803,7 +2803,7 @@ static bool api_srvsvc_NetShareEnum(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREENUM];
 
-	r = talloc(NULL, struct srvsvc_NetShareEnum);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -2886,7 +2886,7 @@ static bool api_srvsvc_NetShareDelStart(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDELSTART];
 
-	r = talloc(NULL, struct srvsvc_NetShareDelStart);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareDelStart);
 	if (r == NULL) {
 		return false;
 	}
@@ -2966,7 +2966,7 @@ static bool api_srvsvc_NetShareDelCommit(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDELCOMMIT];
 
-	r = talloc(NULL, struct srvsvc_NetShareDelCommit);
+	r = talloc(talloc_tos(), struct srvsvc_NetShareDelCommit);
 	if (r == NULL) {
 		return false;
 	}
@@ -3041,7 +3041,7 @@ static bool api_srvsvc_NetGetFileSecurity(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETGETFILESECURITY];
 
-	r = talloc(NULL, struct srvsvc_NetGetFileSecurity);
+	r = talloc(talloc_tos(), struct srvsvc_NetGetFileSecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -3121,7 +3121,7 @@ static bool api_srvsvc_NetSetFileSecurity(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSETFILESECURITY];
 
-	r = talloc(NULL, struct srvsvc_NetSetFileSecurity);
+	r = talloc(talloc_tos(), struct srvsvc_NetSetFileSecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -3194,7 +3194,7 @@ static bool api_srvsvc_NetServerTransportAddEx(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSERVERTRANSPORTADDEX];
 
-	r = talloc(NULL, struct srvsvc_NetServerTransportAddEx);
+	r = talloc(talloc_tos(), struct srvsvc_NetServerTransportAddEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -3267,7 +3267,7 @@ static bool api_srvsvc_NetServerSetServiceBitsEx(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSERVERSETSERVICEBITSEX];
 
-	r = talloc(NULL, struct srvsvc_NetServerSetServiceBitsEx);
+	r = talloc(talloc_tos(), struct srvsvc_NetServerSetServiceBitsEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -3340,7 +3340,7 @@ static bool api_srvsvc_NETRDFSGETVERSION(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSGETVERSION];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSGETVERSION);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSGETVERSION);
 	if (r == NULL) {
 		return false;
 	}
@@ -3413,7 +3413,7 @@ static bool api_srvsvc_NETRDFSCREATELOCALPARTITION(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSCREATELOCALPARTITION];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSCREATELOCALPARTITION);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSCREATELOCALPARTITION);
 	if (r == NULL) {
 		return false;
 	}
@@ -3486,7 +3486,7 @@ static bool api_srvsvc_NETRDFSDELETELOCALPARTITION(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSDELETELOCALPARTITION];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSDELETELOCALPARTITION);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSDELETELOCALPARTITION);
 	if (r == NULL) {
 		return false;
 	}
@@ -3559,7 +3559,7 @@ static bool api_srvsvc_NETRDFSSETLOCALVOLUMESTATE(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSSETLOCALVOLUMESTATE);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSSETLOCALVOLUMESTATE);
 	if (r == NULL) {
 		return false;
 	}
@@ -3632,7 +3632,7 @@ static bool api_srvsvc_NETRDFSSETSERVERINFO(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSSETSERVERINFO];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSSETSERVERINFO);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSSETSERVERINFO);
 	if (r == NULL) {
 		return false;
 	}
@@ -3705,7 +3705,7 @@ static bool api_srvsvc_NETRDFSCREATEEXITPOINT(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSCREATEEXITPOINT];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSCREATEEXITPOINT);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSCREATEEXITPOINT);
 	if (r == NULL) {
 		return false;
 	}
@@ -3778,7 +3778,7 @@ static bool api_srvsvc_NETRDFSDELETEEXITPOINT(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSDELETEEXITPOINT];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSDELETEEXITPOINT);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSDELETEEXITPOINT);
 	if (r == NULL) {
 		return false;
 	}
@@ -3851,7 +3851,7 @@ static bool api_srvsvc_NETRDFSMODIFYPREFIX(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSMODIFYPREFIX];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSMODIFYPREFIX);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSMODIFYPREFIX);
 	if (r == NULL) {
 		return false;
 	}
@@ -3924,7 +3924,7 @@ static bool api_srvsvc_NETRDFSFIXLOCALVOLUME(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSFIXLOCALVOLUME];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSFIXLOCALVOLUME);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSFIXLOCALVOLUME);
 	if (r == NULL) {
 		return false;
 	}
@@ -3997,7 +3997,7 @@ static bool api_srvsvc_NETRDFSMANAGERREPORTSITEINFO(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO];
 
-	r = talloc(NULL, struct srvsvc_NETRDFSMANAGERREPORTSITEINFO);
+	r = talloc(talloc_tos(), struct srvsvc_NETRDFSMANAGERREPORTSITEINFO);
 	if (r == NULL) {
 		return false;
 	}
@@ -4070,7 +4070,7 @@ static bool api_srvsvc_NETRSERVERTRANSPORTDELEX(pipes_struct *p)
 
 	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRSERVERTRANSPORTDELEX];
 
-	r = talloc(NULL, struct srvsvc_NETRSERVERTRANSPORTDELEX);
+	r = talloc(talloc_tos(), struct srvsvc_NETRSERVERTRANSPORTDELEX);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_svcctl.c b/source3/librpc/gen_ndr/srv_svcctl.c
index 4a0a2591ab..a7163917bd 100644
--- a/source3/librpc/gen_ndr/srv_svcctl.c
+++ b/source3/librpc/gen_ndr/srv_svcctl.c
@@ -17,7 +17,7 @@ static bool api_svcctl_CloseServiceHandle(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CLOSESERVICEHANDLE];
 
-	r = talloc(NULL, struct svcctl_CloseServiceHandle);
+	r = talloc(talloc_tos(), struct svcctl_CloseServiceHandle);
 	if (r == NULL) {
 		return false;
 	}
@@ -92,7 +92,7 @@ static bool api_svcctl_ControlService(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CONTROLSERVICE];
 
-	r = talloc(NULL, struct svcctl_ControlService);
+	r = talloc(talloc_tos(), struct svcctl_ControlService);
 	if (r == NULL) {
 		return false;
 	}
@@ -172,7 +172,7 @@ static bool api_svcctl_DeleteService(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_DELETESERVICE];
 
-	r = talloc(NULL, struct svcctl_DeleteService);
+	r = talloc(talloc_tos(), struct svcctl_DeleteService);
 	if (r == NULL) {
 		return false;
 	}
@@ -245,7 +245,7 @@ static bool api_svcctl_LockServiceDatabase(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_LOCKSERVICEDATABASE];
 
-	r = talloc(NULL, struct svcctl_LockServiceDatabase);
+	r = talloc(talloc_tos(), struct svcctl_LockServiceDatabase);
 	if (r == NULL) {
 		return false;
 	}
@@ -325,7 +325,7 @@ static bool api_svcctl_QueryServiceObjectSecurity(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY];
 
-	r = talloc(NULL, struct svcctl_QueryServiceObjectSecurity);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceObjectSecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -398,7 +398,7 @@ static bool api_svcctl_SetServiceObjectSecurity(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SETSERVICEOBJECTSECURITY];
 
-	r = talloc(NULL, struct svcctl_SetServiceObjectSecurity);
+	r = talloc(talloc_tos(), struct svcctl_SetServiceObjectSecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -471,7 +471,7 @@ static bool api_svcctl_QueryServiceStatus(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICESTATUS];
 
-	r = talloc(NULL, struct svcctl_QueryServiceStatus);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceStatus);
 	if (r == NULL) {
 		return false;
 	}
@@ -551,7 +551,7 @@ static bool api_svcctl_SetServiceStatus(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SETSERVICESTATUS];
 
-	r = talloc(NULL, struct svcctl_SetServiceStatus);
+	r = talloc(talloc_tos(), struct svcctl_SetServiceStatus);
 	if (r == NULL) {
 		return false;
 	}
@@ -624,7 +624,7 @@ static bool api_svcctl_UnlockServiceDatabase(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_UNLOCKSERVICEDATABASE];
 
-	r = talloc(NULL, struct svcctl_UnlockServiceDatabase);
+	r = talloc(talloc_tos(), struct svcctl_UnlockServiceDatabase);
 	if (r == NULL) {
 		return false;
 	}
@@ -699,7 +699,7 @@ static bool api_svcctl_NotifyBootConfigStatus(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS];
 
-	r = talloc(NULL, struct svcctl_NotifyBootConfigStatus);
+	r = talloc(talloc_tos(), struct svcctl_NotifyBootConfigStatus);
 	if (r == NULL) {
 		return false;
 	}
@@ -772,7 +772,7 @@ static bool api_svcctl_SCSetServiceBitsW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SCSETSERVICEBITSW];
 
-	r = talloc(NULL, struct svcctl_SCSetServiceBitsW);
+	r = talloc(talloc_tos(), struct svcctl_SCSetServiceBitsW);
 	if (r == NULL) {
 		return false;
 	}
@@ -845,7 +845,7 @@ static bool api_svcctl_ChangeServiceConfigW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIGW];
 
-	r = talloc(NULL, struct svcctl_ChangeServiceConfigW);
+	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfigW);
 	if (r == NULL) {
 		return false;
 	}
@@ -925,7 +925,7 @@ static bool api_svcctl_CreateServiceW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CREATESERVICEW];
 
-	r = talloc(NULL, struct svcctl_CreateServiceW);
+	r = talloc(talloc_tos(), struct svcctl_CreateServiceW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1006,7 +1006,7 @@ static bool api_svcctl_EnumDependentServicesW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMDEPENDENTSERVICESW];
 
-	r = talloc(NULL, struct svcctl_EnumDependentServicesW);
+	r = talloc(talloc_tos(), struct svcctl_EnumDependentServicesW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1098,7 +1098,7 @@ static bool api_svcctl_EnumServicesStatusW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMSERVICESSTATUSW];
 
-	r = talloc(NULL, struct svcctl_EnumServicesStatusW);
+	r = talloc(talloc_tos(), struct svcctl_EnumServicesStatusW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1191,7 +1191,7 @@ static bool api_svcctl_OpenSCManagerW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSCMANAGERW];
 
-	r = talloc(NULL, struct svcctl_OpenSCManagerW);
+	r = talloc(talloc_tos(), struct svcctl_OpenSCManagerW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1271,7 +1271,7 @@ static bool api_svcctl_OpenServiceW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSERVICEW];
 
-	r = talloc(NULL, struct svcctl_OpenServiceW);
+	r = talloc(talloc_tos(), struct svcctl_OpenServiceW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1351,7 +1351,7 @@ static bool api_svcctl_QueryServiceConfigW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIGW];
 
-	r = talloc(NULL, struct svcctl_QueryServiceConfigW);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfigW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1437,7 +1437,7 @@ static bool api_svcctl_QueryServiceLockStatusW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICELOCKSTATUSW];
 
-	r = talloc(NULL, struct svcctl_QueryServiceLockStatusW);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceLockStatusW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1523,7 +1523,7 @@ static bool api_svcctl_StartServiceW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_STARTSERVICEW];
 
-	r = talloc(NULL, struct svcctl_StartServiceW);
+	r = talloc(talloc_tos(), struct svcctl_StartServiceW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1596,7 +1596,7 @@ static bool api_svcctl_GetServiceDisplayNameW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEDISPLAYNAMEW];
 
-	r = talloc(NULL, struct svcctl_GetServiceDisplayNameW);
+	r = talloc(talloc_tos(), struct svcctl_GetServiceDisplayNameW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1677,7 +1677,7 @@ static bool api_svcctl_GetServiceKeyNameW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEKEYNAMEW];
 
-	r = talloc(NULL, struct svcctl_GetServiceKeyNameW);
+	r = talloc(talloc_tos(), struct svcctl_GetServiceKeyNameW);
 	if (r == NULL) {
 		return false;
 	}
@@ -1758,7 +1758,7 @@ static bool api_svcctl_SCSetServiceBitsA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SCSETSERVICEBITSA];
 
-	r = talloc(NULL, struct svcctl_SCSetServiceBitsA);
+	r = talloc(talloc_tos(), struct svcctl_SCSetServiceBitsA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1831,7 +1831,7 @@ static bool api_svcctl_ChangeServiceConfigA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIGA];
 
-	r = talloc(NULL, struct svcctl_ChangeServiceConfigA);
+	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfigA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1911,7 +1911,7 @@ static bool api_svcctl_CreateServiceA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CREATESERVICEA];
 
-	r = talloc(NULL, struct svcctl_CreateServiceA);
+	r = talloc(talloc_tos(), struct svcctl_CreateServiceA);
 	if (r == NULL) {
 		return false;
 	}
@@ -1991,7 +1991,7 @@ static bool api_svcctl_EnumDependentServicesA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMDEPENDENTSERVICESA];
 
-	r = talloc(NULL, struct svcctl_EnumDependentServicesA);
+	r = talloc(talloc_tos(), struct svcctl_EnumDependentServicesA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2083,7 +2083,7 @@ static bool api_svcctl_EnumServicesStatusA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMSERVICESSTATUSA];
 
-	r = talloc(NULL, struct svcctl_EnumServicesStatusA);
+	r = talloc(talloc_tos(), struct svcctl_EnumServicesStatusA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2176,7 +2176,7 @@ static bool api_svcctl_OpenSCManagerA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSCMANAGERA];
 
-	r = talloc(NULL, struct svcctl_OpenSCManagerA);
+	r = talloc(talloc_tos(), struct svcctl_OpenSCManagerA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2256,7 +2256,7 @@ static bool api_svcctl_OpenServiceA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSERVICEA];
 
-	r = talloc(NULL, struct svcctl_OpenServiceA);
+	r = talloc(talloc_tos(), struct svcctl_OpenServiceA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2329,7 +2329,7 @@ static bool api_svcctl_QueryServiceConfigA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIGA];
 
-	r = talloc(NULL, struct svcctl_QueryServiceConfigA);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfigA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2415,7 +2415,7 @@ static bool api_svcctl_QueryServiceLockStatusA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICELOCKSTATUSA];
 
-	r = talloc(NULL, struct svcctl_QueryServiceLockStatusA);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceLockStatusA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2501,7 +2501,7 @@ static bool api_svcctl_StartServiceA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_STARTSERVICEA];
 
-	r = talloc(NULL, struct svcctl_StartServiceA);
+	r = talloc(talloc_tos(), struct svcctl_StartServiceA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2574,7 +2574,7 @@ static bool api_svcctl_GetServiceDisplayNameA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEDISPLAYNAMEA];
 
-	r = talloc(NULL, struct svcctl_GetServiceDisplayNameA);
+	r = talloc(talloc_tos(), struct svcctl_GetServiceDisplayNameA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2655,7 +2655,7 @@ static bool api_svcctl_GetServiceKeyNameA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEKEYNAMEA];
 
-	r = talloc(NULL, struct svcctl_GetServiceKeyNameA);
+	r = talloc(talloc_tos(), struct svcctl_GetServiceKeyNameA);
 	if (r == NULL) {
 		return false;
 	}
@@ -2736,7 +2736,7 @@ static bool api_svcctl_GetCurrentGroupeStateW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETCURRENTGROUPESTATEW];
 
-	r = talloc(NULL, struct svcctl_GetCurrentGroupeStateW);
+	r = talloc(talloc_tos(), struct svcctl_GetCurrentGroupeStateW);
 	if (r == NULL) {
 		return false;
 	}
@@ -2809,7 +2809,7 @@ static bool api_svcctl_EnumServiceGroupW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMSERVICEGROUPW];
 
-	r = talloc(NULL, struct svcctl_EnumServiceGroupW);
+	r = talloc(talloc_tos(), struct svcctl_EnumServiceGroupW);
 	if (r == NULL) {
 		return false;
 	}
@@ -2882,7 +2882,7 @@ static bool api_svcctl_ChangeServiceConfig2A(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIG2A];
 
-	r = talloc(NULL, struct svcctl_ChangeServiceConfig2A);
+	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfig2A);
 	if (r == NULL) {
 		return false;
 	}
@@ -2955,7 +2955,7 @@ static bool api_svcctl_ChangeServiceConfig2W(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIG2W];
 
-	r = talloc(NULL, struct svcctl_ChangeServiceConfig2W);
+	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfig2W);
 	if (r == NULL) {
 		return false;
 	}
@@ -3028,7 +3028,7 @@ static bool api_svcctl_QueryServiceConfig2A(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIG2A];
 
-	r = talloc(NULL, struct svcctl_QueryServiceConfig2A);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfig2A);
 	if (r == NULL) {
 		return false;
 	}
@@ -3114,7 +3114,7 @@ static bool api_svcctl_QueryServiceConfig2W(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIG2W];
 
-	r = talloc(NULL, struct svcctl_QueryServiceConfig2W);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfig2W);
 	if (r == NULL) {
 		return false;
 	}
@@ -3200,7 +3200,7 @@ static bool api_svcctl_QueryServiceStatusEx(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICESTATUSEX];
 
-	r = talloc(NULL, struct svcctl_QueryServiceStatusEx);
+	r = talloc(talloc_tos(), struct svcctl_QueryServiceStatusEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -3286,7 +3286,7 @@ static bool api_EnumServicesStatusExA(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_ENUMSERVICESSTATUSEXA];
 
-	r = talloc(NULL, struct EnumServicesStatusExA);
+	r = talloc(talloc_tos(), struct EnumServicesStatusExA);
 	if (r == NULL) {
 		return false;
 	}
@@ -3385,7 +3385,7 @@ static bool api_EnumServicesStatusExW(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_ENUMSERVICESSTATUSEXW];
 
-	r = talloc(NULL, struct EnumServicesStatusExW);
+	r = talloc(talloc_tos(), struct EnumServicesStatusExW);
 	if (r == NULL) {
 		return false;
 	}
@@ -3484,7 +3484,7 @@ static bool api_svcctl_SCSendTSMessage(pipes_struct *p)
 
 	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SCSENDTSMESSAGE];
 
-	r = talloc(NULL, struct svcctl_SCSendTSMessage);
+	r = talloc(talloc_tos(), struct svcctl_SCSendTSMessage);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_unixinfo.c b/source3/librpc/gen_ndr/srv_unixinfo.c
index 36a6250ad0..6142bb113f 100644
--- a/source3/librpc/gen_ndr/srv_unixinfo.c
+++ b/source3/librpc/gen_ndr/srv_unixinfo.c
@@ -17,7 +17,7 @@ static bool api_unixinfo_SidToUid(pipes_struct *p)
 
 	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_SIDTOUID];
 
-	r = talloc(NULL, struct unixinfo_SidToUid);
+	r = talloc(talloc_tos(), struct unixinfo_SidToUid);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_unixinfo_UidToSid(pipes_struct *p)
 
 	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_UIDTOSID];
 
-	r = talloc(NULL, struct unixinfo_UidToSid);
+	r = talloc(talloc_tos(), struct unixinfo_UidToSid);
 	if (r == NULL) {
 		return false;
 	}
@@ -177,7 +177,7 @@ static bool api_unixinfo_SidToGid(pipes_struct *p)
 
 	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_SIDTOGID];
 
-	r = talloc(NULL, struct unixinfo_SidToGid);
+	r = talloc(talloc_tos(), struct unixinfo_SidToGid);
 	if (r == NULL) {
 		return false;
 	}
@@ -257,7 +257,7 @@ static bool api_unixinfo_GidToSid(pipes_struct *p)
 
 	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_GIDTOSID];
 
-	r = talloc(NULL, struct unixinfo_GidToSid);
+	r = talloc(talloc_tos(), struct unixinfo_GidToSid);
 	if (r == NULL) {
 		return false;
 	}
@@ -337,7 +337,7 @@ static bool api_unixinfo_GetPWUid(pipes_struct *p)
 
 	call = &ndr_table_unixinfo.calls[NDR_UNIXINFO_GETPWUID];
 
-	r = talloc(NULL, struct unixinfo_GetPWUid);
+	r = talloc(talloc_tos(), struct unixinfo_GetPWUid);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_winreg.c b/source3/librpc/gen_ndr/srv_winreg.c
index ecce99f67a..4672944ad0 100644
--- a/source3/librpc/gen_ndr/srv_winreg.c
+++ b/source3/librpc/gen_ndr/srv_winreg.c
@@ -17,7 +17,7 @@ static bool api_winreg_OpenHKCR(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKCR];
 
-	r = talloc(NULL, struct winreg_OpenHKCR);
+	r = talloc(talloc_tos(), struct winreg_OpenHKCR);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_winreg_OpenHKCU(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKCU];
 
-	r = talloc(NULL, struct winreg_OpenHKCU);
+	r = talloc(talloc_tos(), struct winreg_OpenHKCU);
 	if (r == NULL) {
 		return false;
 	}
@@ -177,7 +177,7 @@ static bool api_winreg_OpenHKLM(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKLM];
 
-	r = talloc(NULL, struct winreg_OpenHKLM);
+	r = talloc(talloc_tos(), struct winreg_OpenHKLM);
 	if (r == NULL) {
 		return false;
 	}
@@ -257,7 +257,7 @@ static bool api_winreg_OpenHKPD(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKPD];
 
-	r = talloc(NULL, struct winreg_OpenHKPD);
+	r = talloc(talloc_tos(), struct winreg_OpenHKPD);
 	if (r == NULL) {
 		return false;
 	}
@@ -337,7 +337,7 @@ static bool api_winreg_OpenHKU(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKU];
 
-	r = talloc(NULL, struct winreg_OpenHKU);
+	r = talloc(talloc_tos(), struct winreg_OpenHKU);
 	if (r == NULL) {
 		return false;
 	}
@@ -417,7 +417,7 @@ static bool api_winreg_CloseKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_CLOSEKEY];
 
-	r = talloc(NULL, struct winreg_CloseKey);
+	r = talloc(talloc_tos(), struct winreg_CloseKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -492,7 +492,7 @@ static bool api_winreg_CreateKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_CREATEKEY];
 
-	r = talloc(NULL, struct winreg_CreateKey);
+	r = talloc(talloc_tos(), struct winreg_CreateKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -573,7 +573,7 @@ static bool api_winreg_DeleteKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_DELETEKEY];
 
-	r = talloc(NULL, struct winreg_DeleteKey);
+	r = talloc(talloc_tos(), struct winreg_DeleteKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -646,7 +646,7 @@ static bool api_winreg_DeleteValue(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_DELETEVALUE];
 
-	r = talloc(NULL, struct winreg_DeleteValue);
+	r = talloc(talloc_tos(), struct winreg_DeleteValue);
 	if (r == NULL) {
 		return false;
 	}
@@ -719,7 +719,7 @@ static bool api_winreg_EnumKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_ENUMKEY];
 
-	r = talloc(NULL, struct winreg_EnumKey);
+	r = talloc(talloc_tos(), struct winreg_EnumKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -796,7 +796,7 @@ static bool api_winreg_EnumValue(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_ENUMVALUE];
 
-	r = talloc(NULL, struct winreg_EnumValue);
+	r = talloc(talloc_tos(), struct winreg_EnumValue);
 	if (r == NULL) {
 		return false;
 	}
@@ -875,7 +875,7 @@ static bool api_winreg_FlushKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_FLUSHKEY];
 
-	r = talloc(NULL, struct winreg_FlushKey);
+	r = talloc(talloc_tos(), struct winreg_FlushKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -948,7 +948,7 @@ static bool api_winreg_GetKeySecurity(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_GETKEYSECURITY];
 
-	r = talloc(NULL, struct winreg_GetKeySecurity);
+	r = talloc(talloc_tos(), struct winreg_GetKeySecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -1023,7 +1023,7 @@ static bool api_winreg_LoadKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_LOADKEY];
 
-	r = talloc(NULL, struct winreg_LoadKey);
+	r = talloc(talloc_tos(), struct winreg_LoadKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1096,7 +1096,7 @@ static bool api_winreg_NotifyChangeKeyValue(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_NOTIFYCHANGEKEYVALUE];
 
-	r = talloc(NULL, struct winreg_NotifyChangeKeyValue);
+	r = talloc(talloc_tos(), struct winreg_NotifyChangeKeyValue);
 	if (r == NULL) {
 		return false;
 	}
@@ -1169,7 +1169,7 @@ static bool api_winreg_OpenKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENKEY];
 
-	r = talloc(NULL, struct winreg_OpenKey);
+	r = talloc(talloc_tos(), struct winreg_OpenKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1249,7 +1249,7 @@ static bool api_winreg_QueryInfoKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYINFOKEY];
 
-	r = talloc(NULL, struct winreg_QueryInfoKey);
+	r = talloc(talloc_tos(), struct winreg_QueryInfoKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1372,7 +1372,7 @@ static bool api_winreg_QueryValue(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYVALUE];
 
-	r = talloc(NULL, struct winreg_QueryValue);
+	r = talloc(talloc_tos(), struct winreg_QueryValue);
 	if (r == NULL) {
 		return false;
 	}
@@ -1450,7 +1450,7 @@ static bool api_winreg_ReplaceKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_REPLACEKEY];
 
-	r = talloc(NULL, struct winreg_ReplaceKey);
+	r = talloc(talloc_tos(), struct winreg_ReplaceKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1523,7 +1523,7 @@ static bool api_winreg_RestoreKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_RESTOREKEY];
 
-	r = talloc(NULL, struct winreg_RestoreKey);
+	r = talloc(talloc_tos(), struct winreg_RestoreKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1596,7 +1596,7 @@ static bool api_winreg_SaveKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_SAVEKEY];
 
-	r = talloc(NULL, struct winreg_SaveKey);
+	r = talloc(talloc_tos(), struct winreg_SaveKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1669,7 +1669,7 @@ static bool api_winreg_SetKeySecurity(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_SETKEYSECURITY];
 
-	r = talloc(NULL, struct winreg_SetKeySecurity);
+	r = talloc(talloc_tos(), struct winreg_SetKeySecurity);
 	if (r == NULL) {
 		return false;
 	}
@@ -1742,7 +1742,7 @@ static bool api_winreg_SetValue(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_SETVALUE];
 
-	r = talloc(NULL, struct winreg_SetValue);
+	r = talloc(talloc_tos(), struct winreg_SetValue);
 	if (r == NULL) {
 		return false;
 	}
@@ -1815,7 +1815,7 @@ static bool api_winreg_UnLoadKey(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_UNLOADKEY];
 
-	r = talloc(NULL, struct winreg_UnLoadKey);
+	r = talloc(talloc_tos(), struct winreg_UnLoadKey);
 	if (r == NULL) {
 		return false;
 	}
@@ -1888,7 +1888,7 @@ static bool api_winreg_InitiateSystemShutdown(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_INITIATESYSTEMSHUTDOWN];
 
-	r = talloc(NULL, struct winreg_InitiateSystemShutdown);
+	r = talloc(talloc_tos(), struct winreg_InitiateSystemShutdown);
 	if (r == NULL) {
 		return false;
 	}
@@ -1961,7 +1961,7 @@ static bool api_winreg_AbortSystemShutdown(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_ABORTSYSTEMSHUTDOWN];
 
-	r = talloc(NULL, struct winreg_AbortSystemShutdown);
+	r = talloc(talloc_tos(), struct winreg_AbortSystemShutdown);
 	if (r == NULL) {
 		return false;
 	}
@@ -2034,7 +2034,7 @@ static bool api_winreg_GetVersion(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_GETVERSION];
 
-	r = talloc(NULL, struct winreg_GetVersion);
+	r = talloc(talloc_tos(), struct winreg_GetVersion);
 	if (r == NULL) {
 		return false;
 	}
@@ -2114,7 +2114,7 @@ static bool api_winreg_OpenHKCC(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKCC];
 
-	r = talloc(NULL, struct winreg_OpenHKCC);
+	r = talloc(talloc_tos(), struct winreg_OpenHKCC);
 	if (r == NULL) {
 		return false;
 	}
@@ -2194,7 +2194,7 @@ static bool api_winreg_OpenHKDD(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKDD];
 
-	r = talloc(NULL, struct winreg_OpenHKDD);
+	r = talloc(talloc_tos(), struct winreg_OpenHKDD);
 	if (r == NULL) {
 		return false;
 	}
@@ -2274,7 +2274,7 @@ static bool api_winreg_QueryMultipleValues(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYMULTIPLEVALUES];
 
-	r = talloc(NULL, struct winreg_QueryMultipleValues);
+	r = talloc(talloc_tos(), struct winreg_QueryMultipleValues);
 	if (r == NULL) {
 		return false;
 	}
@@ -2351,7 +2351,7 @@ static bool api_winreg_InitiateSystemShutdownEx(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_INITIATESYSTEMSHUTDOWNEX];
 
-	r = talloc(NULL, struct winreg_InitiateSystemShutdownEx);
+	r = talloc(talloc_tos(), struct winreg_InitiateSystemShutdownEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -2424,7 +2424,7 @@ static bool api_winreg_SaveKeyEx(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_SAVEKEYEX];
 
-	r = talloc(NULL, struct winreg_SaveKeyEx);
+	r = talloc(talloc_tos(), struct winreg_SaveKeyEx);
 	if (r == NULL) {
 		return false;
 	}
@@ -2497,7 +2497,7 @@ static bool api_winreg_OpenHKPT(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKPT];
 
-	r = talloc(NULL, struct winreg_OpenHKPT);
+	r = talloc(talloc_tos(), struct winreg_OpenHKPT);
 	if (r == NULL) {
 		return false;
 	}
@@ -2577,7 +2577,7 @@ static bool api_winreg_OpenHKPN(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKPN];
 
-	r = talloc(NULL, struct winreg_OpenHKPN);
+	r = talloc(talloc_tos(), struct winreg_OpenHKPN);
 	if (r == NULL) {
 		return false;
 	}
@@ -2657,7 +2657,7 @@ static bool api_winreg_QueryMultipleValues2(pipes_struct *p)
 
 	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYMULTIPLEVALUES2];
 
-	r = talloc(NULL, struct winreg_QueryMultipleValues2);
+	r = talloc(talloc_tos(), struct winreg_QueryMultipleValues2);
 	if (r == NULL) {
 		return false;
 	}
diff --git a/source3/librpc/gen_ndr/srv_wkssvc.c b/source3/librpc/gen_ndr/srv_wkssvc.c
index da2279001d..90e6f482f4 100644
--- a/source3/librpc/gen_ndr/srv_wkssvc.c
+++ b/source3/librpc/gen_ndr/srv_wkssvc.c
@@ -17,7 +17,7 @@ static bool api_wkssvc_NetWkstaGetInfo(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTAGETINFO];
 
-	r = talloc(NULL, struct wkssvc_NetWkstaGetInfo);
+	r = talloc(talloc_tos(), struct wkssvc_NetWkstaGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -97,7 +97,7 @@ static bool api_wkssvc_NetWkstaSetInfo(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTASETINFO];
 
-	r = talloc(NULL, struct wkssvc_NetWkstaSetInfo);
+	r = talloc(talloc_tos(), struct wkssvc_NetWkstaSetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -172,7 +172,7 @@ static bool api_wkssvc_NetWkstaEnumUsers(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTAENUMUSERS];
 
-	r = talloc(NULL, struct wkssvc_NetWkstaEnumUsers);
+	r = talloc(talloc_tos(), struct wkssvc_NetWkstaEnumUsers);
 	if (r == NULL) {
 		return false;
 	}
@@ -254,7 +254,7 @@ static bool api_wkssvc_NetrWkstaUserGetInfo(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTAUSERGETINFO];
 
-	r = talloc(NULL, struct wkssvc_NetrWkstaUserGetInfo);
+	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaUserGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -334,7 +334,7 @@ static bool api_wkssvc_NetrWkstaUserSetInfo(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTAUSERSETINFO];
 
-	r = talloc(NULL, struct wkssvc_NetrWkstaUserSetInfo);
+	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaUserSetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -409,7 +409,7 @@ static bool api_wkssvc_NetWkstaTransportEnum(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTATRANSPORTENUM];
 
-	r = talloc(NULL, struct wkssvc_NetWkstaTransportEnum);
+	r = talloc(talloc_tos(), struct wkssvc_NetWkstaTransportEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -491,7 +491,7 @@ static bool api_wkssvc_NetrWkstaTransportAdd(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTATRANSPORTADD];
 
-	r = talloc(NULL, struct wkssvc_NetrWkstaTransportAdd);
+	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaTransportAdd);
 	if (r == NULL) {
 		return false;
 	}
@@ -566,7 +566,7 @@ static bool api_wkssvc_NetrWkstaTransportDel(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTATRANSPORTDEL];
 
-	r = talloc(NULL, struct wkssvc_NetrWkstaTransportDel);
+	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaTransportDel);
 	if (r == NULL) {
 		return false;
 	}
@@ -639,7 +639,7 @@ static bool api_wkssvc_NetrUseAdd(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEADD];
 
-	r = talloc(NULL, struct wkssvc_NetrUseAdd);
+	r = talloc(talloc_tos(), struct wkssvc_NetrUseAdd);
 	if (r == NULL) {
 		return false;
 	}
@@ -714,7 +714,7 @@ static bool api_wkssvc_NetrUseGetInfo(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEGETINFO];
 
-	r = talloc(NULL, struct wkssvc_NetrUseGetInfo);
+	r = talloc(talloc_tos(), struct wkssvc_NetrUseGetInfo);
 	if (r == NULL) {
 		return false;
 	}
@@ -794,7 +794,7 @@ static bool api_wkssvc_NetrUseDel(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEDEL];
 
-	r = talloc(NULL, struct wkssvc_NetrUseDel);
+	r = talloc(talloc_tos(), struct wkssvc_NetrUseDel);
 	if (r == NULL) {
 		return false;
 	}
@@ -867,7 +867,7 @@ static bool api_wkssvc_NetrUseEnum(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEENUM];
 
-	r = talloc(NULL, struct wkssvc_NetrUseEnum);
+	r = talloc(talloc_tos(), struct wkssvc_NetrUseEnum);
 	if (r == NULL) {
 		return false;
 	}
@@ -949,7 +949,7 @@ static bool api_wkssvc_NetrMessageBufferSend(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRMESSAGEBUFFERSEND];
 
-	r = talloc(NULL, struct wkssvc_NetrMessageBufferSend);
+	r = talloc(talloc_tos(), struct wkssvc_NetrMessageBufferSend);
 	if (r == NULL) {
 		return false;
 	}
@@ -1022,7 +1022,7 @@ static bool api_wkssvc_NetrWorkstationStatisticsGet(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET];
 
-	r = talloc(NULL, struct wkssvc_NetrWorkstationStatisticsGet);
+	r = talloc(talloc_tos(), struct wkssvc_NetrWorkstationStatisticsGet);
 	if (r == NULL) {
 		return false;
 	}
@@ -1102,7 +1102,7 @@ static bool api_wkssvc_NetrLogonDomainNameAdd(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRLOGONDOMAINNAMEADD];
 
-	r = talloc(NULL, struct wkssvc_NetrLogonDomainNameAdd);
+	r = talloc(talloc_tos(), struct wkssvc_NetrLogonDomainNameAdd);
 	if (r == NULL) {
 		return false;
 	}
@@ -1175,7 +1175,7 @@ static bool api_wkssvc_NetrLogonDomainNameDel(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL];
 
-	r = talloc(NULL, struct wkssvc_NetrLogonDomainNameDel);
+	r = talloc(talloc_tos(), struct wkssvc_NetrLogonDomainNameDel);
 	if (r == NULL) {
 		return false;
 	}
@@ -1248,7 +1248,7 @@ static bool api_wkssvc_NetrJoinDomain(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRJOINDOMAIN];
 
-	r = talloc(NULL, struct wkssvc_NetrJoinDomain);
+	r = talloc(talloc_tos(), struct wkssvc_NetrJoinDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -1321,7 +1321,7 @@ static bool api_wkssvc_NetrUnjoinDomain(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUNJOINDOMAIN];
 
-	r = talloc(NULL, struct wkssvc_NetrUnjoinDomain);
+	r = talloc(talloc_tos(), struct wkssvc_NetrUnjoinDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -1394,7 +1394,7 @@ static bool api_wkssvc_NetrRenameMachineInDomain(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN];
 
-	r = talloc(NULL, struct wkssvc_NetrRenameMachineInDomain);
+	r = talloc(talloc_tos(), struct wkssvc_NetrRenameMachineInDomain);
 	if (r == NULL) {
 		return false;
 	}
@@ -1467,7 +1467,7 @@ static bool api_wkssvc_NetrValidateName(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRVALIDATENAME];
 
-	r = talloc(NULL, struct wkssvc_NetrValidateName);
+	r = talloc(talloc_tos(), struct wkssvc_NetrValidateName);
 	if (r == NULL) {
 		return false;
 	}
@@ -1540,7 +1540,7 @@ static bool api_wkssvc_NetrGetJoinInformation(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRGETJOININFORMATION];
 
-	r = talloc(NULL, struct wkssvc_NetrGetJoinInformation);
+	r = talloc(talloc_tos(), struct wkssvc_NetrGetJoinInformation);
 	if (r == NULL) {
 		return false;
 	}
@@ -1621,7 +1621,7 @@ static bool api_wkssvc_NetrGetJoinableOus(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRGETJOINABLEOUS];
 
-	r = talloc(NULL, struct wkssvc_NetrGetJoinableOus);
+	r = talloc(talloc_tos(), struct wkssvc_NetrGetJoinableOus);
 	if (r == NULL) {
 		return false;
 	}
@@ -1702,7 +1702,7 @@ static bool api_wkssvc_NetrJoinDomain2(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRJOINDOMAIN2];
 
-	r = talloc(NULL, struct wkssvc_NetrJoinDomain2);
+	r = talloc(talloc_tos(), struct wkssvc_NetrJoinDomain2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1775,7 +1775,7 @@ static bool api_wkssvc_NetrUnjoinDomain2(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUNJOINDOMAIN2];
 
-	r = talloc(NULL, struct wkssvc_NetrUnjoinDomain2);
+	r = talloc(talloc_tos(), struct wkssvc_NetrUnjoinDomain2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1848,7 +1848,7 @@ static bool api_wkssvc_NetrRenameMachineInDomain2(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2];
 
-	r = talloc(NULL, struct wkssvc_NetrRenameMachineInDomain2);
+	r = talloc(talloc_tos(), struct wkssvc_NetrRenameMachineInDomain2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1921,7 +1921,7 @@ static bool api_wkssvc_NetrValidateName2(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRVALIDATENAME2];
 
-	r = talloc(NULL, struct wkssvc_NetrValidateName2);
+	r = talloc(talloc_tos(), struct wkssvc_NetrValidateName2);
 	if (r == NULL) {
 		return false;
 	}
@@ -1994,7 +1994,7 @@ static bool api_wkssvc_NetrGetJoinableOus2(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRGETJOINABLEOUS2];
 
-	r = talloc(NULL, struct wkssvc_NetrGetJoinableOus2);
+	r = talloc(talloc_tos(), struct wkssvc_NetrGetJoinableOus2);
 	if (r == NULL) {
 		return false;
 	}
@@ -2075,7 +2075,7 @@ static bool api_wkssvc_NetrAddAlternateComputerName(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME];
 
-	r = talloc(NULL, struct wkssvc_NetrAddAlternateComputerName);
+	r = talloc(talloc_tos(), struct wkssvc_NetrAddAlternateComputerName);
 	if (r == NULL) {
 		return false;
 	}
@@ -2148,7 +2148,7 @@ static bool api_wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME];
 
-	r = talloc(NULL, struct wkssvc_NetrRemoveAlternateComputerName);
+	r = talloc(talloc_tos(), struct wkssvc_NetrRemoveAlternateComputerName);
 	if (r == NULL) {
 		return false;
 	}
@@ -2221,7 +2221,7 @@ static bool api_wkssvc_NetrSetPrimaryComputername(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME];
 
-	r = talloc(NULL, struct wkssvc_NetrSetPrimaryComputername);
+	r = talloc(talloc_tos(), struct wkssvc_NetrSetPrimaryComputername);
 	if (r == NULL) {
 		return false;
 	}
@@ -2294,7 +2294,7 @@ static bool api_wkssvc_NetrEnumerateComputerNames(pipes_struct *p)
 
 	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES];
 
-	r = talloc(NULL, struct wkssvc_NetrEnumerateComputerNames);
+	r = talloc(talloc_tos(), struct wkssvc_NetrEnumerateComputerNames);
 	if (r == NULL) {
 		return false;
 	}