run make idl_full, thus adding explicit casts to gen_ndr server code

Michael

14 files changed, 505 insertions, 505 deletions

diff --git a/librpc/gen_ndr/srv_dfs.c b/librpc/gen_ndr/srv_dfs.c
index f4b73d8015..623df13ccc 100644
--- a/librpc/gen_ndr/srv_dfs.c
+++ b/librpc/gen_ndr/srv_dfs.c
@@ -1757,7 +1757,7 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_DFS_GETMANAGERVERSION: {
-			struct dfs_GetManagerVersion *r = _r;
+			struct dfs_GetManagerVersion *r = (struct dfs_GetManagerVersion *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.version = talloc_zero(mem_ctx, enum dfs_ManagerVersion);
 			if (r->out.version == NULL) {
@@ -1769,25 +1769,25 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_ADD: {
-			struct dfs_Add *r = _r;
+			struct dfs_Add *r = (struct dfs_Add *)_r;
 			r->out.result = _dfs_Add(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_REMOVE: {
-			struct dfs_Remove *r = _r;
+			struct dfs_Remove *r = (struct dfs_Remove *)_r;
 			r->out.result = _dfs_Remove(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_SETINFO: {
-			struct dfs_SetInfo *r = _r;
+			struct dfs_SetInfo *r = (struct dfs_SetInfo *)_r;
 			r->out.result = _dfs_SetInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_GETINFO: {
-			struct dfs_GetInfo *r = _r;
+			struct dfs_GetInfo *r = (struct dfs_GetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union dfs_Info);
 			if (r->out.info == NULL) {
@@ -1799,7 +1799,7 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_ENUM: {
-			struct dfs_Enum *r = _r;
+			struct dfs_Enum *r = (struct dfs_Enum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.total = r->in.total;
@@ -1808,31 +1808,31 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_RENAME: {
-			struct dfs_Rename *r = _r;
+			struct dfs_Rename *r = (struct dfs_Rename *)_r;
 			r->out.result = _dfs_Rename(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_MOVE: {
-			struct dfs_Move *r = _r;
+			struct dfs_Move *r = (struct dfs_Move *)_r;
 			r->out.result = _dfs_Move(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_MANAGERGETCONFIGINFO: {
-			struct dfs_ManagerGetConfigInfo *r = _r;
+			struct dfs_ManagerGetConfigInfo *r = (struct dfs_ManagerGetConfigInfo *)_r;
 			r->out.result = _dfs_ManagerGetConfigInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_MANAGERSENDSITEINFO: {
-			struct dfs_ManagerSendSiteInfo *r = _r;
+			struct dfs_ManagerSendSiteInfo *r = (struct dfs_ManagerSendSiteInfo *)_r;
 			r->out.result = _dfs_ManagerSendSiteInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_ADDFTROOT: {
-			struct dfs_AddFtRoot *r = _r;
+			struct dfs_AddFtRoot *r = (struct dfs_AddFtRoot *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.unknown2 = r->in.unknown2;
 			r->out.result = _dfs_AddFtRoot(cli->pipes_struct, r);
@@ -1840,7 +1840,7 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_REMOVEFTROOT: {
-			struct dfs_RemoveFtRoot *r = _r;
+			struct dfs_RemoveFtRoot *r = (struct dfs_RemoveFtRoot *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.unknown = r->in.unknown;
 			r->out.result = _dfs_RemoveFtRoot(cli->pipes_struct, r);
@@ -1848,31 +1848,31 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_ADDSTDROOT: {
-			struct dfs_AddStdRoot *r = _r;
+			struct dfs_AddStdRoot *r = (struct dfs_AddStdRoot *)_r;
 			r->out.result = _dfs_AddStdRoot(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_REMOVESTDROOT: {
-			struct dfs_RemoveStdRoot *r = _r;
+			struct dfs_RemoveStdRoot *r = (struct dfs_RemoveStdRoot *)_r;
 			r->out.result = _dfs_RemoveStdRoot(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_MANAGERINITIALIZE: {
-			struct dfs_ManagerInitialize *r = _r;
+			struct dfs_ManagerInitialize *r = (struct dfs_ManagerInitialize *)_r;
 			r->out.result = _dfs_ManagerInitialize(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_ADDSTDROOTFORCED: {
-			struct dfs_AddStdRootForced *r = _r;
+			struct dfs_AddStdRootForced *r = (struct dfs_AddStdRootForced *)_r;
 			r->out.result = _dfs_AddStdRootForced(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_GETDCADDRESS: {
-			struct dfs_GetDcAddress *r = _r;
+			struct dfs_GetDcAddress *r = (struct dfs_GetDcAddress *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.server_fullname = r->in.server_fullname;
 			r->out.is_root = r->in.is_root;
@@ -1882,31 +1882,31 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_SETDCADDRESS: {
-			struct dfs_SetDcAddress *r = _r;
+			struct dfs_SetDcAddress *r = (struct dfs_SetDcAddress *)_r;
 			r->out.result = _dfs_SetDcAddress(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_FLUSHFTTABLE: {
-			struct dfs_FlushFtTable *r = _r;
+			struct dfs_FlushFtTable *r = (struct dfs_FlushFtTable *)_r;
 			r->out.result = _dfs_FlushFtTable(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_ADD2: {
-			struct dfs_Add2 *r = _r;
+			struct dfs_Add2 *r = (struct dfs_Add2 *)_r;
 			r->out.result = _dfs_Add2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_REMOVE2: {
-			struct dfs_Remove2 *r = _r;
+			struct dfs_Remove2 *r = (struct dfs_Remove2 *)_r;
 			r->out.result = _dfs_Remove2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DFS_ENUMEX: {
-			struct dfs_EnumEx *r = _r;
+			struct dfs_EnumEx *r = (struct dfs_EnumEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.total = r->in.total;
@@ -1915,7 +1915,7 @@ NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_DFS_SETINFO2: {
-			struct dfs_SetInfo2 *r = _r;
+			struct dfs_SetInfo2 *r = (struct dfs_SetInfo2 *)_r;
 			r->out.result = _dfs_SetInfo2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_dssetup.c b/librpc/gen_ndr/srv_dssetup.c
index dfa46e800b..813eaf629f 100644
--- a/librpc/gen_ndr/srv_dssetup.c
+++ b/librpc/gen_ndr/srv_dssetup.c
@@ -848,7 +848,7 @@ NTSTATUS rpc_dssetup_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	switch (opnum)
 	{
 		case NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION: {
-			struct dssetup_DsRoleGetPrimaryDomainInformation *r = _r;
+			struct dssetup_DsRoleGetPrimaryDomainInformation *r = (struct dssetup_DsRoleGetPrimaryDomainInformation *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union dssetup_DsRoleInfo);
 			if (r->out.info == NULL) {
@@ -860,61 +860,61 @@ NTSTATUS rpc_dssetup_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME: {
-			struct dssetup_DsRoleDnsNameToFlatName *r = _r;
+			struct dssetup_DsRoleDnsNameToFlatName *r = (struct dssetup_DsRoleDnsNameToFlatName *)_r;
 			r->out.result = _dssetup_DsRoleDnsNameToFlatName(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEDCASDC: {
-			struct dssetup_DsRoleDcAsDc *r = _r;
+			struct dssetup_DsRoleDcAsDc *r = (struct dssetup_DsRoleDcAsDc *)_r;
 			r->out.result = _dssetup_DsRoleDcAsDc(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEDCASREPLICA: {
-			struct dssetup_DsRoleDcAsReplica *r = _r;
+			struct dssetup_DsRoleDcAsReplica *r = (struct dssetup_DsRoleDcAsReplica *)_r;
 			r->out.result = _dssetup_DsRoleDcAsReplica(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEDEMOTEDC: {
-			struct dssetup_DsRoleDemoteDc *r = _r;
+			struct dssetup_DsRoleDemoteDc *r = (struct dssetup_DsRoleDemoteDc *)_r;
 			r->out.result = _dssetup_DsRoleDemoteDc(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS: {
-			struct dssetup_DsRoleGetDcOperationProgress *r = _r;
+			struct dssetup_DsRoleGetDcOperationProgress *r = (struct dssetup_DsRoleGetDcOperationProgress *)_r;
 			r->out.result = _dssetup_DsRoleGetDcOperationProgress(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS: {
-			struct dssetup_DsRoleGetDcOperationResults *r = _r;
+			struct dssetup_DsRoleGetDcOperationResults *r = (struct dssetup_DsRoleGetDcOperationResults *)_r;
 			r->out.result = _dssetup_DsRoleGetDcOperationResults(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLECANCEL: {
-			struct dssetup_DsRoleCancel *r = _r;
+			struct dssetup_DsRoleCancel *r = (struct dssetup_DsRoleCancel *)_r;
 			r->out.result = _dssetup_DsRoleCancel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE: {
-			struct dssetup_DsRoleServerSaveStateForUpgrade *r = _r;
+			struct dssetup_DsRoleServerSaveStateForUpgrade *r = (struct dssetup_DsRoleServerSaveStateForUpgrade *)_r;
 			r->out.result = _dssetup_DsRoleServerSaveStateForUpgrade(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER: {
-			struct dssetup_DsRoleUpgradeDownlevelServer *r = _r;
+			struct dssetup_DsRoleUpgradeDownlevelServer *r = (struct dssetup_DsRoleUpgradeDownlevelServer *)_r;
 			r->out.result = _dssetup_DsRoleUpgradeDownlevelServer(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE: {
-			struct dssetup_DsRoleAbortDownlevelServerUpgrade *r = _r;
+			struct dssetup_DsRoleAbortDownlevelServerUpgrade *r = (struct dssetup_DsRoleAbortDownlevelServerUpgrade *)_r;
 			r->out.result = _dssetup_DsRoleAbortDownlevelServerUpgrade(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_echo.c b/librpc/gen_ndr/srv_echo.c
index 6717e013a2..715f21e085 100644
--- a/librpc/gen_ndr/srv_echo.c
+++ b/librpc/gen_ndr/srv_echo.c
@@ -808,7 +808,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	switch (opnum)
 	{
 		case NDR_ECHO_ADDONE: {
-			struct echo_AddOne *r = _r;
+			struct echo_AddOne *r = (struct echo_AddOne *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.out_data = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.out_data == NULL) {
@@ -820,7 +820,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_ECHODATA: {
-			struct echo_EchoData *r = _r;
+			struct echo_EchoData *r = (struct echo_EchoData *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.out_data = talloc_zero_array(mem_ctx, uint8_t, r->in.len);
 			if (r->out.out_data == NULL) {
@@ -832,13 +832,13 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_SINKDATA: {
-			struct echo_SinkData *r = _r;
+			struct echo_SinkData *r = (struct echo_SinkData *)_r;
 			_echo_SinkData(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_ECHO_SOURCEDATA: {
-			struct echo_SourceData *r = _r;
+			struct echo_SourceData *r = (struct echo_SourceData *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.data = talloc_zero_array(mem_ctx, uint8_t, r->in.len);
 			if (r->out.data == NULL) {
@@ -850,7 +850,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_TESTCALL: {
-			struct echo_TestCall *r = _r;
+			struct echo_TestCall *r = (struct echo_TestCall *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.s2 = talloc_zero(mem_ctx, const char *);
 			if (r->out.s2 == NULL) {
@@ -862,7 +862,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_TESTCALL2: {
-			struct echo_TestCall2 *r = _r;
+			struct echo_TestCall2 *r = (struct echo_TestCall2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union echo_Info);
 			if (r->out.info == NULL) {
@@ -874,13 +874,13 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_TESTSLEEP: {
-			struct echo_TestSleep *r = _r;
+			struct echo_TestSleep *r = (struct echo_TestSleep *)_r;
 			r->out.result = _echo_TestSleep(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_ECHO_TESTENUM: {
-			struct echo_TestEnum *r = _r;
+			struct echo_TestEnum *r = (struct echo_TestEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.foo1 = r->in.foo1;
 			r->out.foo2 = r->in.foo2;
@@ -890,7 +890,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_TESTSURROUNDING: {
-			struct echo_TestSurrounding *r = _r;
+			struct echo_TestSurrounding *r = (struct echo_TestSurrounding *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.data = r->in.data;
 			_echo_TestSurrounding(cli->pipes_struct, r);
@@ -898,7 +898,7 @@ NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_ECHO_TESTDOUBLEPOINTER: {
-			struct echo_TestDoublePointer *r = _r;
+			struct echo_TestDoublePointer *r = (struct echo_TestDoublePointer *)_r;
 			r->out.result = _echo_TestDoublePointer(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_epmapper.c b/librpc/gen_ndr/srv_epmapper.c
index 95692906f4..7050b26ad1 100644
--- a/librpc/gen_ndr/srv_epmapper.c
+++ b/librpc/gen_ndr/srv_epmapper.c
@@ -649,19 +649,19 @@ NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	switch (opnum)
 	{
 		case NDR_EPM_INSERT: {
-			struct epm_Insert *r = _r;
+			struct epm_Insert *r = (struct epm_Insert *)_r;
 			r->out.result = _epm_Insert(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EPM_DELETE: {
-			struct epm_Delete *r = _r;
+			struct epm_Delete *r = (struct epm_Delete *)_r;
 			r->out.result = _epm_Delete(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EPM_LOOKUP: {
-			struct epm_Lookup *r = _r;
+			struct epm_Lookup *r = (struct epm_Lookup *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.entry_handle = r->in.entry_handle;
 			r->out.num_ents = talloc_zero(mem_ctx, uint32_t);
@@ -679,7 +679,7 @@ NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EPM_MAP: {
-			struct epm_Map *r = _r;
+			struct epm_Map *r = (struct epm_Map *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.entry_handle = r->in.entry_handle;
 			r->out.num_towers = talloc_zero(mem_ctx, uint32_t);
@@ -697,7 +697,7 @@ NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EPM_LOOKUPHANDLEFREE: {
-			struct epm_LookupHandleFree *r = _r;
+			struct epm_LookupHandleFree *r = (struct epm_LookupHandleFree *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.entry_handle = r->in.entry_handle;
 			r->out.result = _epm_LookupHandleFree(cli->pipes_struct, r);
@@ -705,19 +705,19 @@ NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EPM_INQOBJECT: {
-			struct epm_InqObject *r = _r;
+			struct epm_InqObject *r = (struct epm_InqObject *)_r;
 			r->out.result = _epm_InqObject(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EPM_MGMTDELETE: {
-			struct epm_MgmtDelete *r = _r;
+			struct epm_MgmtDelete *r = (struct epm_MgmtDelete *)_r;
 			r->out.result = _epm_MgmtDelete(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EPM_MAPAUTH: {
-			struct epm_MapAuth *r = _r;
+			struct epm_MapAuth *r = (struct epm_MapAuth *)_r;
 			r->out.result = _epm_MapAuth(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_eventlog.c b/librpc/gen_ndr/srv_eventlog.c
index 4782a9da2f..73c536d50f 100644
--- a/librpc/gen_ndr/srv_eventlog.c
+++ b/librpc/gen_ndr/srv_eventlog.c
@@ -1845,19 +1845,19 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	switch (opnum)
 	{
 		case NDR_EVENTLOG_CLEAREVENTLOGW: {
-			struct eventlog_ClearEventLogW *r = _r;
+			struct eventlog_ClearEventLogW *r = (struct eventlog_ClearEventLogW *)_r;
 			r->out.result = _eventlog_ClearEventLogW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_BACKUPEVENTLOGW: {
-			struct eventlog_BackupEventLogW *r = _r;
+			struct eventlog_BackupEventLogW *r = (struct eventlog_BackupEventLogW *)_r;
 			r->out.result = _eventlog_BackupEventLogW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_CLOSEEVENTLOG: {
-			struct eventlog_CloseEventLog *r = _r;
+			struct eventlog_CloseEventLog *r = (struct eventlog_CloseEventLog *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _eventlog_CloseEventLog(cli->pipes_struct, r);
@@ -1865,13 +1865,13 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EVENTLOG_DEREGISTEREVENTSOURCE: {
-			struct eventlog_DeregisterEventSource *r = _r;
+			struct eventlog_DeregisterEventSource *r = (struct eventlog_DeregisterEventSource *)_r;
 			r->out.result = _eventlog_DeregisterEventSource(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_GETNUMRECORDS: {
-			struct eventlog_GetNumRecords *r = _r;
+			struct eventlog_GetNumRecords *r = (struct eventlog_GetNumRecords *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.number = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.number == NULL) {
@@ -1883,7 +1883,7 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EVENTLOG_GETOLDESTRECORD: {
-			struct eventlog_GetOldestRecord *r = _r;
+			struct eventlog_GetOldestRecord *r = (struct eventlog_GetOldestRecord *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.oldest_entry = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.oldest_entry == NULL) {
@@ -1895,13 +1895,13 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EVENTLOG_CHANGENOTIFY: {
-			struct eventlog_ChangeNotify *r = _r;
+			struct eventlog_ChangeNotify *r = (struct eventlog_ChangeNotify *)_r;
 			r->out.result = _eventlog_ChangeNotify(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_OPENEVENTLOGW: {
-			struct eventlog_OpenEventLogW *r = _r;
+			struct eventlog_OpenEventLogW *r = (struct eventlog_OpenEventLogW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -1913,19 +1913,19 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EVENTLOG_REGISTEREVENTSOURCEW: {
-			struct eventlog_RegisterEventSourceW *r = _r;
+			struct eventlog_RegisterEventSourceW *r = (struct eventlog_RegisterEventSourceW *)_r;
 			r->out.result = _eventlog_RegisterEventSourceW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_OPENBACKUPEVENTLOGW: {
-			struct eventlog_OpenBackupEventLogW *r = _r;
+			struct eventlog_OpenBackupEventLogW *r = (struct eventlog_OpenBackupEventLogW *)_r;
 			r->out.result = _eventlog_OpenBackupEventLogW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_READEVENTLOGW: {
-			struct eventlog_ReadEventLogW *r = _r;
+			struct eventlog_ReadEventLogW *r = (struct eventlog_ReadEventLogW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.data = talloc_zero_array(mem_ctx, uint8_t, r->in.number_of_bytes);
 			if (r->out.data == NULL) {
@@ -1947,79 +1947,79 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_EVENTLOG_REPORTEVENTW: {
-			struct eventlog_ReportEventW *r = _r;
+			struct eventlog_ReportEventW *r = (struct eventlog_ReportEventW *)_r;
 			r->out.result = _eventlog_ReportEventW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_CLEAREVENTLOGA: {
-			struct eventlog_ClearEventLogA *r = _r;
+			struct eventlog_ClearEventLogA *r = (struct eventlog_ClearEventLogA *)_r;
 			r->out.result = _eventlog_ClearEventLogA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_BACKUPEVENTLOGA: {
-			struct eventlog_BackupEventLogA *r = _r;
+			struct eventlog_BackupEventLogA *r = (struct eventlog_BackupEventLogA *)_r;
 			r->out.result = _eventlog_BackupEventLogA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_OPENEVENTLOGA: {
-			struct eventlog_OpenEventLogA *r = _r;
+			struct eventlog_OpenEventLogA *r = (struct eventlog_OpenEventLogA *)_r;
 			r->out.result = _eventlog_OpenEventLogA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_REGISTEREVENTSOURCEA: {
-			struct eventlog_RegisterEventSourceA *r = _r;
+			struct eventlog_RegisterEventSourceA *r = (struct eventlog_RegisterEventSourceA *)_r;
 			r->out.result = _eventlog_RegisterEventSourceA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_OPENBACKUPEVENTLOGA: {
-			struct eventlog_OpenBackupEventLogA *r = _r;
+			struct eventlog_OpenBackupEventLogA *r = (struct eventlog_OpenBackupEventLogA *)_r;
 			r->out.result = _eventlog_OpenBackupEventLogA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_READEVENTLOGA: {
-			struct eventlog_ReadEventLogA *r = _r;
+			struct eventlog_ReadEventLogA *r = (struct eventlog_ReadEventLogA *)_r;
 			r->out.result = _eventlog_ReadEventLogA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_REPORTEVENTA: {
-			struct eventlog_ReportEventA *r = _r;
+			struct eventlog_ReportEventA *r = (struct eventlog_ReportEventA *)_r;
 			r->out.result = _eventlog_ReportEventA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_REGISTERCLUSTERSVC: {
-			struct eventlog_RegisterClusterSvc *r = _r;
+			struct eventlog_RegisterClusterSvc *r = (struct eventlog_RegisterClusterSvc *)_r;
 			r->out.result = _eventlog_RegisterClusterSvc(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_DEREGISTERCLUSTERSVC: {
-			struct eventlog_DeregisterClusterSvc *r = _r;
+			struct eventlog_DeregisterClusterSvc *r = (struct eventlog_DeregisterClusterSvc *)_r;
 			r->out.result = _eventlog_DeregisterClusterSvc(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_WRITECLUSTEREVENTS: {
-			struct eventlog_WriteClusterEvents *r = _r;
+			struct eventlog_WriteClusterEvents *r = (struct eventlog_WriteClusterEvents *)_r;
 			r->out.result = _eventlog_WriteClusterEvents(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_GETLOGINTORMATION: {
-			struct eventlog_GetLogIntormation *r = _r;
+			struct eventlog_GetLogIntormation *r = (struct eventlog_GetLogIntormation *)_r;
 			r->out.result = _eventlog_GetLogIntormation(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_EVENTLOG_FLUSHEVENTLOG: {
-			struct eventlog_FlushEventLog *r = _r;
+			struct eventlog_FlushEventLog *r = (struct eventlog_FlushEventLog *)_r;
 			r->out.result = _eventlog_FlushEventLog(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_initshutdown.c b/librpc/gen_ndr/srv_initshutdown.c
index 247d83fb03..c3d0a2f2ed 100644
--- a/librpc/gen_ndr/srv_initshutdown.c
+++ b/librpc/gen_ndr/srv_initshutdown.c
@@ -249,19 +249,19 @@ NTSTATUS rpc_initshutdown_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_
 	switch (opnum)
 	{
 		case NDR_INITSHUTDOWN_INIT: {
-			struct initshutdown_Init *r = _r;
+			struct initshutdown_Init *r = (struct initshutdown_Init *)_r;
 			r->out.result = _initshutdown_Init(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_INITSHUTDOWN_ABORT: {
-			struct initshutdown_Abort *r = _r;
+			struct initshutdown_Abort *r = (struct initshutdown_Abort *)_r;
 			r->out.result = _initshutdown_Abort(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_INITSHUTDOWN_INITEX: {
-			struct initshutdown_InitEx *r = _r;
+			struct initshutdown_InitEx *r = (struct initshutdown_InitEx *)_r;
 			r->out.result = _initshutdown_InitEx(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_lsa.c b/librpc/gen_ndr/srv_lsa.c
index 9e32e64ee9..c86d0857f8 100644
--- a/librpc/gen_ndr/srv_lsa.c
+++ b/librpc/gen_ndr/srv_lsa.c
@@ -6392,7 +6392,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_LSA_CLOSE: {
-			struct lsa_Close *r = _r;
+			struct lsa_Close *r = (struct lsa_Close *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _lsa_Close(cli->pipes_struct, r);
@@ -6400,13 +6400,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_DELETE: {
-			struct lsa_Delete *r = _r;
+			struct lsa_Delete *r = (struct lsa_Delete *)_r;
 			r->out.result = _lsa_Delete(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_ENUMPRIVS: {
-			struct lsa_EnumPrivs *r = _r;
+			struct lsa_EnumPrivs *r = (struct lsa_EnumPrivs *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.privs = talloc_zero(mem_ctx, struct lsa_PrivArray);
@@ -6419,7 +6419,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_QUERYSECURITY: {
-			struct lsa_QuerySecurity *r = _r;
+			struct lsa_QuerySecurity *r = (struct lsa_QuerySecurity *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sdbuf = talloc_zero(mem_ctx, struct sec_desc_buf *);
 			if (r->out.sdbuf == NULL) {
@@ -6431,19 +6431,19 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETSECOBJ: {
-			struct lsa_SetSecObj *r = _r;
+			struct lsa_SetSecObj *r = (struct lsa_SetSecObj *)_r;
 			r->out.result = _lsa_SetSecObj(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CHANGEPASSWORD: {
-			struct lsa_ChangePassword *r = _r;
+			struct lsa_ChangePassword *r = (struct lsa_ChangePassword *)_r;
 			r->out.result = _lsa_ChangePassword(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_OPENPOLICY: {
-			struct lsa_OpenPolicy *r = _r;
+			struct lsa_OpenPolicy *r = (struct lsa_OpenPolicy *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -6455,7 +6455,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_QUERYINFOPOLICY: {
-			struct lsa_QueryInfoPolicy *r = _r;
+			struct lsa_QueryInfoPolicy *r = (struct lsa_QueryInfoPolicy *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union lsa_PolicyInformation *);
 			if (r->out.info == NULL) {
@@ -6467,19 +6467,19 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETINFOPOLICY: {
-			struct lsa_SetInfoPolicy *r = _r;
+			struct lsa_SetInfoPolicy *r = (struct lsa_SetInfoPolicy *)_r;
 			r->out.result = _lsa_SetInfoPolicy(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CLEARAUDITLOG: {
-			struct lsa_ClearAuditLog *r = _r;
+			struct lsa_ClearAuditLog *r = (struct lsa_ClearAuditLog *)_r;
 			r->out.result = _lsa_ClearAuditLog(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREATEACCOUNT: {
-			struct lsa_CreateAccount *r = _r;
+			struct lsa_CreateAccount *r = (struct lsa_CreateAccount *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.acct_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.acct_handle == NULL) {
@@ -6491,7 +6491,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ENUMACCOUNTS: {
-			struct lsa_EnumAccounts *r = _r;
+			struct lsa_EnumAccounts *r = (struct lsa_EnumAccounts *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.sids = talloc_zero(mem_ctx, struct lsa_SidArray);
@@ -6504,7 +6504,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CREATETRUSTEDDOMAIN: {
-			struct lsa_CreateTrustedDomain *r = _r;
+			struct lsa_CreateTrustedDomain *r = (struct lsa_CreateTrustedDomain *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.trustdom_handle == NULL) {
@@ -6516,7 +6516,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ENUMTRUSTDOM: {
-			struct lsa_EnumTrustDom *r = _r;
+			struct lsa_EnumTrustDom *r = (struct lsa_EnumTrustDom *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.domains = talloc_zero(mem_ctx, struct lsa_DomainList);
@@ -6529,7 +6529,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPNAMES: {
-			struct lsa_LookupNames *r = _r;
+			struct lsa_LookupNames *r = (struct lsa_LookupNames *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sids = r->in.sids;
 			r->out.count = r->in.count;
@@ -6543,7 +6543,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPSIDS: {
-			struct lsa_LookupSids *r = _r;
+			struct lsa_LookupSids *r = (struct lsa_LookupSids *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.names = r->in.names;
 			r->out.count = r->in.count;
@@ -6557,7 +6557,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CREATESECRET: {
-			struct lsa_CreateSecret *r = _r;
+			struct lsa_CreateSecret *r = (struct lsa_CreateSecret *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sec_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.sec_handle == NULL) {
@@ -6569,7 +6569,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_OPENACCOUNT: {
-			struct lsa_OpenAccount *r = _r;
+			struct lsa_OpenAccount *r = (struct lsa_OpenAccount *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.acct_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.acct_handle == NULL) {
@@ -6581,7 +6581,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ENUMPRIVSACCOUNT: {
-			struct lsa_EnumPrivsAccount *r = _r;
+			struct lsa_EnumPrivsAccount *r = (struct lsa_EnumPrivsAccount *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.privs = talloc_zero(mem_ctx, struct lsa_PrivilegeSet *);
 			if (r->out.privs == NULL) {
@@ -6593,31 +6593,31 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ADDPRIVILEGESTOACCOUNT: {
-			struct lsa_AddPrivilegesToAccount *r = _r;
+			struct lsa_AddPrivilegesToAccount *r = (struct lsa_AddPrivilegesToAccount *)_r;
 			r->out.result = _lsa_AddPrivilegesToAccount(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT: {
-			struct lsa_RemovePrivilegesFromAccount *r = _r;
+			struct lsa_RemovePrivilegesFromAccount *r = (struct lsa_RemovePrivilegesFromAccount *)_r;
 			r->out.result = _lsa_RemovePrivilegesFromAccount(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_GETQUOTASFORACCOUNT: {
-			struct lsa_GetQuotasForAccount *r = _r;
+			struct lsa_GetQuotasForAccount *r = (struct lsa_GetQuotasForAccount *)_r;
 			r->out.result = _lsa_GetQuotasForAccount(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_SETQUOTASFORACCOUNT: {
-			struct lsa_SetQuotasForAccount *r = _r;
+			struct lsa_SetQuotasForAccount *r = (struct lsa_SetQuotasForAccount *)_r;
 			r->out.result = _lsa_SetQuotasForAccount(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_GETSYSTEMACCESSACCOUNT: {
-			struct lsa_GetSystemAccessAccount *r = _r;
+			struct lsa_GetSystemAccessAccount *r = (struct lsa_GetSystemAccessAccount *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.access_mask = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.access_mask == NULL) {
@@ -6629,13 +6629,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETSYSTEMACCESSACCOUNT: {
-			struct lsa_SetSystemAccessAccount *r = _r;
+			struct lsa_SetSystemAccessAccount *r = (struct lsa_SetSystemAccessAccount *)_r;
 			r->out.result = _lsa_SetSystemAccessAccount(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_OPENTRUSTEDDOMAIN: {
-			struct lsa_OpenTrustedDomain *r = _r;
+			struct lsa_OpenTrustedDomain *r = (struct lsa_OpenTrustedDomain *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.trustdom_handle == NULL) {
@@ -6647,7 +6647,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_QUERYTRUSTEDDOMAININFO: {
-			struct lsa_QueryTrustedDomainInfo *r = _r;
+			struct lsa_QueryTrustedDomainInfo *r = (struct lsa_QueryTrustedDomainInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo *);
 			if (r->out.info == NULL) {
@@ -6659,13 +6659,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN: {
-			struct lsa_SetInformationTrustedDomain *r = _r;
+			struct lsa_SetInformationTrustedDomain *r = (struct lsa_SetInformationTrustedDomain *)_r;
 			r->out.result = _lsa_SetInformationTrustedDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_OPENSECRET: {
-			struct lsa_OpenSecret *r = _r;
+			struct lsa_OpenSecret *r = (struct lsa_OpenSecret *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sec_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.sec_handle == NULL) {
@@ -6677,13 +6677,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETSECRET: {
-			struct lsa_SetSecret *r = _r;
+			struct lsa_SetSecret *r = (struct lsa_SetSecret *)_r;
 			r->out.result = _lsa_SetSecret(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_QUERYSECRET: {
-			struct lsa_QuerySecret *r = _r;
+			struct lsa_QuerySecret *r = (struct lsa_QuerySecret *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.new_val = r->in.new_val;
 			r->out.new_mtime = r->in.new_mtime;
@@ -6694,7 +6694,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPPRIVVALUE: {
-			struct lsa_LookupPrivValue *r = _r;
+			struct lsa_LookupPrivValue *r = (struct lsa_LookupPrivValue *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.luid = talloc_zero(mem_ctx, struct lsa_LUID);
 			if (r->out.luid == NULL) {
@@ -6706,7 +6706,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPPRIVNAME: {
-			struct lsa_LookupPrivName *r = _r;
+			struct lsa_LookupPrivName *r = (struct lsa_LookupPrivName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.name = talloc_zero(mem_ctx, struct lsa_StringLarge *);
 			if (r->out.name == NULL) {
@@ -6718,7 +6718,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPPRIVDISPLAYNAME: {
-			struct lsa_LookupPrivDisplayName *r = _r;
+			struct lsa_LookupPrivDisplayName *r = (struct lsa_LookupPrivDisplayName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.disp_name = talloc_zero(mem_ctx, struct lsa_StringLarge *);
 			if (r->out.disp_name == NULL) {
@@ -6735,7 +6735,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_DELETEOBJECT: {
-			struct lsa_DeleteObject *r = _r;
+			struct lsa_DeleteObject *r = (struct lsa_DeleteObject *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _lsa_DeleteObject(cli->pipes_struct, r);
@@ -6743,7 +6743,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT: {
-			struct lsa_EnumAccountsWithUserRight *r = _r;
+			struct lsa_EnumAccountsWithUserRight *r = (struct lsa_EnumAccountsWithUserRight *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sids = talloc_zero(mem_ctx, struct lsa_SidArray);
 			if (r->out.sids == NULL) {
@@ -6755,7 +6755,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ENUMACCOUNTRIGHTS: {
-			struct lsa_EnumAccountRights *r = _r;
+			struct lsa_EnumAccountRights *r = (struct lsa_EnumAccountRights *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rights = talloc_zero(mem_ctx, struct lsa_RightSet);
 			if (r->out.rights == NULL) {
@@ -6767,19 +6767,19 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_ADDACCOUNTRIGHTS: {
-			struct lsa_AddAccountRights *r = _r;
+			struct lsa_AddAccountRights *r = (struct lsa_AddAccountRights *)_r;
 			r->out.result = _lsa_AddAccountRights(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_REMOVEACCOUNTRIGHTS: {
-			struct lsa_RemoveAccountRights *r = _r;
+			struct lsa_RemoveAccountRights *r = (struct lsa_RemoveAccountRights *)_r;
 			r->out.result = _lsa_RemoveAccountRights(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID: {
-			struct lsa_QueryTrustedDomainInfoBySid *r = _r;
+			struct lsa_QueryTrustedDomainInfoBySid *r = (struct lsa_QueryTrustedDomainInfoBySid *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo *);
 			if (r->out.info == NULL) {
@@ -6791,31 +6791,31 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETTRUSTEDDOMAININFO: {
-			struct lsa_SetTrustedDomainInfo *r = _r;
+			struct lsa_SetTrustedDomainInfo *r = (struct lsa_SetTrustedDomainInfo *)_r;
 			r->out.result = _lsa_SetTrustedDomainInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_DELETETRUSTEDDOMAIN: {
-			struct lsa_DeleteTrustedDomain *r = _r;
+			struct lsa_DeleteTrustedDomain *r = (struct lsa_DeleteTrustedDomain *)_r;
 			r->out.result = _lsa_DeleteTrustedDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_STOREPRIVATEDATA: {
-			struct lsa_StorePrivateData *r = _r;
+			struct lsa_StorePrivateData *r = (struct lsa_StorePrivateData *)_r;
 			r->out.result = _lsa_StorePrivateData(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_RETRIEVEPRIVATEDATA: {
-			struct lsa_RetrievePrivateData *r = _r;
+			struct lsa_RetrievePrivateData *r = (struct lsa_RetrievePrivateData *)_r;
 			r->out.result = _lsa_RetrievePrivateData(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_OPENPOLICY2: {
-			struct lsa_OpenPolicy2 *r = _r;
+			struct lsa_OpenPolicy2 *r = (struct lsa_OpenPolicy2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -6827,7 +6827,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_GETUSERNAME: {
-			struct lsa_GetUserName *r = _r;
+			struct lsa_GetUserName *r = (struct lsa_GetUserName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.account_name = r->in.account_name;
 			r->out.authority_name = r->in.authority_name;
@@ -6836,7 +6836,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_QUERYINFOPOLICY2: {
-			struct lsa_QueryInfoPolicy2 *r = _r;
+			struct lsa_QueryInfoPolicy2 *r = (struct lsa_QueryInfoPolicy2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union lsa_PolicyInformation *);
 			if (r->out.info == NULL) {
@@ -6848,13 +6848,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETINFOPOLICY2: {
-			struct lsa_SetInfoPolicy2 *r = _r;
+			struct lsa_SetInfoPolicy2 *r = (struct lsa_SetInfoPolicy2 *)_r;
 			r->out.result = _lsa_SetInfoPolicy2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME: {
-			struct lsa_QueryTrustedDomainInfoByName *r = _r;
+			struct lsa_QueryTrustedDomainInfoByName *r = (struct lsa_QueryTrustedDomainInfoByName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union lsa_TrustedDomainInfo *);
 			if (r->out.info == NULL) {
@@ -6866,13 +6866,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETTRUSTEDDOMAININFOBYNAME: {
-			struct lsa_SetTrustedDomainInfoByName *r = _r;
+			struct lsa_SetTrustedDomainInfoByName *r = (struct lsa_SetTrustedDomainInfoByName *)_r;
 			r->out.result = _lsa_SetTrustedDomainInfoByName(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_ENUMTRUSTEDDOMAINSEX: {
-			struct lsa_EnumTrustedDomainsEx *r = _r;
+			struct lsa_EnumTrustedDomainsEx *r = (struct lsa_EnumTrustedDomainsEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.domains = talloc_zero(mem_ctx, struct lsa_DomainListEx);
@@ -6885,7 +6885,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CREATETRUSTEDDOMAINEX: {
-			struct lsa_CreateTrustedDomainEx *r = _r;
+			struct lsa_CreateTrustedDomainEx *r = (struct lsa_CreateTrustedDomainEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.trustdom_handle == NULL) {
@@ -6897,7 +6897,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CLOSETRUSTEDDOMAINEX: {
-			struct lsa_CloseTrustedDomainEx *r = _r;
+			struct lsa_CloseTrustedDomainEx *r = (struct lsa_CloseTrustedDomainEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _lsa_CloseTrustedDomainEx(cli->pipes_struct, r);
@@ -6905,7 +6905,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_QUERYDOMAININFORMATIONPOLICY: {
-			struct lsa_QueryDomainInformationPolicy *r = _r;
+			struct lsa_QueryDomainInformationPolicy *r = (struct lsa_QueryDomainInformationPolicy *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union lsa_DomainInformationPolicy *);
 			if (r->out.info == NULL) {
@@ -6917,13 +6917,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_SETDOMAININFORMATIONPOLICY: {
-			struct lsa_SetDomainInformationPolicy *r = _r;
+			struct lsa_SetDomainInformationPolicy *r = (struct lsa_SetDomainInformationPolicy *)_r;
 			r->out.result = _lsa_SetDomainInformationPolicy(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_OPENTRUSTEDDOMAINBYNAME: {
-			struct lsa_OpenTrustedDomainByName *r = _r;
+			struct lsa_OpenTrustedDomainByName *r = (struct lsa_OpenTrustedDomainByName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.trustdom_handle == NULL) {
@@ -6935,13 +6935,13 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_TESTCALL: {
-			struct lsa_TestCall *r = _r;
+			struct lsa_TestCall *r = (struct lsa_TestCall *)_r;
 			r->out.result = _lsa_TestCall(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LOOKUPSIDS2: {
-			struct lsa_LookupSids2 *r = _r;
+			struct lsa_LookupSids2 *r = (struct lsa_LookupSids2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.names = r->in.names;
 			r->out.count = r->in.count;
@@ -6955,7 +6955,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPNAMES2: {
-			struct lsa_LookupNames2 *r = _r;
+			struct lsa_LookupNames2 *r = (struct lsa_LookupNames2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sids = r->in.sids;
 			r->out.count = r->in.count;
@@ -6969,7 +6969,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CREATETRUSTEDDOMAINEX2: {
-			struct lsa_CreateTrustedDomainEx2 *r = _r;
+			struct lsa_CreateTrustedDomainEx2 *r = (struct lsa_CreateTrustedDomainEx2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trustdom_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.trustdom_handle == NULL) {
@@ -6981,55 +6981,55 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CREDRWRITE: {
-			struct lsa_CREDRWRITE *r = _r;
+			struct lsa_CREDRWRITE *r = (struct lsa_CREDRWRITE *)_r;
 			r->out.result = _lsa_CREDRWRITE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRREAD: {
-			struct lsa_CREDRREAD *r = _r;
+			struct lsa_CREDRREAD *r = (struct lsa_CREDRREAD *)_r;
 			r->out.result = _lsa_CREDRREAD(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRENUMERATE: {
-			struct lsa_CREDRENUMERATE *r = _r;
+			struct lsa_CREDRENUMERATE *r = (struct lsa_CREDRENUMERATE *)_r;
 			r->out.result = _lsa_CREDRENUMERATE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRWRITEDOMAINCREDENTIALS: {
-			struct lsa_CREDRWRITEDOMAINCREDENTIALS *r = _r;
+			struct lsa_CREDRWRITEDOMAINCREDENTIALS *r = (struct lsa_CREDRWRITEDOMAINCREDENTIALS *)_r;
 			r->out.result = _lsa_CREDRWRITEDOMAINCREDENTIALS(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRREADDOMAINCREDENTIALS: {
-			struct lsa_CREDRREADDOMAINCREDENTIALS *r = _r;
+			struct lsa_CREDRREADDOMAINCREDENTIALS *r = (struct lsa_CREDRREADDOMAINCREDENTIALS *)_r;
 			r->out.result = _lsa_CREDRREADDOMAINCREDENTIALS(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRDELETE: {
-			struct lsa_CREDRDELETE *r = _r;
+			struct lsa_CREDRDELETE *r = (struct lsa_CREDRDELETE *)_r;
 			r->out.result = _lsa_CREDRDELETE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRGETTARGETINFO: {
-			struct lsa_CREDRGETTARGETINFO *r = _r;
+			struct lsa_CREDRGETTARGETINFO *r = (struct lsa_CREDRGETTARGETINFO *)_r;
 			r->out.result = _lsa_CREDRGETTARGETINFO(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRPROFILELOADED: {
-			struct lsa_CREDRPROFILELOADED *r = _r;
+			struct lsa_CREDRPROFILELOADED *r = (struct lsa_CREDRPROFILELOADED *)_r;
 			r->out.result = _lsa_CREDRPROFILELOADED(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LOOKUPNAMES3: {
-			struct lsa_LookupNames3 *r = _r;
+			struct lsa_LookupNames3 *r = (struct lsa_LookupNames3 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sids = r->in.sids;
 			r->out.count = r->in.count;
@@ -7043,31 +7043,31 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_CREDRGETSESSIONTYPES: {
-			struct lsa_CREDRGETSESSIONTYPES *r = _r;
+			struct lsa_CREDRGETSESSIONTYPES *r = (struct lsa_CREDRGETSESSIONTYPES *)_r;
 			r->out.result = _lsa_CREDRGETSESSIONTYPES(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARREGISTERAUDITEVENT: {
-			struct lsa_LSARREGISTERAUDITEVENT *r = _r;
+			struct lsa_LSARREGISTERAUDITEVENT *r = (struct lsa_LSARREGISTERAUDITEVENT *)_r;
 			r->out.result = _lsa_LSARREGISTERAUDITEVENT(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARGENAUDITEVENT: {
-			struct lsa_LSARGENAUDITEVENT *r = _r;
+			struct lsa_LSARGENAUDITEVENT *r = (struct lsa_LSARGENAUDITEVENT *)_r;
 			r->out.result = _lsa_LSARGENAUDITEVENT(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARUNREGISTERAUDITEVENT: {
-			struct lsa_LSARUNREGISTERAUDITEVENT *r = _r;
+			struct lsa_LSARUNREGISTERAUDITEVENT *r = (struct lsa_LSARUNREGISTERAUDITEVENT *)_r;
 			r->out.result = _lsa_LSARUNREGISTERAUDITEVENT(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION: {
-			struct lsa_lsaRQueryForestTrustInformation *r = _r;
+			struct lsa_lsaRQueryForestTrustInformation *r = (struct lsa_lsaRQueryForestTrustInformation *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.forest_trust_info = talloc_zero(mem_ctx, struct lsa_ForestTrustInformation *);
 			if (r->out.forest_trust_info == NULL) {
@@ -7079,19 +7079,19 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LSARSETFORESTTRUSTINFORMATION: {
-			struct lsa_LSARSETFORESTTRUSTINFORMATION *r = _r;
+			struct lsa_LSARSETFORESTTRUSTINFORMATION *r = (struct lsa_LSARSETFORESTTRUSTINFORMATION *)_r;
 			r->out.result = _lsa_LSARSETFORESTTRUSTINFORMATION(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_CREDRRENAME: {
-			struct lsa_CREDRRENAME *r = _r;
+			struct lsa_CREDRRENAME *r = (struct lsa_CREDRRENAME *)_r;
 			r->out.result = _lsa_CREDRRENAME(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LOOKUPSIDS3: {
-			struct lsa_LookupSids3 *r = _r;
+			struct lsa_LookupSids3 *r = (struct lsa_LookupSids3 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.names = r->in.names;
 			r->out.count = r->in.count;
@@ -7105,7 +7105,7 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LOOKUPNAMES4: {
-			struct lsa_LookupNames4 *r = _r;
+			struct lsa_LookupNames4 *r = (struct lsa_LookupNames4 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sids = r->in.sids;
 			r->out.count = r->in.count;
@@ -7119,25 +7119,25 @@ NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_LSA_LSAROPENPOLICYSCE: {
-			struct lsa_LSAROPENPOLICYSCE *r = _r;
+			struct lsa_LSAROPENPOLICYSCE *r = (struct lsa_LSAROPENPOLICYSCE *)_r;
 			r->out.result = _lsa_LSAROPENPOLICYSCE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE: {
-			struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE *r = _r;
+			struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE *r = (struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE *)_r;
 			r->out.result = _lsa_LSARADTREGISTERSECURITYEVENTSOURCE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE: {
-			struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *r = _r;
+			struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *r = (struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *)_r;
 			r->out.result = _lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_LSA_LSARADTREPORTSECURITYEVENT: {
-			struct lsa_LSARADTREPORTSECURITYEVENT *r = _r;
+			struct lsa_LSARADTREPORTSECURITYEVENT *r = (struct lsa_LSARADTREPORTSECURITYEVENT *)_r;
 			r->out.result = _lsa_LSARADTREPORTSECURITYEVENT(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_netlogon.c b/librpc/gen_ndr/srv_netlogon.c
index c1e3a8aafd..398146e566 100644
--- a/librpc/gen_ndr/srv_netlogon.c
+++ b/librpc/gen_ndr/srv_netlogon.c
@@ -3899,7 +3899,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	switch (opnum)
 	{
 		case NDR_NETR_LOGONUASLOGON: {
-			struct netr_LogonUasLogon *r = _r;
+			struct netr_LogonUasLogon *r = (struct netr_LogonUasLogon *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct netr_UasInfo *);
 			if (r->out.info == NULL) {
@@ -3911,7 +3911,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONUASLOGOFF: {
-			struct netr_LogonUasLogoff *r = _r;
+			struct netr_LogonUasLogoff *r = (struct netr_LogonUasLogoff *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct netr_UasLogoffInfo);
 			if (r->out.info == NULL) {
@@ -3923,7 +3923,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONSAMLOGON: {
-			struct netr_LogonSamLogon *r = _r;
+			struct netr_LogonSamLogon *r = (struct netr_LogonSamLogon *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.validation = talloc_zero(mem_ctx, union netr_Validation);
@@ -3941,7 +3941,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONSAMLOGOFF: {
-			struct netr_LogonSamLogoff *r = _r;
+			struct netr_LogonSamLogoff *r = (struct netr_LogonSamLogoff *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.result = _netr_LogonSamLogoff(cli->pipes_struct, r);
@@ -3949,7 +3949,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERREQCHALLENGE: {
-			struct netr_ServerReqChallenge *r = _r;
+			struct netr_ServerReqChallenge *r = (struct netr_ServerReqChallenge *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_credentials = talloc_zero(mem_ctx, struct netr_Credential);
 			if (r->out.return_credentials == NULL) {
@@ -3961,7 +3961,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERAUTHENTICATE: {
-			struct netr_ServerAuthenticate *r = _r;
+			struct netr_ServerAuthenticate *r = (struct netr_ServerAuthenticate *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_credentials = talloc_zero(mem_ctx, struct netr_Credential);
 			if (r->out.return_credentials == NULL) {
@@ -3973,7 +3973,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERPASSWORDSET: {
-			struct netr_ServerPasswordSet *r = _r;
+			struct netr_ServerPasswordSet *r = (struct netr_ServerPasswordSet *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 			if (r->out.return_authenticator == NULL) {
@@ -3985,7 +3985,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DATABASEDELTAS: {
-			struct netr_DatabaseDeltas *r = _r;
+			struct netr_DatabaseDeltas *r = (struct netr_DatabaseDeltas *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.sequence_num = r->in.sequence_num;
@@ -3999,7 +3999,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DATABASESYNC: {
-			struct netr_DatabaseSync *r = _r;
+			struct netr_DatabaseSync *r = (struct netr_DatabaseSync *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.sync_context = r->in.sync_context;
@@ -4013,7 +4013,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_ACCOUNTDELTAS: {
-			struct netr_AccountDeltas *r = _r;
+			struct netr_AccountDeltas *r = (struct netr_AccountDeltas *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.buffer = talloc_zero(mem_ctx, struct netr_AccountBuffer);
@@ -4041,7 +4041,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_ACCOUNTSYNC: {
-			struct netr_AccountSync *r = _r;
+			struct netr_AccountSync *r = (struct netr_AccountSync *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.recordid = r->in.recordid;
@@ -4070,7 +4070,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_GETDCNAME: {
-			struct netr_GetDcName *r = _r;
+			struct netr_GetDcName *r = (struct netr_GetDcName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.dcname = talloc_zero(mem_ctx, const char *);
 			if (r->out.dcname == NULL) {
@@ -4082,7 +4082,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONCONTROL: {
-			struct netr_LogonControl *r = _r;
+			struct netr_LogonControl *r = (struct netr_LogonControl *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union netr_CONTROL_QUERY_INFORMATION);
 			if (r->out.info == NULL) {
@@ -4094,7 +4094,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_GETANYDCNAME: {
-			struct netr_GetAnyDCName *r = _r;
+			struct netr_GetAnyDCName *r = (struct netr_GetAnyDCName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.dcname = talloc_zero(mem_ctx, const char *);
 			if (r->out.dcname == NULL) {
@@ -4106,7 +4106,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONCONTROL2: {
-			struct netr_LogonControl2 *r = _r;
+			struct netr_LogonControl2 *r = (struct netr_LogonControl2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.query = talloc_zero(mem_ctx, union netr_CONTROL_QUERY_INFORMATION);
 			if (r->out.query == NULL) {
@@ -4118,7 +4118,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERAUTHENTICATE2: {
-			struct netr_ServerAuthenticate2 *r = _r;
+			struct netr_ServerAuthenticate2 *r = (struct netr_ServerAuthenticate2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.negotiate_flags = r->in.negotiate_flags;
 			r->out.return_credentials = talloc_zero(mem_ctx, struct netr_Credential);
@@ -4131,7 +4131,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DATABASESYNC2: {
-			struct netr_DatabaseSync2 *r = _r;
+			struct netr_DatabaseSync2 *r = (struct netr_DatabaseSync2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.sync_context = r->in.sync_context;
@@ -4145,7 +4145,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DATABASEREDO: {
-			struct netr_DatabaseRedo *r = _r;
+			struct netr_DatabaseRedo *r = (struct netr_DatabaseRedo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.delta_enum_array = talloc_zero(mem_ctx, struct netr_DELTA_ENUM_ARRAY *);
@@ -4158,7 +4158,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONCONTROL2EX: {
-			struct netr_LogonControl2Ex *r = _r;
+			struct netr_LogonControl2Ex *r = (struct netr_LogonControl2Ex *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.query = talloc_zero(mem_ctx, union netr_CONTROL_QUERY_INFORMATION);
 			if (r->out.query == NULL) {
@@ -4170,7 +4170,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_NETRENUMERATETRUSTEDDOMAINS: {
-			struct netr_NetrEnumerateTrustedDomains *r = _r;
+			struct netr_NetrEnumerateTrustedDomains *r = (struct netr_NetrEnumerateTrustedDomains *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trusted_domains_blob = talloc_zero(mem_ctx, struct netr_Blob);
 			if (r->out.trusted_domains_blob == NULL) {
@@ -4182,7 +4182,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRGETDCNAME: {
-			struct netr_DsRGetDCName *r = _r;
+			struct netr_DsRGetDCName *r = (struct netr_DsRGetDCName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo *);
 			if (r->out.info == NULL) {
@@ -4194,19 +4194,19 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_NETRLOGONDUMMYROUTINE1: {
-			struct netr_NETRLOGONDUMMYROUTINE1 *r = _r;
+			struct netr_NETRLOGONDUMMYROUTINE1 *r = (struct netr_NETRLOGONDUMMYROUTINE1 *)_r;
 			r->out.result = _netr_NETRLOGONDUMMYROUTINE1(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_NETRLOGONSETSERVICEBITS: {
-			struct netr_NETRLOGONSETSERVICEBITS *r = _r;
+			struct netr_NETRLOGONSETSERVICEBITS *r = (struct netr_NETRLOGONSETSERVICEBITS *)_r;
 			r->out.result = _netr_NETRLOGONSETSERVICEBITS(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_LOGONGETTRUSTRID: {
-			struct netr_LogonGetTrustRid *r = _r;
+			struct netr_LogonGetTrustRid *r = (struct netr_LogonGetTrustRid *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rid = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.rid == NULL) {
@@ -4218,19 +4218,19 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST: {
-			struct netr_NETRLOGONCOMPUTESERVERDIGEST *r = _r;
+			struct netr_NETRLOGONCOMPUTESERVERDIGEST *r = (struct netr_NETRLOGONCOMPUTESERVERDIGEST *)_r;
 			r->out.result = _netr_NETRLOGONCOMPUTESERVERDIGEST(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST: {
-			struct netr_NETRLOGONCOMPUTECLIENTDIGEST *r = _r;
+			struct netr_NETRLOGONCOMPUTECLIENTDIGEST *r = (struct netr_NETRLOGONCOMPUTECLIENTDIGEST *)_r;
 			r->out.result = _netr_NETRLOGONCOMPUTECLIENTDIGEST(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_SERVERAUTHENTICATE3: {
-			struct netr_ServerAuthenticate3 *r = _r;
+			struct netr_ServerAuthenticate3 *r = (struct netr_ServerAuthenticate3 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.negotiate_flags = r->in.negotiate_flags;
 			r->out.return_credentials = talloc_zero(mem_ctx, struct netr_Credential);
@@ -4248,7 +4248,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRGETDCNAMEEX: {
-			struct netr_DsRGetDCNameEx *r = _r;
+			struct netr_DsRGetDCNameEx *r = (struct netr_DsRGetDCNameEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo *);
 			if (r->out.info == NULL) {
@@ -4260,7 +4260,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRGETSITENAME: {
-			struct netr_DsRGetSiteName *r = _r;
+			struct netr_DsRGetSiteName *r = (struct netr_DsRGetSiteName *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.site = talloc_zero(mem_ctx, const char *);
 			if (r->out.site == NULL) {
@@ -4272,7 +4272,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONGETDOMAININFO: {
-			struct netr_LogonGetDomainInfo *r = _r;
+			struct netr_LogonGetDomainInfo *r = (struct netr_LogonGetDomainInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.info = talloc_zero(mem_ctx, union netr_DomainInfo);
@@ -4285,7 +4285,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERPASSWORDSET2: {
-			struct netr_ServerPasswordSet2 *r = _r;
+			struct netr_ServerPasswordSet2 *r = (struct netr_ServerPasswordSet2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 			if (r->out.return_authenticator == NULL) {
@@ -4297,7 +4297,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERPASSWORDGET: {
-			struct netr_ServerPasswordGet *r = _r;
+			struct netr_ServerPasswordGet *r = (struct netr_ServerPasswordGet *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 			if (r->out.return_authenticator == NULL) {
@@ -4314,13 +4314,13 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_NETRLOGONSENDTOSAM: {
-			struct netr_NETRLOGONSENDTOSAM *r = _r;
+			struct netr_NETRLOGONSENDTOSAM *r = (struct netr_NETRLOGONSENDTOSAM *)_r;
 			r->out.result = _netr_NETRLOGONSENDTOSAM(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_DSRADDRESSTOSITENAMESW: {
-			struct netr_DsRAddressToSitenamesW *r = _r;
+			struct netr_DsRAddressToSitenamesW *r = (struct netr_DsRAddressToSitenamesW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.ctr = talloc_zero(mem_ctx, struct netr_DsRAddressToSitenamesWCtr *);
 			if (r->out.ctr == NULL) {
@@ -4332,7 +4332,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRGETDCNAMEEX2: {
-			struct netr_DsRGetDCNameEx2 *r = _r;
+			struct netr_DsRGetDCNameEx2 *r = (struct netr_DsRGetDCNameEx2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct netr_DsRGetDCNameInfo *);
 			if (r->out.info == NULL) {
@@ -4344,13 +4344,13 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN: {
-			struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN *r = _r;
+			struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN *r = (struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN *)_r;
 			r->out.result = _netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX: {
-			struct netr_NetrEnumerateTrustedDomainsEx *r = _r;
+			struct netr_NetrEnumerateTrustedDomainsEx *r = (struct netr_NetrEnumerateTrustedDomainsEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.dom_trust_list = talloc_zero(mem_ctx, struct netr_DomainTrustList);
 			if (r->out.dom_trust_list == NULL) {
@@ -4362,7 +4362,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRADDRESSTOSITENAMESEXW: {
-			struct netr_DsRAddressToSitenamesExW *r = _r;
+			struct netr_DsRAddressToSitenamesExW *r = (struct netr_DsRAddressToSitenamesExW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.ctr = talloc_zero(mem_ctx, struct netr_DsRAddressToSitenamesExWCtr *);
 			if (r->out.ctr == NULL) {
@@ -4374,7 +4374,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRGETDCSITECOVERAGEW: {
-			struct netr_DsrGetDcSiteCoverageW *r = _r;
+			struct netr_DsrGetDcSiteCoverageW *r = (struct netr_DsrGetDcSiteCoverageW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.ctr = talloc_zero(mem_ctx, struct DcSitesCtr *);
 			if (r->out.ctr == NULL) {
@@ -4386,7 +4386,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONSAMLOGONEX: {
-			struct netr_LogonSamLogonEx *r = _r;
+			struct netr_LogonSamLogonEx *r = (struct netr_LogonSamLogonEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.flags = r->in.flags;
 			r->out.validation = talloc_zero(mem_ctx, union netr_Validation);
@@ -4404,7 +4404,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRENUMERATEDOMAINTRUSTS: {
-			struct netr_DsrEnumerateDomainTrusts *r = _r;
+			struct netr_DsrEnumerateDomainTrusts *r = (struct netr_DsrEnumerateDomainTrusts *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.trusts = talloc_zero(mem_ctx, struct netr_DomainTrustList);
 			if (r->out.trusts == NULL) {
@@ -4416,13 +4416,13 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS: {
-			struct netr_DsrDeregisterDNSHostRecords *r = _r;
+			struct netr_DsrDeregisterDNSHostRecords *r = (struct netr_DsrDeregisterDNSHostRecords *)_r;
 			r->out.result = _netr_DsrDeregisterDNSHostRecords(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_NETR_SERVERTRUSTPASSWORDSGET: {
-			struct netr_ServerTrustPasswordsGet *r = _r;
+			struct netr_ServerTrustPasswordsGet *r = (struct netr_ServerTrustPasswordsGet *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 			if (r->out.return_authenticator == NULL) {
@@ -4444,7 +4444,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_DSRGETFORESTTRUSTINFORMATION: {
-			struct netr_DsRGetForestTrustInformation *r = _r;
+			struct netr_DsRGetForestTrustInformation *r = (struct netr_DsRGetForestTrustInformation *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.forest_trust_info = talloc_zero(mem_ctx, struct lsa_ForestTrustInformation *);
 			if (r->out.forest_trust_info == NULL) {
@@ -4456,7 +4456,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_GETFORESTTRUSTINFORMATION: {
-			struct netr_GetForestTrustInformation *r = _r;
+			struct netr_GetForestTrustInformation *r = (struct netr_GetForestTrustInformation *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 			if (r->out.return_authenticator == NULL) {
@@ -4473,7 +4473,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_LOGONSAMLOGONWITHFLAGS: {
-			struct netr_LogonSamLogonWithFlags *r = _r;
+			struct netr_LogonSamLogonWithFlags *r = (struct netr_LogonSamLogonWithFlags *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = r->in.return_authenticator;
 			r->out.flags = r->in.flags;
@@ -4492,7 +4492,7 @@ NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 		}
 
 		case NDR_NETR_SERVERGETTRUSTINFO: {
-			struct netr_ServerGetTrustInfo *r = _r;
+			struct netr_ServerGetTrustInfo *r = (struct netr_ServerGetTrustInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.return_authenticator = talloc_zero(mem_ctx, struct netr_Authenticator);
 			if (r->out.return_authenticator == NULL) {
diff --git a/librpc/gen_ndr/srv_ntsvcs.c b/librpc/gen_ndr/srv_ntsvcs.c
index 50907acd31..de2bb6d4a3 100644
--- a/librpc/gen_ndr/srv_ntsvcs.c
+++ b/librpc/gen_ndr/srv_ntsvcs.c
@@ -4880,19 +4880,19 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_PNP_DISCONNECT: {
-			struct PNP_Disconnect *r = _r;
+			struct PNP_Disconnect *r = (struct PNP_Disconnect *)_r;
 			r->out.result = _PNP_Disconnect(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_CONNECT: {
-			struct PNP_Connect *r = _r;
+			struct PNP_Connect *r = (struct PNP_Connect *)_r;
 			r->out.result = _PNP_Connect(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETVERSION: {
-			struct PNP_GetVersion *r = _r;
+			struct PNP_GetVersion *r = (struct PNP_GetVersion *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.version = talloc_zero(mem_ctx, uint16_t);
 			if (r->out.version == NULL) {
@@ -4904,49 +4904,49 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_PNP_GETGLOBALSTATE: {
-			struct PNP_GetGlobalState *r = _r;
+			struct PNP_GetGlobalState *r = (struct PNP_GetGlobalState *)_r;
 			r->out.result = _PNP_GetGlobalState(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_INITDETECTION: {
-			struct PNP_InitDetection *r = _r;
+			struct PNP_InitDetection *r = (struct PNP_InitDetection *)_r;
 			r->out.result = _PNP_InitDetection(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_REPORTLOGON: {
-			struct PNP_ReportLogOn *r = _r;
+			struct PNP_ReportLogOn *r = (struct PNP_ReportLogOn *)_r;
 			r->out.result = _PNP_ReportLogOn(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_VALIDATEDEVICEINSTANCE: {
-			struct PNP_ValidateDeviceInstance *r = _r;
+			struct PNP_ValidateDeviceInstance *r = (struct PNP_ValidateDeviceInstance *)_r;
 			r->out.result = _PNP_ValidateDeviceInstance(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETROOTDEVICEINSTANCE: {
-			struct PNP_GetRootDeviceInstance *r = _r;
+			struct PNP_GetRootDeviceInstance *r = (struct PNP_GetRootDeviceInstance *)_r;
 			r->out.result = _PNP_GetRootDeviceInstance(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETRELATEDDEVICEINSTANCE: {
-			struct PNP_GetRelatedDeviceInstance *r = _r;
+			struct PNP_GetRelatedDeviceInstance *r = (struct PNP_GetRelatedDeviceInstance *)_r;
 			r->out.result = _PNP_GetRelatedDeviceInstance(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_ENUMERATESUBKEYS: {
-			struct PNP_EnumerateSubKeys *r = _r;
+			struct PNP_EnumerateSubKeys *r = (struct PNP_EnumerateSubKeys *)_r;
 			r->out.result = _PNP_EnumerateSubKeys(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETDEVICELIST: {
-			struct PNP_GetDeviceList *r = _r;
+			struct PNP_GetDeviceList *r = (struct PNP_GetDeviceList *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.length = r->in.length;
 			r->out.buffer = talloc_zero_array(mem_ctx, uint16_t, *r->out.length);
@@ -4959,7 +4959,7 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_PNP_GETDEVICELISTSIZE: {
-			struct PNP_GetDeviceListSize *r = _r;
+			struct PNP_GetDeviceListSize *r = (struct PNP_GetDeviceListSize *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.size = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.size == NULL) {
@@ -4971,13 +4971,13 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_PNP_GETDEPTH: {
-			struct PNP_GetDepth *r = _r;
+			struct PNP_GetDepth *r = (struct PNP_GetDepth *)_r;
 			r->out.result = _PNP_GetDepth(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETDEVICEREGPROP: {
-			struct PNP_GetDeviceRegProp *r = _r;
+			struct PNP_GetDeviceRegProp *r = (struct PNP_GetDeviceRegProp *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.reg_data_type = r->in.reg_data_type;
 			r->out.buffer_size = r->in.buffer_size;
@@ -4992,163 +4992,163 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_PNP_SETDEVICEREGPROP: {
-			struct PNP_SetDeviceRegProp *r = _r;
+			struct PNP_SetDeviceRegProp *r = (struct PNP_SetDeviceRegProp *)_r;
 			r->out.result = _PNP_SetDeviceRegProp(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETCLASSINSTANCE: {
-			struct PNP_GetClassInstance *r = _r;
+			struct PNP_GetClassInstance *r = (struct PNP_GetClassInstance *)_r;
 			r->out.result = _PNP_GetClassInstance(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_CREATEKEY: {
-			struct PNP_CreateKey *r = _r;
+			struct PNP_CreateKey *r = (struct PNP_CreateKey *)_r;
 			r->out.result = _PNP_CreateKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_DELETEREGISTRYKEY: {
-			struct PNP_DeleteRegistryKey *r = _r;
+			struct PNP_DeleteRegistryKey *r = (struct PNP_DeleteRegistryKey *)_r;
 			r->out.result = _PNP_DeleteRegistryKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETCLASSCOUNT: {
-			struct PNP_GetClassCount *r = _r;
+			struct PNP_GetClassCount *r = (struct PNP_GetClassCount *)_r;
 			r->out.result = _PNP_GetClassCount(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETCLASSNAME: {
-			struct PNP_GetClassName *r = _r;
+			struct PNP_GetClassName *r = (struct PNP_GetClassName *)_r;
 			r->out.result = _PNP_GetClassName(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_DELETECLASSKEY: {
-			struct PNP_DeleteClassKey *r = _r;
+			struct PNP_DeleteClassKey *r = (struct PNP_DeleteClassKey *)_r;
 			r->out.result = _PNP_DeleteClassKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETINTERFACEDEVICEALIAS: {
-			struct PNP_GetInterfaceDeviceAlias *r = _r;
+			struct PNP_GetInterfaceDeviceAlias *r = (struct PNP_GetInterfaceDeviceAlias *)_r;
 			r->out.result = _PNP_GetInterfaceDeviceAlias(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETINTERFACEDEVICELIST: {
-			struct PNP_GetInterfaceDeviceList *r = _r;
+			struct PNP_GetInterfaceDeviceList *r = (struct PNP_GetInterfaceDeviceList *)_r;
 			r->out.result = _PNP_GetInterfaceDeviceList(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETINTERFACEDEVICELISTSIZE: {
-			struct PNP_GetInterfaceDeviceListSize *r = _r;
+			struct PNP_GetInterfaceDeviceListSize *r = (struct PNP_GetInterfaceDeviceListSize *)_r;
 			r->out.result = _PNP_GetInterfaceDeviceListSize(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_REGISTERDEVICECLASSASSOCIATION: {
-			struct PNP_RegisterDeviceClassAssociation *r = _r;
+			struct PNP_RegisterDeviceClassAssociation *r = (struct PNP_RegisterDeviceClassAssociation *)_r;
 			r->out.result = _PNP_RegisterDeviceClassAssociation(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_UNREGISTERDEVICECLASSASSOCIATION: {
-			struct PNP_UnregisterDeviceClassAssociation *r = _r;
+			struct PNP_UnregisterDeviceClassAssociation *r = (struct PNP_UnregisterDeviceClassAssociation *)_r;
 			r->out.result = _PNP_UnregisterDeviceClassAssociation(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETCLASSREGPROP: {
-			struct PNP_GetClassRegProp *r = _r;
+			struct PNP_GetClassRegProp *r = (struct PNP_GetClassRegProp *)_r;
 			r->out.result = _PNP_GetClassRegProp(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_SETCLASSREGPROP: {
-			struct PNP_SetClassRegProp *r = _r;
+			struct PNP_SetClassRegProp *r = (struct PNP_SetClassRegProp *)_r;
 			r->out.result = _PNP_SetClassRegProp(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_CREATEDEVINST: {
-			struct PNP_CreateDevInst *r = _r;
+			struct PNP_CreateDevInst *r = (struct PNP_CreateDevInst *)_r;
 			r->out.result = _PNP_CreateDevInst(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_DEVICEINSTANCEACTION: {
-			struct PNP_DeviceInstanceAction *r = _r;
+			struct PNP_DeviceInstanceAction *r = (struct PNP_DeviceInstanceAction *)_r;
 			r->out.result = _PNP_DeviceInstanceAction(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETDEVICESTATUS: {
-			struct PNP_GetDeviceStatus *r = _r;
+			struct PNP_GetDeviceStatus *r = (struct PNP_GetDeviceStatus *)_r;
 			r->out.result = _PNP_GetDeviceStatus(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_SETDEVICEPROBLEM: {
-			struct PNP_SetDeviceProblem *r = _r;
+			struct PNP_SetDeviceProblem *r = (struct PNP_SetDeviceProblem *)_r;
 			r->out.result = _PNP_SetDeviceProblem(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_DISABLEDEVINST: {
-			struct PNP_DisableDevInst *r = _r;
+			struct PNP_DisableDevInst *r = (struct PNP_DisableDevInst *)_r;
 			r->out.result = _PNP_DisableDevInst(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_UNINSTALLDEVINST: {
-			struct PNP_UninstallDevInst *r = _r;
+			struct PNP_UninstallDevInst *r = (struct PNP_UninstallDevInst *)_r;
 			r->out.result = _PNP_UninstallDevInst(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_ADDID: {
-			struct PNP_AddID *r = _r;
+			struct PNP_AddID *r = (struct PNP_AddID *)_r;
 			r->out.result = _PNP_AddID(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_REGISTERDRIVER: {
-			struct PNP_RegisterDriver *r = _r;
+			struct PNP_RegisterDriver *r = (struct PNP_RegisterDriver *)_r;
 			r->out.result = _PNP_RegisterDriver(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_QUERYREMOVE: {
-			struct PNP_QueryRemove *r = _r;
+			struct PNP_QueryRemove *r = (struct PNP_QueryRemove *)_r;
 			r->out.result = _PNP_QueryRemove(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_REQUESTDEVICEEJECT: {
-			struct PNP_RequestDeviceEject *r = _r;
+			struct PNP_RequestDeviceEject *r = (struct PNP_RequestDeviceEject *)_r;
 			r->out.result = _PNP_RequestDeviceEject(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_ISDOCKSTATIONPRESENT: {
-			struct PNP_IsDockStationPresent *r = _r;
+			struct PNP_IsDockStationPresent *r = (struct PNP_IsDockStationPresent *)_r;
 			r->out.result = _PNP_IsDockStationPresent(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_REQUESTEJECTPC: {
-			struct PNP_RequestEjectPC *r = _r;
+			struct PNP_RequestEjectPC *r = (struct PNP_RequestEjectPC *)_r;
 			r->out.result = _PNP_RequestEjectPC(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_HWPROFFLAGS: {
-			struct PNP_HwProfFlags *r = _r;
+			struct PNP_HwProfFlags *r = (struct PNP_HwProfFlags *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.profile_flags = r->in.profile_flags;
 			r->out.veto_type = r->in.veto_type;
@@ -5162,7 +5162,7 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_PNP_GETHWPROFINFO: {
-			struct PNP_GetHwProfInfo *r = _r;
+			struct PNP_GetHwProfInfo *r = (struct PNP_GetHwProfInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.result = _PNP_GetHwProfInfo(cli->pipes_struct, r);
@@ -5170,139 +5170,139 @@ NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_PNP_ADDEMPTYLOGCONF: {
-			struct PNP_AddEmptyLogConf *r = _r;
+			struct PNP_AddEmptyLogConf *r = (struct PNP_AddEmptyLogConf *)_r;
 			r->out.result = _PNP_AddEmptyLogConf(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_FREELOGCONF: {
-			struct PNP_FreeLogConf *r = _r;
+			struct PNP_FreeLogConf *r = (struct PNP_FreeLogConf *)_r;
 			r->out.result = _PNP_FreeLogConf(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETFIRSTLOGCONF: {
-			struct PNP_GetFirstLogConf *r = _r;
+			struct PNP_GetFirstLogConf *r = (struct PNP_GetFirstLogConf *)_r;
 			r->out.result = _PNP_GetFirstLogConf(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETNEXTLOGCONF: {
-			struct PNP_GetNextLogConf *r = _r;
+			struct PNP_GetNextLogConf *r = (struct PNP_GetNextLogConf *)_r;
 			r->out.result = _PNP_GetNextLogConf(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETLOGCONFPRIORITY: {
-			struct PNP_GetLogConfPriority *r = _r;
+			struct PNP_GetLogConfPriority *r = (struct PNP_GetLogConfPriority *)_r;
 			r->out.result = _PNP_GetLogConfPriority(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_ADDRESDES: {
-			struct PNP_AddResDes *r = _r;
+			struct PNP_AddResDes *r = (struct PNP_AddResDes *)_r;
 			r->out.result = _PNP_AddResDes(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_FREERESDES: {
-			struct PNP_FreeResDes *r = _r;
+			struct PNP_FreeResDes *r = (struct PNP_FreeResDes *)_r;
 			r->out.result = _PNP_FreeResDes(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETNEXTRESDES: {
-			struct PNP_GetNextResDes *r = _r;
+			struct PNP_GetNextResDes *r = (struct PNP_GetNextResDes *)_r;
 			r->out.result = _PNP_GetNextResDes(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETRESDESDATA: {
-			struct PNP_GetResDesData *r = _r;
+			struct PNP_GetResDesData *r = (struct PNP_GetResDesData *)_r;
 			r->out.result = _PNP_GetResDesData(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETRESDESDATASIZE: {
-			struct PNP_GetResDesDataSize *r = _r;
+			struct PNP_GetResDesDataSize *r = (struct PNP_GetResDesDataSize *)_r;
 			r->out.result = _PNP_GetResDesDataSize(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_MODIFYRESDES: {
-			struct PNP_ModifyResDes *r = _r;
+			struct PNP_ModifyResDes *r = (struct PNP_ModifyResDes *)_r;
 			r->out.result = _PNP_ModifyResDes(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_DETECTRESOURCELIMIT: {
-			struct PNP_DetectResourceLimit *r = _r;
+			struct PNP_DetectResourceLimit *r = (struct PNP_DetectResourceLimit *)_r;
 			r->out.result = _PNP_DetectResourceLimit(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_QUERYRESCONFLIST: {
-			struct PNP_QueryResConfList *r = _r;
+			struct PNP_QueryResConfList *r = (struct PNP_QueryResConfList *)_r;
 			r->out.result = _PNP_QueryResConfList(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_SETHWPROF: {
-			struct PNP_SetHwProf *r = _r;
+			struct PNP_SetHwProf *r = (struct PNP_SetHwProf *)_r;
 			r->out.result = _PNP_SetHwProf(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_QUERYARBITRATORFREEDATA: {
-			struct PNP_QueryArbitratorFreeData *r = _r;
+			struct PNP_QueryArbitratorFreeData *r = (struct PNP_QueryArbitratorFreeData *)_r;
 			r->out.result = _PNP_QueryArbitratorFreeData(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_QUERYARBITRATORFREESIZE: {
-			struct PNP_QueryArbitratorFreeSize *r = _r;
+			struct PNP_QueryArbitratorFreeSize *r = (struct PNP_QueryArbitratorFreeSize *)_r;
 			r->out.result = _PNP_QueryArbitratorFreeSize(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_RUNDETECTION: {
-			struct PNP_RunDetection *r = _r;
+			struct PNP_RunDetection *r = (struct PNP_RunDetection *)_r;
 			r->out.result = _PNP_RunDetection(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_REGISTERNOTIFICATION: {
-			struct PNP_RegisterNotification *r = _r;
+			struct PNP_RegisterNotification *r = (struct PNP_RegisterNotification *)_r;
 			r->out.result = _PNP_RegisterNotification(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_UNREGISTERNOTIFICATION: {
-			struct PNP_UnregisterNotification *r = _r;
+			struct PNP_UnregisterNotification *r = (struct PNP_UnregisterNotification *)_r;
 			r->out.result = _PNP_UnregisterNotification(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETCUSTOMDEVPROP: {
-			struct PNP_GetCustomDevProp *r = _r;
+			struct PNP_GetCustomDevProp *r = (struct PNP_GetCustomDevProp *)_r;
 			r->out.result = _PNP_GetCustomDevProp(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETVERSIONINTERNAL: {
-			struct PNP_GetVersionInternal *r = _r;
+			struct PNP_GetVersionInternal *r = (struct PNP_GetVersionInternal *)_r;
 			r->out.result = _PNP_GetVersionInternal(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETBLOCKEDDRIVERINFO: {
-			struct PNP_GetBlockedDriverInfo *r = _r;
+			struct PNP_GetBlockedDriverInfo *r = (struct PNP_GetBlockedDriverInfo *)_r;
 			r->out.result = _PNP_GetBlockedDriverInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS: {
-			struct PNP_GetServerSideDeviceInstallFlags *r = _r;
+			struct PNP_GetServerSideDeviceInstallFlags *r = (struct PNP_GetServerSideDeviceInstallFlags *)_r;
 			r->out.result = _PNP_GetServerSideDeviceInstallFlags(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_samr.c b/librpc/gen_ndr/srv_samr.c
index 7649a7d0cf..e1b6951b3c 100644
--- a/librpc/gen_ndr/srv_samr.c
+++ b/librpc/gen_ndr/srv_samr.c
@@ -5485,7 +5485,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 	switch (opnum)
 	{
 		case NDR_SAMR_CONNECT: {
-			struct samr_Connect *r = _r;
+			struct samr_Connect *r = (struct samr_Connect *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.connect_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.connect_handle == NULL) {
@@ -5497,7 +5497,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CLOSE: {
-			struct samr_Close *r = _r;
+			struct samr_Close *r = (struct samr_Close *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _samr_Close(cli->pipes_struct, r);
@@ -5505,13 +5505,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETSECURITY: {
-			struct samr_SetSecurity *r = _r;
+			struct samr_SetSecurity *r = (struct samr_SetSecurity *)_r;
 			r->out.result = _samr_SetSecurity(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_QUERYSECURITY: {
-			struct samr_QuerySecurity *r = _r;
+			struct samr_QuerySecurity *r = (struct samr_QuerySecurity *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sdbuf = talloc_zero(mem_ctx, struct sec_desc_buf *);
 			if (r->out.sdbuf == NULL) {
@@ -5523,13 +5523,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SHUTDOWN: {
-			struct samr_Shutdown *r = _r;
+			struct samr_Shutdown *r = (struct samr_Shutdown *)_r;
 			r->out.result = _samr_Shutdown(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_LOOKUPDOMAIN: {
-			struct samr_LookupDomain *r = _r;
+			struct samr_LookupDomain *r = (struct samr_LookupDomain *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sid = talloc_zero(mem_ctx, struct dom_sid2 *);
 			if (r->out.sid == NULL) {
@@ -5541,7 +5541,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_ENUMDOMAINS: {
-			struct samr_EnumDomains *r = _r;
+			struct samr_EnumDomains *r = (struct samr_EnumDomains *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.sam = talloc_zero(mem_ctx, struct samr_SamArray *);
@@ -5559,7 +5559,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_OPENDOMAIN: {
-			struct samr_OpenDomain *r = _r;
+			struct samr_OpenDomain *r = (struct samr_OpenDomain *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.domain_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.domain_handle == NULL) {
@@ -5571,7 +5571,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYDOMAININFO: {
-			struct samr_QueryDomainInfo *r = _r;
+			struct samr_QueryDomainInfo *r = (struct samr_QueryDomainInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union samr_DomainInfo *);
 			if (r->out.info == NULL) {
@@ -5583,13 +5583,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETDOMAININFO: {
-			struct samr_SetDomainInfo *r = _r;
+			struct samr_SetDomainInfo *r = (struct samr_SetDomainInfo *)_r;
 			r->out.result = _samr_SetDomainInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_CREATEDOMAINGROUP: {
-			struct samr_CreateDomainGroup *r = _r;
+			struct samr_CreateDomainGroup *r = (struct samr_CreateDomainGroup *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.group_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.group_handle == NULL) {
@@ -5606,7 +5606,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_ENUMDOMAINGROUPS: {
-			struct samr_EnumDomainGroups *r = _r;
+			struct samr_EnumDomainGroups *r = (struct samr_EnumDomainGroups *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.sam = talloc_zero(mem_ctx, struct samr_SamArray *);
@@ -5624,7 +5624,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CREATEUSER: {
-			struct samr_CreateUser *r = _r;
+			struct samr_CreateUser *r = (struct samr_CreateUser *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.user_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.user_handle == NULL) {
@@ -5641,7 +5641,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_ENUMDOMAINUSERS: {
-			struct samr_EnumDomainUsers *r = _r;
+			struct samr_EnumDomainUsers *r = (struct samr_EnumDomainUsers *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.sam = talloc_zero(mem_ctx, struct samr_SamArray *);
@@ -5659,7 +5659,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CREATEDOMALIAS: {
-			struct samr_CreateDomAlias *r = _r;
+			struct samr_CreateDomAlias *r = (struct samr_CreateDomAlias *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.alias_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.alias_handle == NULL) {
@@ -5676,7 +5676,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_ENUMDOMAINALIASES: {
-			struct samr_EnumDomainAliases *r = _r;
+			struct samr_EnumDomainAliases *r = (struct samr_EnumDomainAliases *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.sam = talloc_zero(mem_ctx, struct samr_SamArray *);
@@ -5694,7 +5694,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_GETALIASMEMBERSHIP: {
-			struct samr_GetAliasMembership *r = _r;
+			struct samr_GetAliasMembership *r = (struct samr_GetAliasMembership *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rids = talloc_zero(mem_ctx, struct samr_Ids);
 			if (r->out.rids == NULL) {
@@ -5706,7 +5706,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_LOOKUPNAMES: {
-			struct samr_LookupNames *r = _r;
+			struct samr_LookupNames *r = (struct samr_LookupNames *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rids = talloc_zero(mem_ctx, struct samr_Ids);
 			if (r->out.rids == NULL) {
@@ -5723,7 +5723,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_LOOKUPRIDS: {
-			struct samr_LookupRids *r = _r;
+			struct samr_LookupRids *r = (struct samr_LookupRids *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.names = talloc_zero(mem_ctx, struct lsa_Strings);
 			if (r->out.names == NULL) {
@@ -5740,7 +5740,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_OPENGROUP: {
-			struct samr_OpenGroup *r = _r;
+			struct samr_OpenGroup *r = (struct samr_OpenGroup *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.group_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.group_handle == NULL) {
@@ -5752,7 +5752,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYGROUPINFO: {
-			struct samr_QueryGroupInfo *r = _r;
+			struct samr_QueryGroupInfo *r = (struct samr_QueryGroupInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union samr_GroupInfo *);
 			if (r->out.info == NULL) {
@@ -5764,19 +5764,19 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETGROUPINFO: {
-			struct samr_SetGroupInfo *r = _r;
+			struct samr_SetGroupInfo *r = (struct samr_SetGroupInfo *)_r;
 			r->out.result = _samr_SetGroupInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_ADDGROUPMEMBER: {
-			struct samr_AddGroupMember *r = _r;
+			struct samr_AddGroupMember *r = (struct samr_AddGroupMember *)_r;
 			r->out.result = _samr_AddGroupMember(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_DELETEDOMAINGROUP: {
-			struct samr_DeleteDomainGroup *r = _r;
+			struct samr_DeleteDomainGroup *r = (struct samr_DeleteDomainGroup *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.group_handle = r->in.group_handle;
 			r->out.result = _samr_DeleteDomainGroup(cli->pipes_struct, r);
@@ -5784,13 +5784,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_DELETEGROUPMEMBER: {
-			struct samr_DeleteGroupMember *r = _r;
+			struct samr_DeleteGroupMember *r = (struct samr_DeleteGroupMember *)_r;
 			r->out.result = _samr_DeleteGroupMember(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_QUERYGROUPMEMBER: {
-			struct samr_QueryGroupMember *r = _r;
+			struct samr_QueryGroupMember *r = (struct samr_QueryGroupMember *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rids = talloc_zero(mem_ctx, struct samr_RidTypeArray *);
 			if (r->out.rids == NULL) {
@@ -5802,13 +5802,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP: {
-			struct samr_SetMemberAttributesOfGroup *r = _r;
+			struct samr_SetMemberAttributesOfGroup *r = (struct samr_SetMemberAttributesOfGroup *)_r;
 			r->out.result = _samr_SetMemberAttributesOfGroup(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_OPENALIAS: {
-			struct samr_OpenAlias *r = _r;
+			struct samr_OpenAlias *r = (struct samr_OpenAlias *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.alias_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.alias_handle == NULL) {
@@ -5820,7 +5820,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYALIASINFO: {
-			struct samr_QueryAliasInfo *r = _r;
+			struct samr_QueryAliasInfo *r = (struct samr_QueryAliasInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union samr_AliasInfo *);
 			if (r->out.info == NULL) {
@@ -5832,13 +5832,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETALIASINFO: {
-			struct samr_SetAliasInfo *r = _r;
+			struct samr_SetAliasInfo *r = (struct samr_SetAliasInfo *)_r;
 			r->out.result = _samr_SetAliasInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_DELETEDOMALIAS: {
-			struct samr_DeleteDomAlias *r = _r;
+			struct samr_DeleteDomAlias *r = (struct samr_DeleteDomAlias *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.alias_handle = r->in.alias_handle;
 			r->out.result = _samr_DeleteDomAlias(cli->pipes_struct, r);
@@ -5846,19 +5846,19 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_ADDALIASMEMBER: {
-			struct samr_AddAliasMember *r = _r;
+			struct samr_AddAliasMember *r = (struct samr_AddAliasMember *)_r;
 			r->out.result = _samr_AddAliasMember(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_DELETEALIASMEMBER: {
-			struct samr_DeleteAliasMember *r = _r;
+			struct samr_DeleteAliasMember *r = (struct samr_DeleteAliasMember *)_r;
 			r->out.result = _samr_DeleteAliasMember(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_GETMEMBERSINALIAS: {
-			struct samr_GetMembersInAlias *r = _r;
+			struct samr_GetMembersInAlias *r = (struct samr_GetMembersInAlias *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sids = talloc_zero(mem_ctx, struct lsa_SidArray);
 			if (r->out.sids == NULL) {
@@ -5870,7 +5870,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_OPENUSER: {
-			struct samr_OpenUser *r = _r;
+			struct samr_OpenUser *r = (struct samr_OpenUser *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.user_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.user_handle == NULL) {
@@ -5882,7 +5882,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_DELETEUSER: {
-			struct samr_DeleteUser *r = _r;
+			struct samr_DeleteUser *r = (struct samr_DeleteUser *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.user_handle = r->in.user_handle;
 			r->out.result = _samr_DeleteUser(cli->pipes_struct, r);
@@ -5890,7 +5890,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYUSERINFO: {
-			struct samr_QueryUserInfo *r = _r;
+			struct samr_QueryUserInfo *r = (struct samr_QueryUserInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union samr_UserInfo *);
 			if (r->out.info == NULL) {
@@ -5902,19 +5902,19 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETUSERINFO: {
-			struct samr_SetUserInfo *r = _r;
+			struct samr_SetUserInfo *r = (struct samr_SetUserInfo *)_r;
 			r->out.result = _samr_SetUserInfo(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_CHANGEPASSWORDUSER: {
-			struct samr_ChangePasswordUser *r = _r;
+			struct samr_ChangePasswordUser *r = (struct samr_ChangePasswordUser *)_r;
 			r->out.result = _samr_ChangePasswordUser(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_GETGROUPSFORUSER: {
-			struct samr_GetGroupsForUser *r = _r;
+			struct samr_GetGroupsForUser *r = (struct samr_GetGroupsForUser *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rids = talloc_zero(mem_ctx, struct samr_RidWithAttributeArray *);
 			if (r->out.rids == NULL) {
@@ -5926,7 +5926,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYDISPLAYINFO: {
-			struct samr_QueryDisplayInfo *r = _r;
+			struct samr_QueryDisplayInfo *r = (struct samr_QueryDisplayInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.total_size = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.total_size == NULL) {
@@ -5948,7 +5948,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_GETDISPLAYENUMERATIONINDEX: {
-			struct samr_GetDisplayEnumerationIndex *r = _r;
+			struct samr_GetDisplayEnumerationIndex *r = (struct samr_GetDisplayEnumerationIndex *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.idx = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.idx == NULL) {
@@ -5960,19 +5960,19 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN: {
-			struct samr_TestPrivateFunctionsDomain *r = _r;
+			struct samr_TestPrivateFunctionsDomain *r = (struct samr_TestPrivateFunctionsDomain *)_r;
 			r->out.result = _samr_TestPrivateFunctionsDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_TESTPRIVATEFUNCTIONSUSER: {
-			struct samr_TestPrivateFunctionsUser *r = _r;
+			struct samr_TestPrivateFunctionsUser *r = (struct samr_TestPrivateFunctionsUser *)_r;
 			r->out.result = _samr_TestPrivateFunctionsUser(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_GETUSERPWINFO: {
-			struct samr_GetUserPwInfo *r = _r;
+			struct samr_GetUserPwInfo *r = (struct samr_GetUserPwInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct samr_PwInfo);
 			if (r->out.info == NULL) {
@@ -5984,13 +5984,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN: {
-			struct samr_RemoveMemberFromForeignDomain *r = _r;
+			struct samr_RemoveMemberFromForeignDomain *r = (struct samr_RemoveMemberFromForeignDomain *)_r;
 			r->out.result = _samr_RemoveMemberFromForeignDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_QUERYDOMAININFO2: {
-			struct samr_QueryDomainInfo2 *r = _r;
+			struct samr_QueryDomainInfo2 *r = (struct samr_QueryDomainInfo2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union samr_DomainInfo *);
 			if (r->out.info == NULL) {
@@ -6002,7 +6002,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYUSERINFO2: {
-			struct samr_QueryUserInfo2 *r = _r;
+			struct samr_QueryUserInfo2 *r = (struct samr_QueryUserInfo2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union samr_UserInfo *);
 			if (r->out.info == NULL) {
@@ -6014,7 +6014,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYDISPLAYINFO2: {
-			struct samr_QueryDisplayInfo2 *r = _r;
+			struct samr_QueryDisplayInfo2 *r = (struct samr_QueryDisplayInfo2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.total_size = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.total_size == NULL) {
@@ -6036,7 +6036,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_GETDISPLAYENUMERATIONINDEX2: {
-			struct samr_GetDisplayEnumerationIndex2 *r = _r;
+			struct samr_GetDisplayEnumerationIndex2 *r = (struct samr_GetDisplayEnumerationIndex2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.idx = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.idx == NULL) {
@@ -6048,7 +6048,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CREATEUSER2: {
-			struct samr_CreateUser2 *r = _r;
+			struct samr_CreateUser2 *r = (struct samr_CreateUser2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.user_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.user_handle == NULL) {
@@ -6070,7 +6070,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_QUERYDISPLAYINFO3: {
-			struct samr_QueryDisplayInfo3 *r = _r;
+			struct samr_QueryDisplayInfo3 *r = (struct samr_QueryDisplayInfo3 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.total_size = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.total_size == NULL) {
@@ -6092,31 +6092,31 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS: {
-			struct samr_AddMultipleMembersToAlias *r = _r;
+			struct samr_AddMultipleMembersToAlias *r = (struct samr_AddMultipleMembersToAlias *)_r;
 			r->out.result = _samr_AddMultipleMembersToAlias(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS: {
-			struct samr_RemoveMultipleMembersFromAlias *r = _r;
+			struct samr_RemoveMultipleMembersFromAlias *r = (struct samr_RemoveMultipleMembersFromAlias *)_r;
 			r->out.result = _samr_RemoveMultipleMembersFromAlias(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_OEMCHANGEPASSWORDUSER2: {
-			struct samr_OemChangePasswordUser2 *r = _r;
+			struct samr_OemChangePasswordUser2 *r = (struct samr_OemChangePasswordUser2 *)_r;
 			r->out.result = _samr_OemChangePasswordUser2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_CHANGEPASSWORDUSER2: {
-			struct samr_ChangePasswordUser2 *r = _r;
+			struct samr_ChangePasswordUser2 *r = (struct samr_ChangePasswordUser2 *)_r;
 			r->out.result = _samr_ChangePasswordUser2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_GETDOMPWINFO: {
-			struct samr_GetDomPwInfo *r = _r;
+			struct samr_GetDomPwInfo *r = (struct samr_GetDomPwInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct samr_PwInfo);
 			if (r->out.info == NULL) {
@@ -6128,7 +6128,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CONNECT2: {
-			struct samr_Connect2 *r = _r;
+			struct samr_Connect2 *r = (struct samr_Connect2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.connect_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.connect_handle == NULL) {
@@ -6140,19 +6140,19 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETUSERINFO2: {
-			struct samr_SetUserInfo2 *r = _r;
+			struct samr_SetUserInfo2 *r = (struct samr_SetUserInfo2 *)_r;
 			r->out.result = _samr_SetUserInfo2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_SETBOOTKEYINFORMATION: {
-			struct samr_SetBootKeyInformation *r = _r;
+			struct samr_SetBootKeyInformation *r = (struct samr_SetBootKeyInformation *)_r;
 			r->out.result = _samr_SetBootKeyInformation(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_GETBOOTKEYINFORMATION: {
-			struct samr_GetBootKeyInformation *r = _r;
+			struct samr_GetBootKeyInformation *r = (struct samr_GetBootKeyInformation *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.unknown = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.unknown == NULL) {
@@ -6164,7 +6164,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CONNECT3: {
-			struct samr_Connect3 *r = _r;
+			struct samr_Connect3 *r = (struct samr_Connect3 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.connect_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.connect_handle == NULL) {
@@ -6176,7 +6176,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CONNECT4: {
-			struct samr_Connect4 *r = _r;
+			struct samr_Connect4 *r = (struct samr_Connect4 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.connect_handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.connect_handle == NULL) {
@@ -6188,7 +6188,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CHANGEPASSWORDUSER3: {
-			struct samr_ChangePasswordUser3 *r = _r;
+			struct samr_ChangePasswordUser3 *r = (struct samr_ChangePasswordUser3 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.dominfo = talloc_zero(mem_ctx, struct samr_DomInfo1 *);
 			if (r->out.dominfo == NULL) {
@@ -6205,7 +6205,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_CONNECT5: {
-			struct samr_Connect5 *r = _r;
+			struct samr_Connect5 *r = (struct samr_Connect5 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.level_out = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.level_out == NULL) {
@@ -6227,7 +6227,7 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_RIDTOSID: {
-			struct samr_RidToSid *r = _r;
+			struct samr_RidToSid *r = (struct samr_RidToSid *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sid = talloc_zero(mem_ctx, struct dom_sid2 *);
 			if (r->out.sid == NULL) {
@@ -6239,13 +6239,13 @@ NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con
 		}
 
 		case NDR_SAMR_SETDSRMPASSWORD: {
-			struct samr_SetDsrmPassword *r = _r;
+			struct samr_SetDsrmPassword *r = (struct samr_SetDsrmPassword *)_r;
 			r->out.result = _samr_SetDsrmPassword(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SAMR_VALIDATEPASSWORD: {
-			struct samr_ValidatePassword *r = _r;
+			struct samr_ValidatePassword *r = (struct samr_ValidatePassword *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.rep = talloc_zero(mem_ctx, union samr_ValidatePasswordRep *);
 			if (r->out.rep == NULL) {
diff --git a/librpc/gen_ndr/srv_srvsvc.c b/librpc/gen_ndr/srv_srvsvc.c
index 1286aad739..f024c177c4 100644
--- a/librpc/gen_ndr/srv_srvsvc.c
+++ b/librpc/gen_ndr/srv_srvsvc.c
@@ -4199,7 +4199,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_SRVSVC_NETCHARDEVENUM: {
-			struct srvsvc_NetCharDevEnum *r = _r;
+			struct srvsvc_NetCharDevEnum *r = (struct srvsvc_NetCharDevEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4213,7 +4213,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETCHARDEVGETINFO: {
-			struct srvsvc_NetCharDevGetInfo *r = _r;
+			struct srvsvc_NetCharDevGetInfo *r = (struct srvsvc_NetCharDevGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union srvsvc_NetCharDevInfo);
 			if (r->out.info == NULL) {
@@ -4225,13 +4225,13 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETCHARDEVCONTROL: {
-			struct srvsvc_NetCharDevControl *r = _r;
+			struct srvsvc_NetCharDevControl *r = (struct srvsvc_NetCharDevControl *)_r;
 			r->out.result = _srvsvc_NetCharDevControl(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETCHARDEVQENUM: {
-			struct srvsvc_NetCharDevQEnum *r = _r;
+			struct srvsvc_NetCharDevQEnum *r = (struct srvsvc_NetCharDevQEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4245,7 +4245,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETCHARDEVQGETINFO: {
-			struct srvsvc_NetCharDevQGetInfo *r = _r;
+			struct srvsvc_NetCharDevQGetInfo *r = (struct srvsvc_NetCharDevQGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union srvsvc_NetCharDevQInfo);
 			if (r->out.info == NULL) {
@@ -4257,7 +4257,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETCHARDEVQSETINFO: {
-			struct srvsvc_NetCharDevQSetInfo *r = _r;
+			struct srvsvc_NetCharDevQSetInfo *r = (struct srvsvc_NetCharDevQSetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_error = r->in.parm_error;
 			r->out.result = _srvsvc_NetCharDevQSetInfo(cli->pipes_struct, r);
@@ -4265,19 +4265,19 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETCHARDEVQPURGE: {
-			struct srvsvc_NetCharDevQPurge *r = _r;
+			struct srvsvc_NetCharDevQPurge *r = (struct srvsvc_NetCharDevQPurge *)_r;
 			r->out.result = _srvsvc_NetCharDevQPurge(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETCHARDEVQPURGESELF: {
-			struct srvsvc_NetCharDevQPurgeSelf *r = _r;
+			struct srvsvc_NetCharDevQPurgeSelf *r = (struct srvsvc_NetCharDevQPurgeSelf *)_r;
 			r->out.result = _srvsvc_NetCharDevQPurgeSelf(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETCONNENUM: {
-			struct srvsvc_NetConnEnum *r = _r;
+			struct srvsvc_NetConnEnum *r = (struct srvsvc_NetConnEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4291,7 +4291,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETFILEENUM: {
-			struct srvsvc_NetFileEnum *r = _r;
+			struct srvsvc_NetFileEnum *r = (struct srvsvc_NetFileEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4305,7 +4305,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETFILEGETINFO: {
-			struct srvsvc_NetFileGetInfo *r = _r;
+			struct srvsvc_NetFileGetInfo *r = (struct srvsvc_NetFileGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union srvsvc_NetFileInfo);
 			if (r->out.info == NULL) {
@@ -4317,13 +4317,13 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETFILECLOSE: {
-			struct srvsvc_NetFileClose *r = _r;
+			struct srvsvc_NetFileClose *r = (struct srvsvc_NetFileClose *)_r;
 			r->out.result = _srvsvc_NetFileClose(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSESSENUM: {
-			struct srvsvc_NetSessEnum *r = _r;
+			struct srvsvc_NetSessEnum *r = (struct srvsvc_NetSessEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4337,13 +4337,13 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSESSDEL: {
-			struct srvsvc_NetSessDel *r = _r;
+			struct srvsvc_NetSessDel *r = (struct srvsvc_NetSessDel *)_r;
 			r->out.result = _srvsvc_NetSessDel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSHAREADD: {
-			struct srvsvc_NetShareAdd *r = _r;
+			struct srvsvc_NetShareAdd *r = (struct srvsvc_NetShareAdd *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_error = r->in.parm_error;
 			r->out.result = _srvsvc_NetShareAdd(cli->pipes_struct, r);
@@ -4351,7 +4351,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSHAREENUMALL: {
-			struct srvsvc_NetShareEnumAll *r = _r;
+			struct srvsvc_NetShareEnumAll *r = (struct srvsvc_NetShareEnumAll *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4365,7 +4365,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSHAREGETINFO: {
-			struct srvsvc_NetShareGetInfo *r = _r;
+			struct srvsvc_NetShareGetInfo *r = (struct srvsvc_NetShareGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union srvsvc_NetShareInfo);
 			if (r->out.info == NULL) {
@@ -4377,7 +4377,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSHARESETINFO: {
-			struct srvsvc_NetShareSetInfo *r = _r;
+			struct srvsvc_NetShareSetInfo *r = (struct srvsvc_NetShareSetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_error = r->in.parm_error;
 			r->out.result = _srvsvc_NetShareSetInfo(cli->pipes_struct, r);
@@ -4385,19 +4385,19 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSHAREDEL: {
-			struct srvsvc_NetShareDel *r = _r;
+			struct srvsvc_NetShareDel *r = (struct srvsvc_NetShareDel *)_r;
 			r->out.result = _srvsvc_NetShareDel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSHAREDELSTICKY: {
-			struct srvsvc_NetShareDelSticky *r = _r;
+			struct srvsvc_NetShareDelSticky *r = (struct srvsvc_NetShareDelSticky *)_r;
 			r->out.result = _srvsvc_NetShareDelSticky(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSHARECHECK: {
-			struct srvsvc_NetShareCheck *r = _r;
+			struct srvsvc_NetShareCheck *r = (struct srvsvc_NetShareCheck *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.type = talloc_zero(mem_ctx, enum srvsvc_ShareType);
 			if (r->out.type == NULL) {
@@ -4409,7 +4409,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSRVGETINFO: {
-			struct srvsvc_NetSrvGetInfo *r = _r;
+			struct srvsvc_NetSrvGetInfo *r = (struct srvsvc_NetSrvGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union srvsvc_NetSrvInfo);
 			if (r->out.info == NULL) {
@@ -4421,7 +4421,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSRVSETINFO: {
-			struct srvsvc_NetSrvSetInfo *r = _r;
+			struct srvsvc_NetSrvSetInfo *r = (struct srvsvc_NetSrvSetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_error = r->in.parm_error;
 			r->out.result = _srvsvc_NetSrvSetInfo(cli->pipes_struct, r);
@@ -4429,7 +4429,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETDISKENUM: {
-			struct srvsvc_NetDiskEnum *r = _r;
+			struct srvsvc_NetDiskEnum *r = (struct srvsvc_NetDiskEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4443,7 +4443,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSERVERSTATISTICSGET: {
-			struct srvsvc_NetServerStatisticsGet *r = _r;
+			struct srvsvc_NetServerStatisticsGet *r = (struct srvsvc_NetServerStatisticsGet *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.stats = talloc_zero(mem_ctx, struct srvsvc_Statistics *);
 			if (r->out.stats == NULL) {
@@ -4455,13 +4455,13 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETTRANSPORTADD: {
-			struct srvsvc_NetTransportAdd *r = _r;
+			struct srvsvc_NetTransportAdd *r = (struct srvsvc_NetTransportAdd *)_r;
 			r->out.result = _srvsvc_NetTransportAdd(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETTRANSPORTENUM: {
-			struct srvsvc_NetTransportEnum *r = _r;
+			struct srvsvc_NetTransportEnum *r = (struct srvsvc_NetTransportEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.transports = r->in.transports;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4475,13 +4475,13 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETTRANSPORTDEL: {
-			struct srvsvc_NetTransportDel *r = _r;
+			struct srvsvc_NetTransportDel *r = (struct srvsvc_NetTransportDel *)_r;
 			r->out.result = _srvsvc_NetTransportDel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETREMOTETOD: {
-			struct srvsvc_NetRemoteTOD *r = _r;
+			struct srvsvc_NetRemoteTOD *r = (struct srvsvc_NetRemoteTOD *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct srvsvc_NetRemoteTODInfo *);
 			if (r->out.info == NULL) {
@@ -4493,13 +4493,13 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSETSERVICEBITS: {
-			struct srvsvc_NetSetServiceBits *r = _r;
+			struct srvsvc_NetSetServiceBits *r = (struct srvsvc_NetSetServiceBits *)_r;
 			r->out.result = _srvsvc_NetSetServiceBits(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETPATHTYPE: {
-			struct srvsvc_NetPathType *r = _r;
+			struct srvsvc_NetPathType *r = (struct srvsvc_NetPathType *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.pathtype = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.pathtype == NULL) {
@@ -4511,7 +4511,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETPATHCANONICALIZE: {
-			struct srvsvc_NetPathCanonicalize *r = _r;
+			struct srvsvc_NetPathCanonicalize *r = (struct srvsvc_NetPathCanonicalize *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.pathtype = r->in.pathtype;
 			r->out.can_path = talloc_zero_array(mem_ctx, uint8_t, r->in.maxbuf);
@@ -4524,31 +4524,31 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETPATHCOMPARE: {
-			struct srvsvc_NetPathCompare *r = _r;
+			struct srvsvc_NetPathCompare *r = (struct srvsvc_NetPathCompare *)_r;
 			r->out.result = _srvsvc_NetPathCompare(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETNAMEVALIDATE: {
-			struct srvsvc_NetNameValidate *r = _r;
+			struct srvsvc_NetNameValidate *r = (struct srvsvc_NetNameValidate *)_r;
 			r->out.result = _srvsvc_NetNameValidate(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRPRNAMECANONICALIZE: {
-			struct srvsvc_NETRPRNAMECANONICALIZE *r = _r;
+			struct srvsvc_NETRPRNAMECANONICALIZE *r = (struct srvsvc_NETRPRNAMECANONICALIZE *)_r;
 			r->out.result = _srvsvc_NETRPRNAMECANONICALIZE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETPRNAMECOMPARE: {
-			struct srvsvc_NetPRNameCompare *r = _r;
+			struct srvsvc_NetPRNameCompare *r = (struct srvsvc_NetPRNameCompare *)_r;
 			r->out.result = _srvsvc_NetPRNameCompare(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSHAREENUM: {
-			struct srvsvc_NetShareEnum *r = _r;
+			struct srvsvc_NetShareEnum *r = (struct srvsvc_NetShareEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info_ctr = r->in.info_ctr;
 			r->out.resume_handle = r->in.resume_handle;
@@ -4562,7 +4562,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSHAREDELSTART: {
-			struct srvsvc_NetShareDelStart *r = _r;
+			struct srvsvc_NetShareDelStart *r = (struct srvsvc_NetShareDelStart *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.hnd = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.hnd == NULL) {
@@ -4574,7 +4574,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSHAREDELCOMMIT: {
-			struct srvsvc_NetShareDelCommit *r = _r;
+			struct srvsvc_NetShareDelCommit *r = (struct srvsvc_NetShareDelCommit *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.hnd = r->in.hnd;
 			r->out.result = _srvsvc_NetShareDelCommit(cli->pipes_struct, r);
@@ -4582,7 +4582,7 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETGETFILESECURITY: {
-			struct srvsvc_NetGetFileSecurity *r = _r;
+			struct srvsvc_NetGetFileSecurity *r = (struct srvsvc_NetGetFileSecurity *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sd_buf = talloc_zero(mem_ctx, struct sec_desc_buf *);
 			if (r->out.sd_buf == NULL) {
@@ -4594,85 +4594,85 @@ NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SRVSVC_NETSETFILESECURITY: {
-			struct srvsvc_NetSetFileSecurity *r = _r;
+			struct srvsvc_NetSetFileSecurity *r = (struct srvsvc_NetSetFileSecurity *)_r;
 			r->out.result = _srvsvc_NetSetFileSecurity(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSERVERTRANSPORTADDEX: {
-			struct srvsvc_NetServerTransportAddEx *r = _r;
+			struct srvsvc_NetServerTransportAddEx *r = (struct srvsvc_NetServerTransportAddEx *)_r;
 			r->out.result = _srvsvc_NetServerTransportAddEx(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETSERVERSETSERVICEBITSEX: {
-			struct srvsvc_NetServerSetServiceBitsEx *r = _r;
+			struct srvsvc_NetServerSetServiceBitsEx *r = (struct srvsvc_NetServerSetServiceBitsEx *)_r;
 			r->out.result = _srvsvc_NetServerSetServiceBitsEx(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSGETVERSION: {
-			struct srvsvc_NETRDFSGETVERSION *r = _r;
+			struct srvsvc_NETRDFSGETVERSION *r = (struct srvsvc_NETRDFSGETVERSION *)_r;
 			r->out.result = _srvsvc_NETRDFSGETVERSION(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSCREATELOCALPARTITION: {
-			struct srvsvc_NETRDFSCREATELOCALPARTITION *r = _r;
+			struct srvsvc_NETRDFSCREATELOCALPARTITION *r = (struct srvsvc_NETRDFSCREATELOCALPARTITION *)_r;
 			r->out.result = _srvsvc_NETRDFSCREATELOCALPARTITION(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSDELETELOCALPARTITION: {
-			struct srvsvc_NETRDFSDELETELOCALPARTITION *r = _r;
+			struct srvsvc_NETRDFSDELETELOCALPARTITION *r = (struct srvsvc_NETRDFSDELETELOCALPARTITION *)_r;
 			r->out.result = _srvsvc_NETRDFSDELETELOCALPARTITION(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE: {
-			struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *r = _r;
+			struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *r = (struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *)_r;
 			r->out.result = _srvsvc_NETRDFSSETLOCALVOLUMESTATE(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSSETSERVERINFO: {
-			struct srvsvc_NETRDFSSETSERVERINFO *r = _r;
+			struct srvsvc_NETRDFSSETSERVERINFO *r = (struct srvsvc_NETRDFSSETSERVERINFO *)_r;
 			r->out.result = _srvsvc_NETRDFSSETSERVERINFO(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSCREATEEXITPOINT: {
-			struct srvsvc_NETRDFSCREATEEXITPOINT *r = _r;
+			struct srvsvc_NETRDFSCREATEEXITPOINT *r = (struct srvsvc_NETRDFSCREATEEXITPOINT *)_r;
 			r->out.result = _srvsvc_NETRDFSCREATEEXITPOINT(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSDELETEEXITPOINT: {
-			struct srvsvc_NETRDFSDELETEEXITPOINT *r = _r;
+			struct srvsvc_NETRDFSDELETEEXITPOINT *r = (struct srvsvc_NETRDFSDELETEEXITPOINT *)_r;
 			r->out.result = _srvsvc_NETRDFSDELETEEXITPOINT(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSMODIFYPREFIX: {
-			struct srvsvc_NETRDFSMODIFYPREFIX *r = _r;
+			struct srvsvc_NETRDFSMODIFYPREFIX *r = (struct srvsvc_NETRDFSMODIFYPREFIX *)_r;
 			r->out.result = _srvsvc_NETRDFSMODIFYPREFIX(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSFIXLOCALVOLUME: {
-			struct srvsvc_NETRDFSFIXLOCALVOLUME *r = _r;
+			struct srvsvc_NETRDFSFIXLOCALVOLUME *r = (struct srvsvc_NETRDFSFIXLOCALVOLUME *)_r;
 			r->out.result = _srvsvc_NETRDFSFIXLOCALVOLUME(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO: {
-			struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r = _r;
+			struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r = (struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *)_r;
 			r->out.result = _srvsvc_NETRDFSMANAGERREPORTSITEINFO(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SRVSVC_NETRSERVERTRANSPORTDELEX: {
-			struct srvsvc_NETRSERVERTRANSPORTDELEX *r = _r;
+			struct srvsvc_NETRSERVERTRANSPORTDELEX *r = (struct srvsvc_NETRSERVERTRANSPORTDELEX *)_r;
 			r->out.result = _srvsvc_NETRSERVERTRANSPORTDELEX(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_svcctl.c b/librpc/gen_ndr/srv_svcctl.c
index ab5ad973ad..bf8689907b 100644
--- a/librpc/gen_ndr/srv_svcctl.c
+++ b/librpc/gen_ndr/srv_svcctl.c
@@ -3618,7 +3618,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_SVCCTL_CLOSESERVICEHANDLE: {
-			struct svcctl_CloseServiceHandle *r = _r;
+			struct svcctl_CloseServiceHandle *r = (struct svcctl_CloseServiceHandle *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _svcctl_CloseServiceHandle(cli->pipes_struct, r);
@@ -3626,7 +3626,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_CONTROLSERVICE: {
-			struct svcctl_ControlService *r = _r;
+			struct svcctl_ControlService *r = (struct svcctl_ControlService *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.service_status = talloc_zero(mem_ctx, struct SERVICE_STATUS);
 			if (r->out.service_status == NULL) {
@@ -3638,13 +3638,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_DELETESERVICE: {
-			struct svcctl_DeleteService *r = _r;
+			struct svcctl_DeleteService *r = (struct svcctl_DeleteService *)_r;
 			r->out.result = _svcctl_DeleteService(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_LOCKSERVICEDATABASE: {
-			struct svcctl_LockServiceDatabase *r = _r;
+			struct svcctl_LockServiceDatabase *r = (struct svcctl_LockServiceDatabase *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.lock = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.lock == NULL) {
@@ -3656,7 +3656,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY: {
-			struct svcctl_QueryServiceObjectSecurity *r = _r;
+			struct svcctl_QueryServiceObjectSecurity *r = (struct svcctl_QueryServiceObjectSecurity *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.buffer = talloc_zero_array(mem_ctx, uint8_t, r->in.buffer_size);
 			if (r->out.buffer == NULL) {
@@ -3673,13 +3673,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_SETSERVICEOBJECTSECURITY: {
-			struct svcctl_SetServiceObjectSecurity *r = _r;
+			struct svcctl_SetServiceObjectSecurity *r = (struct svcctl_SetServiceObjectSecurity *)_r;
 			r->out.result = _svcctl_SetServiceObjectSecurity(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_QUERYSERVICESTATUS: {
-			struct svcctl_QueryServiceStatus *r = _r;
+			struct svcctl_QueryServiceStatus *r = (struct svcctl_QueryServiceStatus *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.service_status = talloc_zero(mem_ctx, struct SERVICE_STATUS);
 			if (r->out.service_status == NULL) {
@@ -3691,13 +3691,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_SETSERVICESTATUS: {
-			struct svcctl_SetServiceStatus *r = _r;
+			struct svcctl_SetServiceStatus *r = (struct svcctl_SetServiceStatus *)_r;
 			r->out.result = _svcctl_SetServiceStatus(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_UNLOCKSERVICEDATABASE: {
-			struct svcctl_UnlockServiceDatabase *r = _r;
+			struct svcctl_UnlockServiceDatabase *r = (struct svcctl_UnlockServiceDatabase *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.lock = r->in.lock;
 			r->out.result = _svcctl_UnlockServiceDatabase(cli->pipes_struct, r);
@@ -3705,19 +3705,19 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS: {
-			struct svcctl_NotifyBootConfigStatus *r = _r;
+			struct svcctl_NotifyBootConfigStatus *r = (struct svcctl_NotifyBootConfigStatus *)_r;
 			r->out.result = _svcctl_NotifyBootConfigStatus(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_SCSETSERVICEBITSW: {
-			struct svcctl_SCSetServiceBitsW *r = _r;
+			struct svcctl_SCSetServiceBitsW *r = (struct svcctl_SCSetServiceBitsW *)_r;
 			r->out.result = _svcctl_SCSetServiceBitsW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_CHANGESERVICECONFIGW: {
-			struct svcctl_ChangeServiceConfigW *r = _r;
+			struct svcctl_ChangeServiceConfigW *r = (struct svcctl_ChangeServiceConfigW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.tag_id = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.tag_id == NULL) {
@@ -3729,7 +3729,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_CREATESERVICEW: {
-			struct svcctl_CreateServiceW *r = _r;
+			struct svcctl_CreateServiceW *r = (struct svcctl_CreateServiceW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.TagId = r->in.TagId;
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
@@ -3742,7 +3742,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_ENUMDEPENDENTSERVICESW: {
-			struct svcctl_EnumDependentServicesW *r = _r;
+			struct svcctl_EnumDependentServicesW *r = (struct svcctl_EnumDependentServicesW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.service_status = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
 			if (r->out.service_status == NULL) {
@@ -3764,7 +3764,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_ENUMSERVICESSTATUSW: {
-			struct svcctl_EnumServicesStatusW *r = _r;
+			struct svcctl_EnumServicesStatusW *r = (struct svcctl_EnumServicesStatusW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.service = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
@@ -3787,7 +3787,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_OPENSCMANAGERW: {
-			struct svcctl_OpenSCManagerW *r = _r;
+			struct svcctl_OpenSCManagerW *r = (struct svcctl_OpenSCManagerW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3799,7 +3799,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_OPENSERVICEW: {
-			struct svcctl_OpenServiceW *r = _r;
+			struct svcctl_OpenServiceW *r = (struct svcctl_OpenServiceW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3811,7 +3811,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_QUERYSERVICECONFIGW: {
-			struct svcctl_QueryServiceConfigW *r = _r;
+			struct svcctl_QueryServiceConfigW *r = (struct svcctl_QueryServiceConfigW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.query = talloc_zero(mem_ctx, struct QUERY_SERVICE_CONFIG);
 			if (r->out.query == NULL) {
@@ -3828,7 +3828,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_QUERYSERVICELOCKSTATUSW: {
-			struct svcctl_QueryServiceLockStatusW *r = _r;
+			struct svcctl_QueryServiceLockStatusW *r = (struct svcctl_QueryServiceLockStatusW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.lock_status = talloc_zero(mem_ctx, struct SERVICE_LOCK_STATUS);
 			if (r->out.lock_status == NULL) {
@@ -3845,13 +3845,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_STARTSERVICEW: {
-			struct svcctl_StartServiceW *r = _r;
+			struct svcctl_StartServiceW *r = (struct svcctl_StartServiceW *)_r;
 			r->out.result = _svcctl_StartServiceW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_GETSERVICEDISPLAYNAMEW: {
-			struct svcctl_GetServiceDisplayNameW *r = _r;
+			struct svcctl_GetServiceDisplayNameW *r = (struct svcctl_GetServiceDisplayNameW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.display_name_length = r->in.display_name_length;
 			r->out.display_name = talloc_zero(mem_ctx, const char *);
@@ -3864,7 +3864,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_GETSERVICEKEYNAMEW: {
-			struct svcctl_GetServiceKeyNameW *r = _r;
+			struct svcctl_GetServiceKeyNameW *r = (struct svcctl_GetServiceKeyNameW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.display_name_length = r->in.display_name_length;
 			r->out.key_name = talloc_zero(mem_ctx, const char *);
@@ -3877,13 +3877,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_SCSETSERVICEBITSA: {
-			struct svcctl_SCSetServiceBitsA *r = _r;
+			struct svcctl_SCSetServiceBitsA *r = (struct svcctl_SCSetServiceBitsA *)_r;
 			r->out.result = _svcctl_SCSetServiceBitsA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_CHANGESERVICECONFIGA: {
-			struct svcctl_ChangeServiceConfigA *r = _r;
+			struct svcctl_ChangeServiceConfigA *r = (struct svcctl_ChangeServiceConfigA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.tag_id = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.tag_id == NULL) {
@@ -3895,7 +3895,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_CREATESERVICEA: {
-			struct svcctl_CreateServiceA *r = _r;
+			struct svcctl_CreateServiceA *r = (struct svcctl_CreateServiceA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.TagId = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.TagId == NULL) {
@@ -3907,7 +3907,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_ENUMDEPENDENTSERVICESA: {
-			struct svcctl_EnumDependentServicesA *r = _r;
+			struct svcctl_EnumDependentServicesA *r = (struct svcctl_EnumDependentServicesA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.service_status = talloc_zero(mem_ctx, struct ENUM_SERVICE_STATUSA);
 			if (r->out.service_status == NULL) {
@@ -3929,7 +3929,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_ENUMSERVICESSTATUSA: {
-			struct svcctl_EnumServicesStatusA *r = _r;
+			struct svcctl_EnumServicesStatusA *r = (struct svcctl_EnumServicesStatusA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.service = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
@@ -3952,7 +3952,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_OPENSCMANAGERA: {
-			struct svcctl_OpenSCManagerA *r = _r;
+			struct svcctl_OpenSCManagerA *r = (struct svcctl_OpenSCManagerA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3964,13 +3964,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_OPENSERVICEA: {
-			struct svcctl_OpenServiceA *r = _r;
+			struct svcctl_OpenServiceA *r = (struct svcctl_OpenServiceA *)_r;
 			r->out.result = _svcctl_OpenServiceA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_QUERYSERVICECONFIGA: {
-			struct svcctl_QueryServiceConfigA *r = _r;
+			struct svcctl_QueryServiceConfigA *r = (struct svcctl_QueryServiceConfigA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.query = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
 			if (r->out.query == NULL) {
@@ -3987,7 +3987,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_QUERYSERVICELOCKSTATUSA: {
-			struct svcctl_QueryServiceLockStatusA *r = _r;
+			struct svcctl_QueryServiceLockStatusA *r = (struct svcctl_QueryServiceLockStatusA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.lock_status = talloc_zero(mem_ctx, struct SERVICE_LOCK_STATUS);
 			if (r->out.lock_status == NULL) {
@@ -4004,13 +4004,13 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_STARTSERVICEA: {
-			struct svcctl_StartServiceA *r = _r;
+			struct svcctl_StartServiceA *r = (struct svcctl_StartServiceA *)_r;
 			r->out.result = _svcctl_StartServiceA(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_GETSERVICEDISPLAYNAMEA: {
-			struct svcctl_GetServiceDisplayNameA *r = _r;
+			struct svcctl_GetServiceDisplayNameA *r = (struct svcctl_GetServiceDisplayNameA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.display_name_length = r->in.display_name_length;
 			r->out.display_name = talloc_zero(mem_ctx, const char *);
@@ -4023,7 +4023,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_GETSERVICEKEYNAMEA: {
-			struct svcctl_GetServiceKeyNameA *r = _r;
+			struct svcctl_GetServiceKeyNameA *r = (struct svcctl_GetServiceKeyNameA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.display_name_length = r->in.display_name_length;
 			r->out.key_name = talloc_zero(mem_ctx, const char *);
@@ -4036,31 +4036,31 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_GETCURRENTGROUPESTATEW: {
-			struct svcctl_GetCurrentGroupeStateW *r = _r;
+			struct svcctl_GetCurrentGroupeStateW *r = (struct svcctl_GetCurrentGroupeStateW *)_r;
 			r->out.result = _svcctl_GetCurrentGroupeStateW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_ENUMSERVICEGROUPW: {
-			struct svcctl_EnumServiceGroupW *r = _r;
+			struct svcctl_EnumServiceGroupW *r = (struct svcctl_EnumServiceGroupW *)_r;
 			r->out.result = _svcctl_EnumServiceGroupW(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_CHANGESERVICECONFIG2A: {
-			struct svcctl_ChangeServiceConfig2A *r = _r;
+			struct svcctl_ChangeServiceConfig2A *r = (struct svcctl_ChangeServiceConfig2A *)_r;
 			r->out.result = _svcctl_ChangeServiceConfig2A(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_CHANGESERVICECONFIG2W: {
-			struct svcctl_ChangeServiceConfig2W *r = _r;
+			struct svcctl_ChangeServiceConfig2W *r = (struct svcctl_ChangeServiceConfig2W *)_r;
 			r->out.result = _svcctl_ChangeServiceConfig2W(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_SVCCTL_QUERYSERVICECONFIG2A: {
-			struct svcctl_QueryServiceConfig2A *r = _r;
+			struct svcctl_QueryServiceConfig2A *r = (struct svcctl_QueryServiceConfig2A *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.buffer = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
 			if (r->out.buffer == NULL) {
@@ -4077,7 +4077,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_QUERYSERVICECONFIG2W: {
-			struct svcctl_QueryServiceConfig2W *r = _r;
+			struct svcctl_QueryServiceConfig2W *r = (struct svcctl_QueryServiceConfig2W *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.buffer = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
 			if (r->out.buffer == NULL) {
@@ -4094,7 +4094,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_QUERYSERVICESTATUSEX: {
-			struct svcctl_QueryServiceStatusEx *r = _r;
+			struct svcctl_QueryServiceStatusEx *r = (struct svcctl_QueryServiceStatusEx *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.buffer = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
 			if (r->out.buffer == NULL) {
@@ -4111,7 +4111,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_ENUMSERVICESSTATUSEXA: {
-			struct EnumServicesStatusExA *r = _r;
+			struct EnumServicesStatusExA *r = (struct EnumServicesStatusExA *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.services = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
@@ -4139,7 +4139,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_ENUMSERVICESSTATUSEXW: {
-			struct EnumServicesStatusExW *r = _r;
+			struct EnumServicesStatusExW *r = (struct EnumServicesStatusExW *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.resume_handle = r->in.resume_handle;
 			r->out.services = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
@@ -4162,7 +4162,7 @@ NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_SVCCTL_SCSENDTSMESSAGE: {
-			struct svcctl_SCSendTSMessage *r = _r;
+			struct svcctl_SCSendTSMessage *r = (struct svcctl_SCSendTSMessage *)_r;
 			r->out.result = _svcctl_SCSendTSMessage(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_winreg.c b/librpc/gen_ndr/srv_winreg.c
index d18614f90b..d0873f8d62 100644
--- a/librpc/gen_ndr/srv_winreg.c
+++ b/librpc/gen_ndr/srv_winreg.c
@@ -2775,7 +2775,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_WINREG_OPENHKCR: {
-			struct winreg_OpenHKCR *r = _r;
+			struct winreg_OpenHKCR *r = (struct winreg_OpenHKCR *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -2787,7 +2787,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKCU: {
-			struct winreg_OpenHKCU *r = _r;
+			struct winreg_OpenHKCU *r = (struct winreg_OpenHKCU *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -2799,7 +2799,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKLM: {
-			struct winreg_OpenHKLM *r = _r;
+			struct winreg_OpenHKLM *r = (struct winreg_OpenHKLM *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -2811,7 +2811,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKPD: {
-			struct winreg_OpenHKPD *r = _r;
+			struct winreg_OpenHKPD *r = (struct winreg_OpenHKPD *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -2823,7 +2823,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKU: {
-			struct winreg_OpenHKU *r = _r;
+			struct winreg_OpenHKU *r = (struct winreg_OpenHKU *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -2835,7 +2835,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_CLOSEKEY: {
-			struct winreg_CloseKey *r = _r;
+			struct winreg_CloseKey *r = (struct winreg_CloseKey *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = r->in.handle;
 			r->out.result = _winreg_CloseKey(cli->pipes_struct, r);
@@ -2843,7 +2843,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_CREATEKEY: {
-			struct winreg_CreateKey *r = _r;
+			struct winreg_CreateKey *r = (struct winreg_CreateKey *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.action_taken = r->in.action_taken;
 			r->out.new_handle = talloc_zero(mem_ctx, struct policy_handle);
@@ -2856,19 +2856,19 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_DELETEKEY: {
-			struct winreg_DeleteKey *r = _r;
+			struct winreg_DeleteKey *r = (struct winreg_DeleteKey *)_r;
 			r->out.result = _winreg_DeleteKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_DELETEVALUE: {
-			struct winreg_DeleteValue *r = _r;
+			struct winreg_DeleteValue *r = (struct winreg_DeleteValue *)_r;
 			r->out.result = _winreg_DeleteValue(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_ENUMKEY: {
-			struct winreg_EnumKey *r = _r;
+			struct winreg_EnumKey *r = (struct winreg_EnumKey *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.name = r->in.name;
 			r->out.keyclass = r->in.keyclass;
@@ -2878,7 +2878,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_ENUMVALUE: {
-			struct winreg_EnumValue *r = _r;
+			struct winreg_EnumValue *r = (struct winreg_EnumValue *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.name = r->in.name;
 			r->out.type = r->in.type;
@@ -2890,13 +2890,13 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_FLUSHKEY: {
-			struct winreg_FlushKey *r = _r;
+			struct winreg_FlushKey *r = (struct winreg_FlushKey *)_r;
 			r->out.result = _winreg_FlushKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_GETKEYSECURITY: {
-			struct winreg_GetKeySecurity *r = _r;
+			struct winreg_GetKeySecurity *r = (struct winreg_GetKeySecurity *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.sd = r->in.sd;
 			r->out.result = _winreg_GetKeySecurity(cli->pipes_struct, r);
@@ -2904,19 +2904,19 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_LOADKEY: {
-			struct winreg_LoadKey *r = _r;
+			struct winreg_LoadKey *r = (struct winreg_LoadKey *)_r;
 			r->out.result = _winreg_LoadKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_NOTIFYCHANGEKEYVALUE: {
-			struct winreg_NotifyChangeKeyValue *r = _r;
+			struct winreg_NotifyChangeKeyValue *r = (struct winreg_NotifyChangeKeyValue *)_r;
 			r->out.result = _winreg_NotifyChangeKeyValue(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_OPENKEY: {
-			struct winreg_OpenKey *r = _r;
+			struct winreg_OpenKey *r = (struct winreg_OpenKey *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -2928,7 +2928,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_QUERYINFOKEY: {
-			struct winreg_QueryInfoKey *r = _r;
+			struct winreg_QueryInfoKey *r = (struct winreg_QueryInfoKey *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.classname = r->in.classname;
 			r->out.num_subkeys = talloc_zero(mem_ctx, uint32_t);
@@ -2976,7 +2976,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_QUERYVALUE: {
-			struct winreg_QueryValue *r = _r;
+			struct winreg_QueryValue *r = (struct winreg_QueryValue *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.type = r->in.type;
 			r->out.data = r->in.data;
@@ -2987,55 +2987,55 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_REPLACEKEY: {
-			struct winreg_ReplaceKey *r = _r;
+			struct winreg_ReplaceKey *r = (struct winreg_ReplaceKey *)_r;
 			r->out.result = _winreg_ReplaceKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_RESTOREKEY: {
-			struct winreg_RestoreKey *r = _r;
+			struct winreg_RestoreKey *r = (struct winreg_RestoreKey *)_r;
 			r->out.result = _winreg_RestoreKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_SAVEKEY: {
-			struct winreg_SaveKey *r = _r;
+			struct winreg_SaveKey *r = (struct winreg_SaveKey *)_r;
 			r->out.result = _winreg_SaveKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_SETKEYSECURITY: {
-			struct winreg_SetKeySecurity *r = _r;
+			struct winreg_SetKeySecurity *r = (struct winreg_SetKeySecurity *)_r;
 			r->out.result = _winreg_SetKeySecurity(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_SETVALUE: {
-			struct winreg_SetValue *r = _r;
+			struct winreg_SetValue *r = (struct winreg_SetValue *)_r;
 			r->out.result = _winreg_SetValue(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_UNLOADKEY: {
-			struct winreg_UnLoadKey *r = _r;
+			struct winreg_UnLoadKey *r = (struct winreg_UnLoadKey *)_r;
 			r->out.result = _winreg_UnLoadKey(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_INITIATESYSTEMSHUTDOWN: {
-			struct winreg_InitiateSystemShutdown *r = _r;
+			struct winreg_InitiateSystemShutdown *r = (struct winreg_InitiateSystemShutdown *)_r;
 			r->out.result = _winreg_InitiateSystemShutdown(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_ABORTSYSTEMSHUTDOWN: {
-			struct winreg_AbortSystemShutdown *r = _r;
+			struct winreg_AbortSystemShutdown *r = (struct winreg_AbortSystemShutdown *)_r;
 			r->out.result = _winreg_AbortSystemShutdown(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_GETVERSION: {
-			struct winreg_GetVersion *r = _r;
+			struct winreg_GetVersion *r = (struct winreg_GetVersion *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.version = talloc_zero(mem_ctx, uint32_t);
 			if (r->out.version == NULL) {
@@ -3047,7 +3047,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKCC: {
-			struct winreg_OpenHKCC *r = _r;
+			struct winreg_OpenHKCC *r = (struct winreg_OpenHKCC *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3059,7 +3059,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKDD: {
-			struct winreg_OpenHKDD *r = _r;
+			struct winreg_OpenHKDD *r = (struct winreg_OpenHKDD *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3071,7 +3071,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_QUERYMULTIPLEVALUES: {
-			struct winreg_QueryMultipleValues *r = _r;
+			struct winreg_QueryMultipleValues *r = (struct winreg_QueryMultipleValues *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.values = r->in.values;
 			r->out.buffer = r->in.buffer;
@@ -3081,19 +3081,19 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_INITIATESYSTEMSHUTDOWNEX: {
-			struct winreg_InitiateSystemShutdownEx *r = _r;
+			struct winreg_InitiateSystemShutdownEx *r = (struct winreg_InitiateSystemShutdownEx *)_r;
 			r->out.result = _winreg_InitiateSystemShutdownEx(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_SAVEKEYEX: {
-			struct winreg_SaveKeyEx *r = _r;
+			struct winreg_SaveKeyEx *r = (struct winreg_SaveKeyEx *)_r;
 			r->out.result = _winreg_SaveKeyEx(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WINREG_OPENHKPT: {
-			struct winreg_OpenHKPT *r = _r;
+			struct winreg_OpenHKPT *r = (struct winreg_OpenHKPT *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3105,7 +3105,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_OPENHKPN: {
-			struct winreg_OpenHKPN *r = _r;
+			struct winreg_OpenHKPN *r = (struct winreg_OpenHKPN *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.handle = talloc_zero(mem_ctx, struct policy_handle);
 			if (r->out.handle == NULL) {
@@ -3117,7 +3117,7 @@ NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WINREG_QUERYMULTIPLEVALUES2: {
-			struct winreg_QueryMultipleValues2 *r = _r;
+			struct winreg_QueryMultipleValues2 *r = (struct winreg_QueryMultipleValues2 *)_r;
 			r->out.result = _winreg_QueryMultipleValues2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
diff --git a/librpc/gen_ndr/srv_wkssvc.c b/librpc/gen_ndr/srv_wkssvc.c
index 1838af1214..eab971f42b 100644
--- a/librpc/gen_ndr/srv_wkssvc.c
+++ b/librpc/gen_ndr/srv_wkssvc.c
@@ -2415,7 +2415,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 	switch (opnum)
 	{
 		case NDR_WKSSVC_NETWKSTAGETINFO: {
-			struct wkssvc_NetWkstaGetInfo *r = _r;
+			struct wkssvc_NetWkstaGetInfo *r = (struct wkssvc_NetWkstaGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union wkssvc_NetWkstaInfo);
 			if (r->out.info == NULL) {
@@ -2427,7 +2427,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETWKSTASETINFO: {
-			struct wkssvc_NetWkstaSetInfo *r = _r;
+			struct wkssvc_NetWkstaSetInfo *r = (struct wkssvc_NetWkstaSetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_error = r->in.parm_error;
 			r->out.result = _wkssvc_NetWkstaSetInfo(cli->pipes_struct, r);
@@ -2435,7 +2435,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETWKSTAENUMUSERS: {
-			struct wkssvc_NetWkstaEnumUsers *r = _r;
+			struct wkssvc_NetWkstaEnumUsers *r = (struct wkssvc_NetWkstaEnumUsers *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.resume_handle = r->in.resume_handle;
@@ -2449,7 +2449,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRWKSTAUSERGETINFO: {
-			struct wkssvc_NetrWkstaUserGetInfo *r = _r;
+			struct wkssvc_NetrWkstaUserGetInfo *r = (struct wkssvc_NetrWkstaUserGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, union wkssvc_NetrWkstaUserInfo);
 			if (r->out.info == NULL) {
@@ -2461,7 +2461,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRWKSTAUSERSETINFO: {
-			struct wkssvc_NetrWkstaUserSetInfo *r = _r;
+			struct wkssvc_NetrWkstaUserSetInfo *r = (struct wkssvc_NetrWkstaUserSetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_err = r->in.parm_err;
 			r->out.result = _wkssvc_NetrWkstaUserSetInfo(cli->pipes_struct, r);
@@ -2469,7 +2469,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETWKSTATRANSPORTENUM: {
-			struct wkssvc_NetWkstaTransportEnum *r = _r;
+			struct wkssvc_NetWkstaTransportEnum *r = (struct wkssvc_NetWkstaTransportEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.resume_handle = r->in.resume_handle;
@@ -2483,7 +2483,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRWKSTATRANSPORTADD: {
-			struct wkssvc_NetrWkstaTransportAdd *r = _r;
+			struct wkssvc_NetrWkstaTransportAdd *r = (struct wkssvc_NetrWkstaTransportAdd *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_err = r->in.parm_err;
 			r->out.result = _wkssvc_NetrWkstaTransportAdd(cli->pipes_struct, r);
@@ -2491,13 +2491,13 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRWKSTATRANSPORTDEL: {
-			struct wkssvc_NetrWkstaTransportDel *r = _r;
+			struct wkssvc_NetrWkstaTransportDel *r = (struct wkssvc_NetrWkstaTransportDel *)_r;
 			r->out.result = _wkssvc_NetrWkstaTransportDel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRUSEADD: {
-			struct wkssvc_NetrUseAdd *r = _r;
+			struct wkssvc_NetrUseAdd *r = (struct wkssvc_NetrUseAdd *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.parm_err = r->in.parm_err;
 			r->out.result = _wkssvc_NetrUseAdd(cli->pipes_struct, r);
@@ -2505,7 +2505,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRUSEGETINFO: {
-			struct wkssvc_NetrUseGetInfo *r = _r;
+			struct wkssvc_NetrUseGetInfo *r = (struct wkssvc_NetrUseGetInfo *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.ctr = talloc_zero(mem_ctx, union wkssvc_NetrUseGetInfoCtr);
 			if (r->out.ctr == NULL) {
@@ -2517,13 +2517,13 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRUSEDEL: {
-			struct wkssvc_NetrUseDel *r = _r;
+			struct wkssvc_NetrUseDel *r = (struct wkssvc_NetrUseDel *)_r;
 			r->out.result = _wkssvc_NetrUseDel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRUSEENUM: {
-			struct wkssvc_NetrUseEnum *r = _r;
+			struct wkssvc_NetrUseEnum *r = (struct wkssvc_NetrUseEnum *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = r->in.info;
 			r->out.resume_handle = r->in.resume_handle;
@@ -2537,13 +2537,13 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRMESSAGEBUFFERSEND: {
-			struct wkssvc_NetrMessageBufferSend *r = _r;
+			struct wkssvc_NetrMessageBufferSend *r = (struct wkssvc_NetrMessageBufferSend *)_r;
 			r->out.result = _wkssvc_NetrMessageBufferSend(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET: {
-			struct wkssvc_NetrWorkstationStatisticsGet *r = _r;
+			struct wkssvc_NetrWorkstationStatisticsGet *r = (struct wkssvc_NetrWorkstationStatisticsGet *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.info = talloc_zero(mem_ctx, struct wkssvc_NetrWorkstationStatistics *);
 			if (r->out.info == NULL) {
@@ -2555,43 +2555,43 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRLOGONDOMAINNAMEADD: {
-			struct wkssvc_NetrLogonDomainNameAdd *r = _r;
+			struct wkssvc_NetrLogonDomainNameAdd *r = (struct wkssvc_NetrLogonDomainNameAdd *)_r;
 			r->out.result = _wkssvc_NetrLogonDomainNameAdd(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL: {
-			struct wkssvc_NetrLogonDomainNameDel *r = _r;
+			struct wkssvc_NetrLogonDomainNameDel *r = (struct wkssvc_NetrLogonDomainNameDel *)_r;
 			r->out.result = _wkssvc_NetrLogonDomainNameDel(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRJOINDOMAIN: {
-			struct wkssvc_NetrJoinDomain *r = _r;
+			struct wkssvc_NetrJoinDomain *r = (struct wkssvc_NetrJoinDomain *)_r;
 			r->out.result = _wkssvc_NetrJoinDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRUNJOINDOMAIN: {
-			struct wkssvc_NetrUnjoinDomain *r = _r;
+			struct wkssvc_NetrUnjoinDomain *r = (struct wkssvc_NetrUnjoinDomain *)_r;
 			r->out.result = _wkssvc_NetrUnjoinDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN: {
-			struct wkssvc_NetrRenameMachineInDomain *r = _r;
+			struct wkssvc_NetrRenameMachineInDomain *r = (struct wkssvc_NetrRenameMachineInDomain *)_r;
 			r->out.result = _wkssvc_NetrRenameMachineInDomain(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRVALIDATENAME: {
-			struct wkssvc_NetrValidateName *r = _r;
+			struct wkssvc_NetrValidateName *r = (struct wkssvc_NetrValidateName *)_r;
 			r->out.result = _wkssvc_NetrValidateName(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRGETJOININFORMATION: {
-			struct wkssvc_NetrGetJoinInformation *r = _r;
+			struct wkssvc_NetrGetJoinInformation *r = (struct wkssvc_NetrGetJoinInformation *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.name_buffer = r->in.name_buffer;
 			r->out.name_type = talloc_zero(mem_ctx, enum wkssvc_NetJoinStatus);
@@ -2604,7 +2604,7 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRGETJOINABLEOUS: {
-			struct wkssvc_NetrGetJoinableOus *r = _r;
+			struct wkssvc_NetrGetJoinableOus *r = (struct wkssvc_NetrGetJoinableOus *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.num_ous = r->in.num_ous;
 			r->out.ous = talloc_zero(mem_ctx, const char **);
@@ -2617,31 +2617,31 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRJOINDOMAIN2: {
-			struct wkssvc_NetrJoinDomain2 *r = _r;
+			struct wkssvc_NetrJoinDomain2 *r = (struct wkssvc_NetrJoinDomain2 *)_r;
 			r->out.result = _wkssvc_NetrJoinDomain2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRUNJOINDOMAIN2: {
-			struct wkssvc_NetrUnjoinDomain2 *r = _r;
+			struct wkssvc_NetrUnjoinDomain2 *r = (struct wkssvc_NetrUnjoinDomain2 *)_r;
 			r->out.result = _wkssvc_NetrUnjoinDomain2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2: {
-			struct wkssvc_NetrRenameMachineInDomain2 *r = _r;
+			struct wkssvc_NetrRenameMachineInDomain2 *r = (struct wkssvc_NetrRenameMachineInDomain2 *)_r;
 			r->out.result = _wkssvc_NetrRenameMachineInDomain2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRVALIDATENAME2: {
-			struct wkssvc_NetrValidateName2 *r = _r;
+			struct wkssvc_NetrValidateName2 *r = (struct wkssvc_NetrValidateName2 *)_r;
 			r->out.result = _wkssvc_NetrValidateName2(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRGETJOINABLEOUS2: {
-			struct wkssvc_NetrGetJoinableOus2 *r = _r;
+			struct wkssvc_NetrGetJoinableOus2 *r = (struct wkssvc_NetrGetJoinableOus2 *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.num_ous = r->in.num_ous;
 			r->out.ous = talloc_zero(mem_ctx, const char **);
@@ -2654,25 +2654,25 @@ NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, c
 		}
 
 		case NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME: {
-			struct wkssvc_NetrAddAlternateComputerName *r = _r;
+			struct wkssvc_NetrAddAlternateComputerName *r = (struct wkssvc_NetrAddAlternateComputerName *)_r;
 			r->out.result = _wkssvc_NetrAddAlternateComputerName(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME: {
-			struct wkssvc_NetrRemoveAlternateComputerName *r = _r;
+			struct wkssvc_NetrRemoveAlternateComputerName *r = (struct wkssvc_NetrRemoveAlternateComputerName *)_r;
 			r->out.result = _wkssvc_NetrRemoveAlternateComputerName(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME: {
-			struct wkssvc_NetrSetPrimaryComputername *r = _r;
+			struct wkssvc_NetrSetPrimaryComputername *r = (struct wkssvc_NetrSetPrimaryComputername *)_r;
 			r->out.result = _wkssvc_NetrSetPrimaryComputername(cli->pipes_struct, r);
 			return NT_STATUS_OK;
 		}
 
 		case NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES: {
-			struct wkssvc_NetrEnumerateComputerNames *r = _r;
+			struct wkssvc_NetrEnumerateComputerNames *r = (struct wkssvc_NetrEnumerateComputerNames *)_r;
 			ZERO_STRUCT(r->out);
 			r->out.ctr = talloc_zero(mem_ctx, struct wkssvc_ComputerNamesCtr *);
 			if (r->out.ctr == NULL) {