s3: Do not reference the ndr_tables in the server calls directly

This involves storing the interface table in the pipes_struct

21 files changed, 655 insertions, 646 deletions

diff --git a/librpc/gen_ndr/srv_dfs.c b/librpc/gen_ndr/srv_dfs.c
index 9fd295432d6..f3cdbadfd73 100644
--- a/librpc/gen_ndr/srv_dfs.c
+++ b/librpc/gen_ndr/srv_dfs.c
@@ -15,7 +15,7 @@ static bool api_dfs_GetManagerVersion(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_GetManagerVersion *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_GETMANAGERVERSION];
+	call = &p->interface->calls[NDR_DFS_GETMANAGERVERSION];
 
 	r = talloc(talloc_tos(), struct dfs_GetManagerVersion);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_dfs_Add(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Add *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ADD];
+	call = &p->interface->calls[NDR_DFS_ADD];
 
 	r = talloc(talloc_tos(), struct dfs_Add);
 	if (r == NULL) {
@@ -168,7 +168,7 @@ static bool api_dfs_Remove(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Remove *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVE];
+	call = &p->interface->calls[NDR_DFS_REMOVE];
 
 	r = talloc(talloc_tos(), struct dfs_Remove);
 	if (r == NULL) {
@@ -241,7 +241,7 @@ static bool api_dfs_SetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_SetInfo *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_SETINFO];
+	call = &p->interface->calls[NDR_DFS_SETINFO];
 
 	r = talloc(talloc_tos(), struct dfs_SetInfo);
 	if (r == NULL) {
@@ -314,7 +314,7 @@ static bool api_dfs_GetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_GetInfo *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_GETINFO];
+	call = &p->interface->calls[NDR_DFS_GETINFO];
 
 	r = talloc(talloc_tos(), struct dfs_GetInfo);
 	if (r == NULL) {
@@ -394,7 +394,7 @@ static bool api_dfs_Enum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Enum *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ENUM];
+	call = &p->interface->calls[NDR_DFS_ENUM];
 
 	r = talloc(talloc_tos(), struct dfs_Enum);
 	if (r == NULL) {
@@ -470,7 +470,7 @@ static bool api_dfs_Rename(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Rename *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_RENAME];
+	call = &p->interface->calls[NDR_DFS_RENAME];
 
 	r = talloc(talloc_tos(), struct dfs_Rename);
 	if (r == NULL) {
@@ -543,7 +543,7 @@ static bool api_dfs_Move(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Move *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_MOVE];
+	call = &p->interface->calls[NDR_DFS_MOVE];
 
 	r = talloc(talloc_tos(), struct dfs_Move);
 	if (r == NULL) {
@@ -616,7 +616,7 @@ static bool api_dfs_ManagerGetConfigInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_ManagerGetConfigInfo *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_MANAGERGETCONFIGINFO];
+	call = &p->interface->calls[NDR_DFS_MANAGERGETCONFIGINFO];
 
 	r = talloc(talloc_tos(), struct dfs_ManagerGetConfigInfo);
 	if (r == NULL) {
@@ -689,7 +689,7 @@ static bool api_dfs_ManagerSendSiteInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_ManagerSendSiteInfo *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_MANAGERSENDSITEINFO];
+	call = &p->interface->calls[NDR_DFS_MANAGERSENDSITEINFO];
 
 	r = talloc(talloc_tos(), struct dfs_ManagerSendSiteInfo);
 	if (r == NULL) {
@@ -762,7 +762,7 @@ static bool api_dfs_AddFtRoot(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_AddFtRoot *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ADDFTROOT];
+	call = &p->interface->calls[NDR_DFS_ADDFTROOT];
 
 	r = talloc(talloc_tos(), struct dfs_AddFtRoot);
 	if (r == NULL) {
@@ -837,7 +837,7 @@ static bool api_dfs_RemoveFtRoot(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_RemoveFtRoot *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVEFTROOT];
+	call = &p->interface->calls[NDR_DFS_REMOVEFTROOT];
 
 	r = talloc(talloc_tos(), struct dfs_RemoveFtRoot);
 	if (r == NULL) {
@@ -912,7 +912,7 @@ static bool api_dfs_AddStdRoot(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_AddStdRoot *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ADDSTDROOT];
+	call = &p->interface->calls[NDR_DFS_ADDSTDROOT];
 
 	r = talloc(talloc_tos(), struct dfs_AddStdRoot);
 	if (r == NULL) {
@@ -985,7 +985,7 @@ static bool api_dfs_RemoveStdRoot(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_RemoveStdRoot *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVESTDROOT];
+	call = &p->interface->calls[NDR_DFS_REMOVESTDROOT];
 
 	r = talloc(talloc_tos(), struct dfs_RemoveStdRoot);
 	if (r == NULL) {
@@ -1058,7 +1058,7 @@ static bool api_dfs_ManagerInitialize(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_ManagerInitialize *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_MANAGERINITIALIZE];
+	call = &p->interface->calls[NDR_DFS_MANAGERINITIALIZE];
 
 	r = talloc(talloc_tos(), struct dfs_ManagerInitialize);
 	if (r == NULL) {
@@ -1131,7 +1131,7 @@ static bool api_dfs_AddStdRootForced(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_AddStdRootForced *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ADDSTDROOTFORCED];
+	call = &p->interface->calls[NDR_DFS_ADDSTDROOTFORCED];
 
 	r = talloc(talloc_tos(), struct dfs_AddStdRootForced);
 	if (r == NULL) {
@@ -1204,7 +1204,7 @@ static bool api_dfs_GetDcAddress(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_GetDcAddress *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_GETDCADDRESS];
+	call = &p->interface->calls[NDR_DFS_GETDCADDRESS];
 
 	r = talloc(talloc_tos(), struct dfs_GetDcAddress);
 	if (r == NULL) {
@@ -1281,7 +1281,7 @@ static bool api_dfs_SetDcAddress(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_SetDcAddress *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_SETDCADDRESS];
+	call = &p->interface->calls[NDR_DFS_SETDCADDRESS];
 
 	r = talloc(talloc_tos(), struct dfs_SetDcAddress);
 	if (r == NULL) {
@@ -1354,7 +1354,7 @@ static bool api_dfs_FlushFtTable(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_FlushFtTable *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_FLUSHFTTABLE];
+	call = &p->interface->calls[NDR_DFS_FLUSHFTTABLE];
 
 	r = talloc(talloc_tos(), struct dfs_FlushFtTable);
 	if (r == NULL) {
@@ -1427,7 +1427,7 @@ static bool api_dfs_Add2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Add2 *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ADD2];
+	call = &p->interface->calls[NDR_DFS_ADD2];
 
 	r = talloc(talloc_tos(), struct dfs_Add2);
 	if (r == NULL) {
@@ -1500,7 +1500,7 @@ static bool api_dfs_Remove2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_Remove2 *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_REMOVE2];
+	call = &p->interface->calls[NDR_DFS_REMOVE2];
 
 	r = talloc(talloc_tos(), struct dfs_Remove2);
 	if (r == NULL) {
@@ -1573,7 +1573,7 @@ static bool api_dfs_EnumEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_EnumEx *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_ENUMEX];
+	call = &p->interface->calls[NDR_DFS_ENUMEX];
 
 	r = talloc(talloc_tos(), struct dfs_EnumEx);
 	if (r == NULL) {
@@ -1649,7 +1649,7 @@ static bool api_dfs_SetInfo2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dfs_SetInfo2 *r;
 
-	call = &ndr_table_netdfs.calls[NDR_DFS_SETINFO2];
+	call = &p->interface->calls[NDR_DFS_SETINFO2];
 
 	r = talloc(talloc_tos(), struct dfs_SetInfo2);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_dssetup.c b/librpc/gen_ndr/srv_dssetup.c
index effe8c183c4..5bdc6ed35cd 100644
--- a/librpc/gen_ndr/srv_dssetup.c
+++ b/librpc/gen_ndr/srv_dssetup.c
@@ -15,7 +15,7 @@ static bool api_dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleGetPrimaryDomainInformation *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleGetPrimaryDomainInformation);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_dssetup_DsRoleDnsNameToFlatName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleDnsNameToFlatName *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleDnsNameToFlatName);
 	if (r == NULL) {
@@ -168,7 +168,7 @@ static bool api_dssetup_DsRoleDcAsDc(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleDcAsDc *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDCASDC];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEDCASDC];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleDcAsDc);
 	if (r == NULL) {
@@ -241,7 +241,7 @@ static bool api_dssetup_DsRoleDcAsReplica(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleDcAsReplica *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDCASREPLICA];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEDCASREPLICA];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleDcAsReplica);
 	if (r == NULL) {
@@ -314,7 +314,7 @@ static bool api_dssetup_DsRoleDemoteDc(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleDemoteDc *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEDEMOTEDC];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEDEMOTEDC];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleDemoteDc);
 	if (r == NULL) {
@@ -387,7 +387,7 @@ static bool api_dssetup_DsRoleGetDcOperationProgress(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleGetDcOperationProgress *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleGetDcOperationProgress);
 	if (r == NULL) {
@@ -460,7 +460,7 @@ static bool api_dssetup_DsRoleGetDcOperationResults(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleGetDcOperationResults *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleGetDcOperationResults);
 	if (r == NULL) {
@@ -533,7 +533,7 @@ static bool api_dssetup_DsRoleCancel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleCancel *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLECANCEL];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLECANCEL];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleCancel);
 	if (r == NULL) {
@@ -606,7 +606,7 @@ static bool api_dssetup_DsRoleServerSaveStateForUpgrade(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleServerSaveStateForUpgrade *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleServerSaveStateForUpgrade);
 	if (r == NULL) {
@@ -679,7 +679,7 @@ static bool api_dssetup_DsRoleUpgradeDownlevelServer(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleUpgradeDownlevelServer *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleUpgradeDownlevelServer);
 	if (r == NULL) {
@@ -752,7 +752,7 @@ static bool api_dssetup_DsRoleAbortDownlevelServerUpgrade(pipes_struct *p)
 	DATA_BLOB blob;
 	struct dssetup_DsRoleAbortDownlevelServerUpgrade *r;
 
-	call = &ndr_table_dssetup.calls[NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE];
+	call = &p->interface->calls[NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE];
 
 	r = talloc(talloc_tos(), struct dssetup_DsRoleAbortDownlevelServerUpgrade);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_echo.c b/librpc/gen_ndr/srv_echo.c
index 83005ff297f..ac8a9a3f36e 100644
--- a/librpc/gen_ndr/srv_echo.c
+++ b/librpc/gen_ndr/srv_echo.c
@@ -15,7 +15,7 @@ static bool api_echo_AddOne(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_AddOne *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_ADDONE];
+	call = &p->interface->calls[NDR_ECHO_ADDONE];
 
 	r = talloc(talloc_tos(), struct echo_AddOne);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_echo_EchoData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_EchoData *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_ECHODATA];
+	call = &p->interface->calls[NDR_ECHO_ECHODATA];
 
 	r = talloc(talloc_tos(), struct echo_EchoData);
 	if (r == NULL) {
@@ -175,7 +175,7 @@ static bool api_echo_SinkData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_SinkData *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_SINKDATA];
+	call = &p->interface->calls[NDR_ECHO_SINKDATA];
 
 	r = talloc(talloc_tos(), struct echo_SinkData);
 	if (r == NULL) {
@@ -248,7 +248,7 @@ static bool api_echo_SourceData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_SourceData *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_SOURCEDATA];
+	call = &p->interface->calls[NDR_ECHO_SOURCEDATA];
 
 	r = talloc(talloc_tos(), struct echo_SourceData);
 	if (r == NULL) {
@@ -328,7 +328,7 @@ static bool api_echo_TestCall(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestCall *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL];
+	call = &p->interface->calls[NDR_ECHO_TESTCALL];
 
 	r = talloc(talloc_tos(), struct echo_TestCall);
 	if (r == NULL) {
@@ -408,7 +408,7 @@ static bool api_echo_TestCall2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestCall2 *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTCALL2];
+	call = &p->interface->calls[NDR_ECHO_TESTCALL2];
 
 	r = talloc(talloc_tos(), struct echo_TestCall2);
 	if (r == NULL) {
@@ -488,7 +488,7 @@ static bool api_echo_TestSleep(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestSleep *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSLEEP];
+	call = &p->interface->calls[NDR_ECHO_TESTSLEEP];
 
 	r = talloc(talloc_tos(), struct echo_TestSleep);
 	if (r == NULL) {
@@ -561,7 +561,7 @@ static bool api_echo_TestEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestEnum *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTENUM];
+	call = &p->interface->calls[NDR_ECHO_TESTENUM];
 
 	r = talloc(talloc_tos(), struct echo_TestEnum);
 	if (r == NULL) {
@@ -638,7 +638,7 @@ static bool api_echo_TestSurrounding(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestSurrounding *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTSURROUNDING];
+	call = &p->interface->calls[NDR_ECHO_TESTSURROUNDING];
 
 	r = talloc(talloc_tos(), struct echo_TestSurrounding);
 	if (r == NULL) {
@@ -713,7 +713,7 @@ static bool api_echo_TestDoublePointer(pipes_struct *p)
 	DATA_BLOB blob;
 	struct echo_TestDoublePointer *r;
 
-	call = &ndr_table_rpcecho.calls[NDR_ECHO_TESTDOUBLEPOINTER];
+	call = &p->interface->calls[NDR_ECHO_TESTDOUBLEPOINTER];
 
 	r = talloc(talloc_tos(), struct echo_TestDoublePointer);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_epmapper.c b/librpc/gen_ndr/srv_epmapper.c
index d0c617aea6a..8648b011df7 100644
--- a/librpc/gen_ndr/srv_epmapper.c
+++ b/librpc/gen_ndr/srv_epmapper.c
@@ -15,7 +15,7 @@ static bool api_epm_Insert(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_Insert *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_INSERT];
+	call = &p->interface->calls[NDR_EPM_INSERT];
 
 	r = talloc(talloc_tos(), struct epm_Insert);
 	if (r == NULL) {
@@ -88,7 +88,7 @@ static bool api_epm_Delete(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_Delete *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_DELETE];
+	call = &p->interface->calls[NDR_EPM_DELETE];
 
 	r = talloc(talloc_tos(), struct epm_Delete);
 	if (r == NULL) {
@@ -161,7 +161,7 @@ static bool api_epm_Lookup(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_Lookup *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_LOOKUP];
+	call = &p->interface->calls[NDR_EPM_LOOKUP];
 
 	r = talloc(talloc_tos(), struct epm_Lookup);
 	if (r == NULL) {
@@ -248,7 +248,7 @@ static bool api_epm_Map(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_Map *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_MAP];
+	call = &p->interface->calls[NDR_EPM_MAP];
 
 	r = talloc(talloc_tos(), struct epm_Map);
 	if (r == NULL) {
@@ -335,7 +335,7 @@ static bool api_epm_LookupHandleFree(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_LookupHandleFree *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_LOOKUPHANDLEFREE];
+	call = &p->interface->calls[NDR_EPM_LOOKUPHANDLEFREE];
 
 	r = talloc(talloc_tos(), struct epm_LookupHandleFree);
 	if (r == NULL) {
@@ -410,7 +410,7 @@ static bool api_epm_InqObject(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_InqObject *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_INQOBJECT];
+	call = &p->interface->calls[NDR_EPM_INQOBJECT];
 
 	r = talloc(talloc_tos(), struct epm_InqObject);
 	if (r == NULL) {
@@ -483,7 +483,7 @@ static bool api_epm_MgmtDelete(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_MgmtDelete *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_MGMTDELETE];
+	call = &p->interface->calls[NDR_EPM_MGMTDELETE];
 
 	r = talloc(talloc_tos(), struct epm_MgmtDelete);
 	if (r == NULL) {
@@ -556,7 +556,7 @@ static bool api_epm_MapAuth(pipes_struct *p)
 	DATA_BLOB blob;
 	struct epm_MapAuth *r;
 
-	call = &ndr_table_epmapper.calls[NDR_EPM_MAPAUTH];
+	call = &p->interface->calls[NDR_EPM_MAPAUTH];
 
 	r = talloc(talloc_tos(), struct epm_MapAuth);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_eventlog.c b/librpc/gen_ndr/srv_eventlog.c
index 7404ba2a3ac..9b53d33da1f 100644
--- a/librpc/gen_ndr/srv_eventlog.c
+++ b/librpc/gen_ndr/srv_eventlog.c
@@ -15,7 +15,7 @@ static bool api_eventlog_ClearEventLogW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ClearEventLogW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CLEAREVENTLOGW];
+	call = &p->interface->calls[NDR_EVENTLOG_CLEAREVENTLOGW];
 
 	r = talloc(talloc_tos(), struct eventlog_ClearEventLogW);
 	if (r == NULL) {
@@ -88,7 +88,7 @@ static bool api_eventlog_BackupEventLogW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_BackupEventLogW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_BACKUPEVENTLOGW];
+	call = &p->interface->calls[NDR_EVENTLOG_BACKUPEVENTLOGW];
 
 	r = talloc(talloc_tos(), struct eventlog_BackupEventLogW);
 	if (r == NULL) {
@@ -161,7 +161,7 @@ static bool api_eventlog_CloseEventLog(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_CloseEventLog *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CLOSEEVENTLOG];
+	call = &p->interface->calls[NDR_EVENTLOG_CLOSEEVENTLOG];
 
 	r = talloc(talloc_tos(), struct eventlog_CloseEventLog);
 	if (r == NULL) {
@@ -236,7 +236,7 @@ static bool api_eventlog_DeregisterEventSource(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_DeregisterEventSource *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_DEREGISTEREVENTSOURCE];
+	call = &p->interface->calls[NDR_EVENTLOG_DEREGISTEREVENTSOURCE];
 
 	r = talloc(talloc_tos(), struct eventlog_DeregisterEventSource);
 	if (r == NULL) {
@@ -311,7 +311,7 @@ static bool api_eventlog_GetNumRecords(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_GetNumRecords *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETNUMRECORDS];
+	call = &p->interface->calls[NDR_EVENTLOG_GETNUMRECORDS];
 
 	r = talloc(talloc_tos(), struct eventlog_GetNumRecords);
 	if (r == NULL) {
@@ -391,7 +391,7 @@ static bool api_eventlog_GetOldestRecord(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_GetOldestRecord *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETOLDESTRECORD];
+	call = &p->interface->calls[NDR_EVENTLOG_GETOLDESTRECORD];
 
 	r = talloc(talloc_tos(), struct eventlog_GetOldestRecord);
 	if (r == NULL) {
@@ -471,7 +471,7 @@ static bool api_eventlog_ChangeNotify(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ChangeNotify *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CHANGENOTIFY];
+	call = &p->interface->calls[NDR_EVENTLOG_CHANGENOTIFY];
 
 	r = talloc(talloc_tos(), struct eventlog_ChangeNotify);
 	if (r == NULL) {
@@ -544,7 +544,7 @@ static bool api_eventlog_OpenEventLogW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_OpenEventLogW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENEVENTLOGW];
+	call = &p->interface->calls[NDR_EVENTLOG_OPENEVENTLOGW];
 
 	r = talloc(talloc_tos(), struct eventlog_OpenEventLogW);
 	if (r == NULL) {
@@ -624,7 +624,7 @@ static bool api_eventlog_RegisterEventSourceW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_RegisterEventSourceW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REGISTEREVENTSOURCEW];
+	call = &p->interface->calls[NDR_EVENTLOG_REGISTEREVENTSOURCEW];
 
 	r = talloc(talloc_tos(), struct eventlog_RegisterEventSourceW);
 	if (r == NULL) {
@@ -704,7 +704,7 @@ static bool api_eventlog_OpenBackupEventLogW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_OpenBackupEventLogW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENBACKUPEVENTLOGW];
+	call = &p->interface->calls[NDR_EVENTLOG_OPENBACKUPEVENTLOGW];
 
 	r = talloc(talloc_tos(), struct eventlog_OpenBackupEventLogW);
 	if (r == NULL) {
@@ -784,7 +784,7 @@ static bool api_eventlog_ReadEventLogW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ReadEventLogW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_READEVENTLOGW];
+	call = &p->interface->calls[NDR_EVENTLOG_READEVENTLOGW];
 
 	r = talloc(talloc_tos(), struct eventlog_ReadEventLogW);
 	if (r == NULL) {
@@ -876,7 +876,7 @@ static bool api_eventlog_ReportEventW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ReportEventW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REPORTEVENTW];
+	call = &p->interface->calls[NDR_EVENTLOG_REPORTEVENTW];
 
 	r = talloc(talloc_tos(), struct eventlog_ReportEventW);
 	if (r == NULL) {
@@ -952,7 +952,7 @@ static bool api_eventlog_ClearEventLogA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ClearEventLogA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_CLEAREVENTLOGA];
+	call = &p->interface->calls[NDR_EVENTLOG_CLEAREVENTLOGA];
 
 	r = talloc(talloc_tos(), struct eventlog_ClearEventLogA);
 	if (r == NULL) {
@@ -1025,7 +1025,7 @@ static bool api_eventlog_BackupEventLogA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_BackupEventLogA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_BACKUPEVENTLOGA];
+	call = &p->interface->calls[NDR_EVENTLOG_BACKUPEVENTLOGA];
 
 	r = talloc(talloc_tos(), struct eventlog_BackupEventLogA);
 	if (r == NULL) {
@@ -1098,7 +1098,7 @@ static bool api_eventlog_OpenEventLogA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_OpenEventLogA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENEVENTLOGA];
+	call = &p->interface->calls[NDR_EVENTLOG_OPENEVENTLOGA];
 
 	r = talloc(talloc_tos(), struct eventlog_OpenEventLogA);
 	if (r == NULL) {
@@ -1171,7 +1171,7 @@ static bool api_eventlog_RegisterEventSourceA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_RegisterEventSourceA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REGISTEREVENTSOURCEA];
+	call = &p->interface->calls[NDR_EVENTLOG_REGISTEREVENTSOURCEA];
 
 	r = talloc(talloc_tos(), struct eventlog_RegisterEventSourceA);
 	if (r == NULL) {
@@ -1244,7 +1244,7 @@ static bool api_eventlog_OpenBackupEventLogA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_OpenBackupEventLogA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_OPENBACKUPEVENTLOGA];
+	call = &p->interface->calls[NDR_EVENTLOG_OPENBACKUPEVENTLOGA];
 
 	r = talloc(talloc_tos(), struct eventlog_OpenBackupEventLogA);
 	if (r == NULL) {
@@ -1317,7 +1317,7 @@ static bool api_eventlog_ReadEventLogA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ReadEventLogA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_READEVENTLOGA];
+	call = &p->interface->calls[NDR_EVENTLOG_READEVENTLOGA];
 
 	r = talloc(talloc_tos(), struct eventlog_ReadEventLogA);
 	if (r == NULL) {
@@ -1390,7 +1390,7 @@ static bool api_eventlog_ReportEventA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ReportEventA *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REPORTEVENTA];
+	call = &p->interface->calls[NDR_EVENTLOG_REPORTEVENTA];
 
 	r = talloc(talloc_tos(), struct eventlog_ReportEventA);
 	if (r == NULL) {
@@ -1463,7 +1463,7 @@ static bool api_eventlog_RegisterClusterSvc(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_RegisterClusterSvc *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REGISTERCLUSTERSVC];
+	call = &p->interface->calls[NDR_EVENTLOG_REGISTERCLUSTERSVC];
 
 	r = talloc(talloc_tos(), struct eventlog_RegisterClusterSvc);
 	if (r == NULL) {
@@ -1536,7 +1536,7 @@ static bool api_eventlog_DeregisterClusterSvc(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_DeregisterClusterSvc *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_DEREGISTERCLUSTERSVC];
+	call = &p->interface->calls[NDR_EVENTLOG_DEREGISTERCLUSTERSVC];
 
 	r = talloc(talloc_tos(), struct eventlog_DeregisterClusterSvc);
 	if (r == NULL) {
@@ -1609,7 +1609,7 @@ static bool api_eventlog_WriteClusterEvents(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_WriteClusterEvents *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_WRITECLUSTEREVENTS];
+	call = &p->interface->calls[NDR_EVENTLOG_WRITECLUSTEREVENTS];
 
 	r = talloc(talloc_tos(), struct eventlog_WriteClusterEvents);
 	if (r == NULL) {
@@ -1682,7 +1682,7 @@ static bool api_eventlog_GetLogInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_GetLogInformation *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETLOGINFORMATION];
+	call = &p->interface->calls[NDR_EVENTLOG_GETLOGINFORMATION];
 
 	r = talloc(talloc_tos(), struct eventlog_GetLogInformation);
 	if (r == NULL) {
@@ -1768,7 +1768,7 @@ static bool api_eventlog_FlushEventLog(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_FlushEventLog *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_FLUSHEVENTLOG];
+	call = &p->interface->calls[NDR_EVENTLOG_FLUSHEVENTLOG];
 
 	r = talloc(talloc_tos(), struct eventlog_FlushEventLog);
 	if (r == NULL) {
@@ -1841,7 +1841,7 @@ static bool api_eventlog_ReportEventAndSourceW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct eventlog_ReportEventAndSourceW *r;
 
-	call = &ndr_table_eventlog.calls[NDR_EVENTLOG_REPORTEVENTANDSOURCEW];
+	call = &p->interface->calls[NDR_EVENTLOG_REPORTEVENTANDSOURCEW];
 
 	r = talloc(talloc_tos(), struct eventlog_ReportEventAndSourceW);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_initshutdown.c b/librpc/gen_ndr/srv_initshutdown.c
index bf85fc25d98..d06f5628c3f 100644
--- a/librpc/gen_ndr/srv_initshutdown.c
+++ b/librpc/gen_ndr/srv_initshutdown.c
@@ -15,7 +15,7 @@ static bool api_initshutdown_Init(pipes_struct *p)
 	DATA_BLOB blob;
 	struct initshutdown_Init *r;
 
-	call = &ndr_table_initshutdown.calls[NDR_INITSHUTDOWN_INIT];
+	call = &p->interface->calls[NDR_INITSHUTDOWN_INIT];
 
 	r = talloc(talloc_tos(), struct initshutdown_Init);
 	if (r == NULL) {
@@ -88,7 +88,7 @@ static bool api_initshutdown_Abort(pipes_struct *p)
 	DATA_BLOB blob;
 	struct initshutdown_Abort *r;
 
-	call = &ndr_table_initshutdown.calls[NDR_INITSHUTDOWN_ABORT];
+	call = &p->interface->calls[NDR_INITSHUTDOWN_ABORT];
 
 	r = talloc(talloc_tos(), struct initshutdown_Abort);
 	if (r == NULL) {
@@ -161,7 +161,7 @@ static bool api_initshutdown_InitEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct initshutdown_InitEx *r;
 
-	call = &ndr_table_initshutdown.calls[NDR_INITSHUTDOWN_INITEX];
+	call = &p->interface->calls[NDR_INITSHUTDOWN_INITEX];
 
 	r = talloc(talloc_tos(), struct initshutdown_InitEx);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_lsa.c b/librpc/gen_ndr/srv_lsa.c
index da7af5f15b8..705d67b42b0 100644
--- a/librpc/gen_ndr/srv_lsa.c
+++ b/librpc/gen_ndr/srv_lsa.c
@@ -15,7 +15,7 @@ static bool api_lsa_Close(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_Close *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CLOSE];
+	call = &p->interface->calls[NDR_LSA_CLOSE];
 
 	r = talloc(talloc_tos(), struct lsa_Close);
 	if (r == NULL) {
@@ -90,7 +90,7 @@ static bool api_lsa_Delete(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_Delete *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_DELETE];
+	call = &p->interface->calls[NDR_LSA_DELETE];
 
 	r = talloc(talloc_tos(), struct lsa_Delete);
 	if (r == NULL) {
@@ -163,7 +163,7 @@ static bool api_lsa_EnumPrivs(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumPrivs *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMPRIVS];
+	call = &p->interface->calls[NDR_LSA_ENUMPRIVS];
 
 	r = talloc(talloc_tos(), struct lsa_EnumPrivs);
 	if (r == NULL) {
@@ -244,7 +244,7 @@ static bool api_lsa_QuerySecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QuerySecurity *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYSECURITY];
+	call = &p->interface->calls[NDR_LSA_QUERYSECURITY];
 
 	r = talloc(talloc_tos(), struct lsa_QuerySecurity);
 	if (r == NULL) {
@@ -324,7 +324,7 @@ static bool api_lsa_SetSecObj(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetSecObj *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETSECOBJ];
+	call = &p->interface->calls[NDR_LSA_SETSECOBJ];
 
 	r = talloc(talloc_tos(), struct lsa_SetSecObj);
 	if (r == NULL) {
@@ -397,7 +397,7 @@ static bool api_lsa_ChangePassword(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_ChangePassword *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CHANGEPASSWORD];
+	call = &p->interface->calls[NDR_LSA_CHANGEPASSWORD];
 
 	r = talloc(talloc_tos(), struct lsa_ChangePassword);
 	if (r == NULL) {
@@ -470,7 +470,7 @@ static bool api_lsa_OpenPolicy(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_OpenPolicy *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENPOLICY];
+	call = &p->interface->calls[NDR_LSA_OPENPOLICY];
 
 	r = talloc(talloc_tos(), struct lsa_OpenPolicy);
 	if (r == NULL) {
@@ -550,7 +550,7 @@ static bool api_lsa_QueryInfoPolicy(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QueryInfoPolicy *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYINFOPOLICY];
+	call = &p->interface->calls[NDR_LSA_QUERYINFOPOLICY];
 
 	r = talloc(talloc_tos(), struct lsa_QueryInfoPolicy);
 	if (r == NULL) {
@@ -630,7 +630,7 @@ static bool api_lsa_SetInfoPolicy(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetInfoPolicy *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETINFOPOLICY];
+	call = &p->interface->calls[NDR_LSA_SETINFOPOLICY];
 
 	r = talloc(talloc_tos(), struct lsa_SetInfoPolicy);
 	if (r == NULL) {
@@ -703,7 +703,7 @@ static bool api_lsa_ClearAuditLog(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_ClearAuditLog *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CLEARAUDITLOG];
+	call = &p->interface->calls[NDR_LSA_CLEARAUDITLOG];
 
 	r = talloc(talloc_tos(), struct lsa_ClearAuditLog);
 	if (r == NULL) {
@@ -776,7 +776,7 @@ static bool api_lsa_CreateAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CreateAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATEACCOUNT];
+	call = &p->interface->calls[NDR_LSA_CREATEACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_CreateAccount);
 	if (r == NULL) {
@@ -856,7 +856,7 @@ static bool api_lsa_EnumAccounts(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumAccounts *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMACCOUNTS];
+	call = &p->interface->calls[NDR_LSA_ENUMACCOUNTS];
 
 	r = talloc(talloc_tos(), struct lsa_EnumAccounts);
 	if (r == NULL) {
@@ -937,7 +937,7 @@ static bool api_lsa_CreateTrustedDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CreateTrustedDomain *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATETRUSTEDDOMAIN];
+	call = &p->interface->calls[NDR_LSA_CREATETRUSTEDDOMAIN];
 
 	r = talloc(talloc_tos(), struct lsa_CreateTrustedDomain);
 	if (r == NULL) {
@@ -1017,7 +1017,7 @@ static bool api_lsa_EnumTrustDom(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumTrustDom *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMTRUSTDOM];
+	call = &p->interface->calls[NDR_LSA_ENUMTRUSTDOM];
 
 	r = talloc(talloc_tos(), struct lsa_EnumTrustDom);
 	if (r == NULL) {
@@ -1098,7 +1098,7 @@ static bool api_lsa_LookupNames(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupNames *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES];
+	call = &p->interface->calls[NDR_LSA_LOOKUPNAMES];
 
 	r = talloc(talloc_tos(), struct lsa_LookupNames);
 	if (r == NULL) {
@@ -1180,7 +1180,7 @@ static bool api_lsa_LookupSids(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupSids *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPSIDS];
+	call = &p->interface->calls[NDR_LSA_LOOKUPSIDS];
 
 	r = talloc(talloc_tos(), struct lsa_LookupSids);
 	if (r == NULL) {
@@ -1262,7 +1262,7 @@ static bool api_lsa_CreateSecret(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CreateSecret *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATESECRET];
+	call = &p->interface->calls[NDR_LSA_CREATESECRET];
 
 	r = talloc(talloc_tos(), struct lsa_CreateSecret);
 	if (r == NULL) {
@@ -1342,7 +1342,7 @@ static bool api_lsa_OpenAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_OpenAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENACCOUNT];
+	call = &p->interface->calls[NDR_LSA_OPENACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_OpenAccount);
 	if (r == NULL) {
@@ -1422,7 +1422,7 @@ static bool api_lsa_EnumPrivsAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumPrivsAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMPRIVSACCOUNT];
+	call = &p->interface->calls[NDR_LSA_ENUMPRIVSACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_EnumPrivsAccount);
 	if (r == NULL) {
@@ -1502,7 +1502,7 @@ static bool api_lsa_AddPrivilegesToAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_AddPrivilegesToAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ADDPRIVILEGESTOACCOUNT];
+	call = &p->interface->calls[NDR_LSA_ADDPRIVILEGESTOACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_AddPrivilegesToAccount);
 	if (r == NULL) {
@@ -1575,7 +1575,7 @@ static bool api_lsa_RemovePrivilegesFromAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_RemovePrivilegesFromAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT];
+	call = &p->interface->calls[NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_RemovePrivilegesFromAccount);
 	if (r == NULL) {
@@ -1648,7 +1648,7 @@ static bool api_lsa_GetQuotasForAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_GetQuotasForAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_GETQUOTASFORACCOUNT];
+	call = &p->interface->calls[NDR_LSA_GETQUOTASFORACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_GetQuotasForAccount);
 	if (r == NULL) {
@@ -1721,7 +1721,7 @@ static bool api_lsa_SetQuotasForAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetQuotasForAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETQUOTASFORACCOUNT];
+	call = &p->interface->calls[NDR_LSA_SETQUOTASFORACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_SetQuotasForAccount);
 	if (r == NULL) {
@@ -1794,7 +1794,7 @@ static bool api_lsa_GetSystemAccessAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_GetSystemAccessAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_GETSYSTEMACCESSACCOUNT];
+	call = &p->interface->calls[NDR_LSA_GETSYSTEMACCESSACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_GetSystemAccessAccount);
 	if (r == NULL) {
@@ -1874,7 +1874,7 @@ static bool api_lsa_SetSystemAccessAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetSystemAccessAccount *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETSYSTEMACCESSACCOUNT];
+	call = &p->interface->calls[NDR_LSA_SETSYSTEMACCESSACCOUNT];
 
 	r = talloc(talloc_tos(), struct lsa_SetSystemAccessAccount);
 	if (r == NULL) {
@@ -1947,7 +1947,7 @@ static bool api_lsa_OpenTrustedDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_OpenTrustedDomain *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENTRUSTEDDOMAIN];
+	call = &p->interface->calls[NDR_LSA_OPENTRUSTEDDOMAIN];
 
 	r = talloc(talloc_tos(), struct lsa_OpenTrustedDomain);
 	if (r == NULL) {
@@ -2027,7 +2027,7 @@ static bool api_lsa_QueryTrustedDomainInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QueryTrustedDomainInfo *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYTRUSTEDDOMAININFO];
+	call = &p->interface->calls[NDR_LSA_QUERYTRUSTEDDOMAININFO];
 
 	r = talloc(talloc_tos(), struct lsa_QueryTrustedDomainInfo);
 	if (r == NULL) {
@@ -2107,7 +2107,7 @@ static bool api_lsa_SetInformationTrustedDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetInformationTrustedDomain *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN];
+	call = &p->interface->calls[NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN];
 
 	r = talloc(talloc_tos(), struct lsa_SetInformationTrustedDomain);
 	if (r == NULL) {
@@ -2180,7 +2180,7 @@ static bool api_lsa_OpenSecret(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_OpenSecret *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENSECRET];
+	call = &p->interface->calls[NDR_LSA_OPENSECRET];
 
 	r = talloc(talloc_tos(), struct lsa_OpenSecret);
 	if (r == NULL) {
@@ -2260,7 +2260,7 @@ static bool api_lsa_SetSecret(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetSecret *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETSECRET];
+	call = &p->interface->calls[NDR_LSA_SETSECRET];
 
 	r = talloc(talloc_tos(), struct lsa_SetSecret);
 	if (r == NULL) {
@@ -2333,7 +2333,7 @@ static bool api_lsa_QuerySecret(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QuerySecret *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYSECRET];
+	call = &p->interface->calls[NDR_LSA_QUERYSECRET];
 
 	r = talloc(talloc_tos(), struct lsa_QuerySecret);
 	if (r == NULL) {
@@ -2411,7 +2411,7 @@ static bool api_lsa_LookupPrivValue(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupPrivValue *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPPRIVVALUE];
+	call = &p->interface->calls[NDR_LSA_LOOKUPPRIVVALUE];
 
 	r = talloc(talloc_tos(), struct lsa_LookupPrivValue);
 	if (r == NULL) {
@@ -2491,7 +2491,7 @@ static bool api_lsa_LookupPrivName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupPrivName *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPPRIVNAME];
+	call = &p->interface->calls[NDR_LSA_LOOKUPPRIVNAME];
 
 	r = talloc(talloc_tos(), struct lsa_LookupPrivName);
 	if (r == NULL) {
@@ -2571,7 +2571,7 @@ static bool api_lsa_LookupPrivDisplayName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupPrivDisplayName *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPPRIVDISPLAYNAME];
+	call = &p->interface->calls[NDR_LSA_LOOKUPPRIVDISPLAYNAME];
 
 	r = talloc(talloc_tos(), struct lsa_LookupPrivDisplayName);
 	if (r == NULL) {
@@ -2657,7 +2657,7 @@ static bool api_lsa_DeleteObject(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_DeleteObject *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_DELETEOBJECT];
+	call = &p->interface->calls[NDR_LSA_DELETEOBJECT];
 
 	r = talloc(talloc_tos(), struct lsa_DeleteObject);
 	if (r == NULL) {
@@ -2732,7 +2732,7 @@ static bool api_lsa_EnumAccountsWithUserRight(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumAccountsWithUserRight *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT];
+	call = &p->interface->calls[NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT];
 
 	r = talloc(talloc_tos(), struct lsa_EnumAccountsWithUserRight);
 	if (r == NULL) {
@@ -2812,7 +2812,7 @@ static bool api_lsa_EnumAccountRights(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumAccountRights *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMACCOUNTRIGHTS];
+	call = &p->interface->calls[NDR_LSA_ENUMACCOUNTRIGHTS];
 
 	r = talloc(talloc_tos(), struct lsa_EnumAccountRights);
 	if (r == NULL) {
@@ -2892,7 +2892,7 @@ static bool api_lsa_AddAccountRights(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_AddAccountRights *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ADDACCOUNTRIGHTS];
+	call = &p->interface->calls[NDR_LSA_ADDACCOUNTRIGHTS];
 
 	r = talloc(talloc_tos(), struct lsa_AddAccountRights);
 	if (r == NULL) {
@@ -2965,7 +2965,7 @@ static bool api_lsa_RemoveAccountRights(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_RemoveAccountRights *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_REMOVEACCOUNTRIGHTS];
+	call = &p->interface->calls[NDR_LSA_REMOVEACCOUNTRIGHTS];
 
 	r = talloc(talloc_tos(), struct lsa_RemoveAccountRights);
 	if (r == NULL) {
@@ -3038,7 +3038,7 @@ static bool api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QueryTrustedDomainInfoBySid *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID];
+	call = &p->interface->calls[NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID];
 
 	r = talloc(talloc_tos(), struct lsa_QueryTrustedDomainInfoBySid);
 	if (r == NULL) {
@@ -3118,7 +3118,7 @@ static bool api_lsa_SetTrustedDomainInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetTrustedDomainInfo *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETTRUSTEDDOMAININFO];
+	call = &p->interface->calls[NDR_LSA_SETTRUSTEDDOMAININFO];
 
 	r = talloc(talloc_tos(), struct lsa_SetTrustedDomainInfo);
 	if (r == NULL) {
@@ -3191,7 +3191,7 @@ static bool api_lsa_DeleteTrustedDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_DeleteTrustedDomain *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_DELETETRUSTEDDOMAIN];
+	call = &p->interface->calls[NDR_LSA_DELETETRUSTEDDOMAIN];
 
 	r = talloc(talloc_tos(), struct lsa_DeleteTrustedDomain);
 	if (r == NULL) {
@@ -3264,7 +3264,7 @@ static bool api_lsa_StorePrivateData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_StorePrivateData *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_STOREPRIVATEDATA];
+	call = &p->interface->calls[NDR_LSA_STOREPRIVATEDATA];
 
 	r = talloc(talloc_tos(), struct lsa_StorePrivateData);
 	if (r == NULL) {
@@ -3337,7 +3337,7 @@ static bool api_lsa_RetrievePrivateData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_RetrievePrivateData *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_RETRIEVEPRIVATEDATA];
+	call = &p->interface->calls[NDR_LSA_RETRIEVEPRIVATEDATA];
 
 	r = talloc(talloc_tos(), struct lsa_RetrievePrivateData);
 	if (r == NULL) {
@@ -3412,7 +3412,7 @@ static bool api_lsa_OpenPolicy2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_OpenPolicy2 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENPOLICY2];
+	call = &p->interface->calls[NDR_LSA_OPENPOLICY2];
 
 	r = talloc(talloc_tos(), struct lsa_OpenPolicy2);
 	if (r == NULL) {
@@ -3492,7 +3492,7 @@ static bool api_lsa_GetUserName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_GetUserName *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_GETUSERNAME];
+	call = &p->interface->calls[NDR_LSA_GETUSERNAME];
 
 	r = talloc(talloc_tos(), struct lsa_GetUserName);
 	if (r == NULL) {
@@ -3568,7 +3568,7 @@ static bool api_lsa_QueryInfoPolicy2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QueryInfoPolicy2 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYINFOPOLICY2];
+	call = &p->interface->calls[NDR_LSA_QUERYINFOPOLICY2];
 
 	r = talloc(talloc_tos(), struct lsa_QueryInfoPolicy2);
 	if (r == NULL) {
@@ -3648,7 +3648,7 @@ static bool api_lsa_SetInfoPolicy2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetInfoPolicy2 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETINFOPOLICY2];
+	call = &p->interface->calls[NDR_LSA_SETINFOPOLICY2];
 
 	r = talloc(talloc_tos(), struct lsa_SetInfoPolicy2);
 	if (r == NULL) {
@@ -3721,7 +3721,7 @@ static bool api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QueryTrustedDomainInfoByName *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME];
+	call = &p->interface->calls[NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME];
 
 	r = talloc(talloc_tos(), struct lsa_QueryTrustedDomainInfoByName);
 	if (r == NULL) {
@@ -3801,7 +3801,7 @@ static bool api_lsa_SetTrustedDomainInfoByName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetTrustedDomainInfoByName *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETTRUSTEDDOMAININFOBYNAME];
+	call = &p->interface->calls[NDR_LSA_SETTRUSTEDDOMAININFOBYNAME];
 
 	r = talloc(talloc_tos(), struct lsa_SetTrustedDomainInfoByName);
 	if (r == NULL) {
@@ -3874,7 +3874,7 @@ static bool api_lsa_EnumTrustedDomainsEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_EnumTrustedDomainsEx *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_ENUMTRUSTEDDOMAINSEX];
+	call = &p->interface->calls[NDR_LSA_ENUMTRUSTEDDOMAINSEX];
 
 	r = talloc(talloc_tos(), struct lsa_EnumTrustedDomainsEx);
 	if (r == NULL) {
@@ -3955,7 +3955,7 @@ static bool api_lsa_CreateTrustedDomainEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CreateTrustedDomainEx *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATETRUSTEDDOMAINEX];
+	call = &p->interface->calls[NDR_LSA_CREATETRUSTEDDOMAINEX];
 
 	r = talloc(talloc_tos(), struct lsa_CreateTrustedDomainEx);
 	if (r == NULL) {
@@ -4035,7 +4035,7 @@ static bool api_lsa_CloseTrustedDomainEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CloseTrustedDomainEx *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CLOSETRUSTEDDOMAINEX];
+	call = &p->interface->calls[NDR_LSA_CLOSETRUSTEDDOMAINEX];
 
 	r = talloc(talloc_tos(), struct lsa_CloseTrustedDomainEx);
 	if (r == NULL) {
@@ -4110,7 +4110,7 @@ static bool api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_QueryDomainInformationPolicy *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_QUERYDOMAININFORMATIONPOLICY];
+	call = &p->interface->calls[NDR_LSA_QUERYDOMAININFORMATIONPOLICY];
 
 	r = talloc(talloc_tos(), struct lsa_QueryDomainInformationPolicy);
 	if (r == NULL) {
@@ -4190,7 +4190,7 @@ static bool api_lsa_SetDomainInformationPolicy(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_SetDomainInformationPolicy *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_SETDOMAININFORMATIONPOLICY];
+	call = &p->interface->calls[NDR_LSA_SETDOMAININFORMATIONPOLICY];
 
 	r = talloc(talloc_tos(), struct lsa_SetDomainInformationPolicy);
 	if (r == NULL) {
@@ -4263,7 +4263,7 @@ static bool api_lsa_OpenTrustedDomainByName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_OpenTrustedDomainByName *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_OPENTRUSTEDDOMAINBYNAME];
+	call = &p->interface->calls[NDR_LSA_OPENTRUSTEDDOMAINBYNAME];
 
 	r = talloc(talloc_tos(), struct lsa_OpenTrustedDomainByName);
 	if (r == NULL) {
@@ -4343,7 +4343,7 @@ static bool api_lsa_TestCall(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_TestCall *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_TESTCALL];
+	call = &p->interface->calls[NDR_LSA_TESTCALL];
 
 	r = talloc(talloc_tos(), struct lsa_TestCall);
 	if (r == NULL) {
@@ -4416,7 +4416,7 @@ static bool api_lsa_LookupSids2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupSids2 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPSIDS2];
+	call = &p->interface->calls[NDR_LSA_LOOKUPSIDS2];
 
 	r = talloc(talloc_tos(), struct lsa_LookupSids2);
 	if (r == NULL) {
@@ -4498,7 +4498,7 @@ static bool api_lsa_LookupNames2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupNames2 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES2];
+	call = &p->interface->calls[NDR_LSA_LOOKUPNAMES2];
 
 	r = talloc(talloc_tos(), struct lsa_LookupNames2);
 	if (r == NULL) {
@@ -4580,7 +4580,7 @@ static bool api_lsa_CreateTrustedDomainEx2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CreateTrustedDomainEx2 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREATETRUSTEDDOMAINEX2];
+	call = &p->interface->calls[NDR_LSA_CREATETRUSTEDDOMAINEX2];
 
 	r = talloc(talloc_tos(), struct lsa_CreateTrustedDomainEx2);
 	if (r == NULL) {
@@ -4660,7 +4660,7 @@ static bool api_lsa_CREDRWRITE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRWRITE *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRWRITE];
+	call = &p->interface->calls[NDR_LSA_CREDRWRITE];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRWRITE);
 	if (r == NULL) {
@@ -4733,7 +4733,7 @@ static bool api_lsa_CREDRREAD(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRREAD *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRREAD];
+	call = &p->interface->calls[NDR_LSA_CREDRREAD];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRREAD);
 	if (r == NULL) {
@@ -4806,7 +4806,7 @@ static bool api_lsa_CREDRENUMERATE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRENUMERATE *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRENUMERATE];
+	call = &p->interface->calls[NDR_LSA_CREDRENUMERATE];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRENUMERATE);
 	if (r == NULL) {
@@ -4879,7 +4879,7 @@ static bool api_lsa_CREDRWRITEDOMAINCREDENTIALS(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRWRITEDOMAINCREDENTIALS *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRWRITEDOMAINCREDENTIALS];
+	call = &p->interface->calls[NDR_LSA_CREDRWRITEDOMAINCREDENTIALS];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRWRITEDOMAINCREDENTIALS);
 	if (r == NULL) {
@@ -4952,7 +4952,7 @@ static bool api_lsa_CREDRREADDOMAINCREDENTIALS(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRREADDOMAINCREDENTIALS *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRREADDOMAINCREDENTIALS];
+	call = &p->interface->calls[NDR_LSA_CREDRREADDOMAINCREDENTIALS];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRREADDOMAINCREDENTIALS);
 	if (r == NULL) {
@@ -5025,7 +5025,7 @@ static bool api_lsa_CREDRDELETE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRDELETE *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRDELETE];
+	call = &p->interface->calls[NDR_LSA_CREDRDELETE];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRDELETE);
 	if (r == NULL) {
@@ -5098,7 +5098,7 @@ static bool api_lsa_CREDRGETTARGETINFO(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRGETTARGETINFO *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRGETTARGETINFO];
+	call = &p->interface->calls[NDR_LSA_CREDRGETTARGETINFO];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRGETTARGETINFO);
 	if (r == NULL) {
@@ -5171,7 +5171,7 @@ static bool api_lsa_CREDRPROFILELOADED(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRPROFILELOADED *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRPROFILELOADED];
+	call = &p->interface->calls[NDR_LSA_CREDRPROFILELOADED];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRPROFILELOADED);
 	if (r == NULL) {
@@ -5244,7 +5244,7 @@ static bool api_lsa_LookupNames3(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupNames3 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES3];
+	call = &p->interface->calls[NDR_LSA_LOOKUPNAMES3];
 
 	r = talloc(talloc_tos(), struct lsa_LookupNames3);
 	if (r == NULL) {
@@ -5326,7 +5326,7 @@ static bool api_lsa_CREDRGETSESSIONTYPES(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRGETSESSIONTYPES *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRGETSESSIONTYPES];
+	call = &p->interface->calls[NDR_LSA_CREDRGETSESSIONTYPES];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRGETSESSIONTYPES);
 	if (r == NULL) {
@@ -5399,7 +5399,7 @@ static bool api_lsa_LSARREGISTERAUDITEVENT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARREGISTERAUDITEVENT *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARREGISTERAUDITEVENT];
+	call = &p->interface->calls[NDR_LSA_LSARREGISTERAUDITEVENT];
 
 	r = talloc(talloc_tos(), struct lsa_LSARREGISTERAUDITEVENT);
 	if (r == NULL) {
@@ -5472,7 +5472,7 @@ static bool api_lsa_LSARGENAUDITEVENT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARGENAUDITEVENT *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARGENAUDITEVENT];
+	call = &p->interface->calls[NDR_LSA_LSARGENAUDITEVENT];
 
 	r = talloc(talloc_tos(), struct lsa_LSARGENAUDITEVENT);
 	if (r == NULL) {
@@ -5545,7 +5545,7 @@ static bool api_lsa_LSARUNREGISTERAUDITEVENT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARUNREGISTERAUDITEVENT *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARUNREGISTERAUDITEVENT];
+	call = &p->interface->calls[NDR_LSA_LSARUNREGISTERAUDITEVENT];
 
 	r = talloc(talloc_tos(), struct lsa_LSARUNREGISTERAUDITEVENT);
 	if (r == NULL) {
@@ -5618,7 +5618,7 @@ static bool api_lsa_lsaRQueryForestTrustInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_lsaRQueryForestTrustInformation *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION];
+	call = &p->interface->calls[NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION];
 
 	r = talloc(talloc_tos(), struct lsa_lsaRQueryForestTrustInformation);
 	if (r == NULL) {
@@ -5698,7 +5698,7 @@ static bool api_lsa_LSARSETFORESTTRUSTINFORMATION(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARSETFORESTTRUSTINFORMATION *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARSETFORESTTRUSTINFORMATION];
+	call = &p->interface->calls[NDR_LSA_LSARSETFORESTTRUSTINFORMATION];
 
 	r = talloc(talloc_tos(), struct lsa_LSARSETFORESTTRUSTINFORMATION);
 	if (r == NULL) {
@@ -5771,7 +5771,7 @@ static bool api_lsa_CREDRRENAME(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_CREDRRENAME *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_CREDRRENAME];
+	call = &p->interface->calls[NDR_LSA_CREDRRENAME];
 
 	r = talloc(talloc_tos(), struct lsa_CREDRRENAME);
 	if (r == NULL) {
@@ -5844,7 +5844,7 @@ static bool api_lsa_LookupSids3(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupSids3 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPSIDS3];
+	call = &p->interface->calls[NDR_LSA_LOOKUPSIDS3];
 
 	r = talloc(talloc_tos(), struct lsa_LookupSids3);
 	if (r == NULL) {
@@ -5926,7 +5926,7 @@ static bool api_lsa_LookupNames4(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LookupNames4 *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LOOKUPNAMES4];
+	call = &p->interface->calls[NDR_LSA_LOOKUPNAMES4];
 
 	r = talloc(talloc_tos(), struct lsa_LookupNames4);
 	if (r == NULL) {
@@ -6008,7 +6008,7 @@ static bool api_lsa_LSAROPENPOLICYSCE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSAROPENPOLICYSCE *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSAROPENPOLICYSCE];
+	call = &p->interface->calls[NDR_LSA_LSAROPENPOLICYSCE];
 
 	r = talloc(talloc_tos(), struct lsa_LSAROPENPOLICYSCE);
 	if (r == NULL) {
@@ -6081,7 +6081,7 @@ static bool api_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE];
+	call = &p->interface->calls[NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE];
 
 	r = talloc(talloc_tos(), struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE);
 	if (r == NULL) {
@@ -6154,7 +6154,7 @@ static bool api_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE];
+	call = &p->interface->calls[NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE];
 
 	r = talloc(talloc_tos(), struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE);
 	if (r == NULL) {
@@ -6227,7 +6227,7 @@ static bool api_lsa_LSARADTREPORTSECURITYEVENT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct lsa_LSARADTREPORTSECURITYEVENT *r;
 
-	call = &ndr_table_lsarpc.calls[NDR_LSA_LSARADTREPORTSECURITYEVENT];
+	call = &p->interface->calls[NDR_LSA_LSARADTREPORTSECURITYEVENT];
 
 	r = talloc(talloc_tos(), struct lsa_LSARADTREPORTSECURITYEVENT);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_netlogon.c b/librpc/gen_ndr/srv_netlogon.c
index a52ff0f5d59..a288c77cd6e 100644
--- a/librpc/gen_ndr/srv_netlogon.c
+++ b/librpc/gen_ndr/srv_netlogon.c
@@ -15,7 +15,7 @@ static bool api_netr_LogonUasLogon(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonUasLogon *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONUASLOGON];
+	call = &p->interface->calls[NDR_NETR_LOGONUASLOGON];
 
 	r = talloc(talloc_tos(), struct netr_LogonUasLogon);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_netr_LogonUasLogoff(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonUasLogoff *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONUASLOGOFF];
+	call = &p->interface->calls[NDR_NETR_LOGONUASLOGOFF];
 
 	r = talloc(talloc_tos(), struct netr_LogonUasLogoff);
 	if (r == NULL) {
@@ -175,7 +175,7 @@ static bool api_netr_LogonSamLogon(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonSamLogon *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGON];
+	call = &p->interface->calls[NDR_NETR_LOGONSAMLOGON];
 
 	r = talloc(talloc_tos(), struct netr_LogonSamLogon);
 	if (r == NULL) {
@@ -262,7 +262,7 @@ static bool api_netr_LogonSamLogoff(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonSamLogoff *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGOFF];
+	call = &p->interface->calls[NDR_NETR_LOGONSAMLOGOFF];
 
 	r = talloc(talloc_tos(), struct netr_LogonSamLogoff);
 	if (r == NULL) {
@@ -337,7 +337,7 @@ static bool api_netr_ServerReqChallenge(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerReqChallenge *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERREQCHALLENGE];
+	call = &p->interface->calls[NDR_NETR_SERVERREQCHALLENGE];
 
 	r = talloc(talloc_tos(), struct netr_ServerReqChallenge);
 	if (r == NULL) {
@@ -417,7 +417,7 @@ static bool api_netr_ServerAuthenticate(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerAuthenticate *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERAUTHENTICATE];
+	call = &p->interface->calls[NDR_NETR_SERVERAUTHENTICATE];
 
 	r = talloc(talloc_tos(), struct netr_ServerAuthenticate);
 	if (r == NULL) {
@@ -497,7 +497,7 @@ static bool api_netr_ServerPasswordSet(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerPasswordSet *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERPASSWORDSET];
+	call = &p->interface->calls[NDR_NETR_SERVERPASSWORDSET];
 
 	r = talloc(talloc_tos(), struct netr_ServerPasswordSet);
 	if (r == NULL) {
@@ -577,7 +577,7 @@ static bool api_netr_DatabaseDeltas(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DatabaseDeltas *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASEDELTAS];
+	call = &p->interface->calls[NDR_NETR_DATABASEDELTAS];
 
 	r = talloc(talloc_tos(), struct netr_DatabaseDeltas);
 	if (r == NULL) {
@@ -659,7 +659,7 @@ static bool api_netr_DatabaseSync(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DatabaseSync *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASESYNC];
+	call = &p->interface->calls[NDR_NETR_DATABASESYNC];
 
 	r = talloc(talloc_tos(), struct netr_DatabaseSync);
 	if (r == NULL) {
@@ -741,7 +741,7 @@ static bool api_netr_AccountDeltas(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_AccountDeltas *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_ACCOUNTDELTAS];
+	call = &p->interface->calls[NDR_NETR_ACCOUNTDELTAS];
 
 	r = talloc(talloc_tos(), struct netr_AccountDeltas);
 	if (r == NULL) {
@@ -840,7 +840,7 @@ static bool api_netr_AccountSync(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_AccountSync *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_ACCOUNTSYNC];
+	call = &p->interface->calls[NDR_NETR_ACCOUNTSYNC];
 
 	r = talloc(talloc_tos(), struct netr_AccountSync);
 	if (r == NULL) {
@@ -940,7 +940,7 @@ static bool api_netr_GetDcName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_GetDcName *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_GETDCNAME];
+	call = &p->interface->calls[NDR_NETR_GETDCNAME];
 
 	r = talloc(talloc_tos(), struct netr_GetDcName);
 	if (r == NULL) {
@@ -1020,7 +1020,7 @@ static bool api_netr_LogonControl(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonControl *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONCONTROL];
+	call = &p->interface->calls[NDR_NETR_LOGONCONTROL];
 
 	r = talloc(talloc_tos(), struct netr_LogonControl);
 	if (r == NULL) {
@@ -1100,7 +1100,7 @@ static bool api_netr_GetAnyDCName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_GetAnyDCName *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_GETANYDCNAME];
+	call = &p->interface->calls[NDR_NETR_GETANYDCNAME];
 
 	r = talloc(talloc_tos(), struct netr_GetAnyDCName);
 	if (r == NULL) {
@@ -1180,7 +1180,7 @@ static bool api_netr_LogonControl2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonControl2 *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONCONTROL2];
+	call = &p->interface->calls[NDR_NETR_LOGONCONTROL2];
 
 	r = talloc(talloc_tos(), struct netr_LogonControl2);
 	if (r == NULL) {
@@ -1260,7 +1260,7 @@ static bool api_netr_ServerAuthenticate2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerAuthenticate2 *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERAUTHENTICATE2];
+	call = &p->interface->calls[NDR_NETR_SERVERAUTHENTICATE2];
 
 	r = talloc(talloc_tos(), struct netr_ServerAuthenticate2);
 	if (r == NULL) {
@@ -1341,7 +1341,7 @@ static bool api_netr_DatabaseSync2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DatabaseSync2 *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASESYNC2];
+	call = &p->interface->calls[NDR_NETR_DATABASESYNC2];
 
 	r = talloc(talloc_tos(), struct netr_DatabaseSync2);
 	if (r == NULL) {
@@ -1423,7 +1423,7 @@ static bool api_netr_DatabaseRedo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DatabaseRedo *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DATABASEREDO];
+	call = &p->interface->calls[NDR_NETR_DATABASEREDO];
 
 	r = talloc(talloc_tos(), struct netr_DatabaseRedo);
 	if (r == NULL) {
@@ -1504,7 +1504,7 @@ static bool api_netr_LogonControl2Ex(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonControl2Ex *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONCONTROL2EX];
+	call = &p->interface->calls[NDR_NETR_LOGONCONTROL2EX];
 
 	r = talloc(talloc_tos(), struct netr_LogonControl2Ex);
 	if (r == NULL) {
@@ -1584,7 +1584,7 @@ static bool api_netr_NetrEnumerateTrustedDomains(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NetrEnumerateTrustedDomains *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRENUMERATETRUSTEDDOMAINS];
+	call = &p->interface->calls[NDR_NETR_NETRENUMERATETRUSTEDDOMAINS];
 
 	r = talloc(talloc_tos(), struct netr_NetrEnumerateTrustedDomains);
 	if (r == NULL) {
@@ -1664,7 +1664,7 @@ static bool api_netr_DsRGetDCName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRGetDCName *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCNAME];
+	call = &p->interface->calls[NDR_NETR_DSRGETDCNAME];
 
 	r = talloc(talloc_tos(), struct netr_DsRGetDCName);
 	if (r == NULL) {
@@ -1744,7 +1744,7 @@ static bool api_netr_LogonGetCapabilities(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonGetCapabilities *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONGETCAPABILITIES];
+	call = &p->interface->calls[NDR_NETR_LOGONGETCAPABILITIES];
 
 	r = talloc(talloc_tos(), struct netr_LogonGetCapabilities);
 	if (r == NULL) {
@@ -1825,7 +1825,7 @@ static bool api_netr_NETRLOGONSETSERVICEBITS(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NETRLOGONSETSERVICEBITS *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONSETSERVICEBITS];
+	call = &p->interface->calls[NDR_NETR_NETRLOGONSETSERVICEBITS];
 
 	r = talloc(talloc_tos(), struct netr_NETRLOGONSETSERVICEBITS);
 	if (r == NULL) {
@@ -1898,7 +1898,7 @@ static bool api_netr_LogonGetTrustRid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonGetTrustRid *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONGETTRUSTRID];
+	call = &p->interface->calls[NDR_NETR_LOGONGETTRUSTRID];
 
 	r = talloc(talloc_tos(), struct netr_LogonGetTrustRid);
 	if (r == NULL) {
@@ -1978,7 +1978,7 @@ static bool api_netr_NETRLOGONCOMPUTESERVERDIGEST(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NETRLOGONCOMPUTESERVERDIGEST *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST];
+	call = &p->interface->calls[NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST];
 
 	r = talloc(talloc_tos(), struct netr_NETRLOGONCOMPUTESERVERDIGEST);
 	if (r == NULL) {
@@ -2051,7 +2051,7 @@ static bool api_netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NETRLOGONCOMPUTECLIENTDIGEST *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST];
+	call = &p->interface->calls[NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST];
 
 	r = talloc(talloc_tos(), struct netr_NETRLOGONCOMPUTECLIENTDIGEST);
 	if (r == NULL) {
@@ -2124,7 +2124,7 @@ static bool api_netr_ServerAuthenticate3(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerAuthenticate3 *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERAUTHENTICATE3];
+	call = &p->interface->calls[NDR_NETR_SERVERAUTHENTICATE3];
 
 	r = talloc(talloc_tos(), struct netr_ServerAuthenticate3);
 	if (r == NULL) {
@@ -2211,7 +2211,7 @@ static bool api_netr_DsRGetDCNameEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRGetDCNameEx *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCNAMEEX];
+	call = &p->interface->calls[NDR_NETR_DSRGETDCNAMEEX];
 
 	r = talloc(talloc_tos(), struct netr_DsRGetDCNameEx);
 	if (r == NULL) {
@@ -2291,7 +2291,7 @@ static bool api_netr_DsRGetSiteName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRGetSiteName *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETSITENAME];
+	call = &p->interface->calls[NDR_NETR_DSRGETSITENAME];
 
 	r = talloc(talloc_tos(), struct netr_DsRGetSiteName);
 	if (r == NULL) {
@@ -2371,7 +2371,7 @@ static bool api_netr_LogonGetDomainInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonGetDomainInfo *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONGETDOMAININFO];
+	call = &p->interface->calls[NDR_NETR_LOGONGETDOMAININFO];
 
 	r = talloc(talloc_tos(), struct netr_LogonGetDomainInfo);
 	if (r == NULL) {
@@ -2452,7 +2452,7 @@ static bool api_netr_ServerPasswordSet2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerPasswordSet2 *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERPASSWORDSET2];
+	call = &p->interface->calls[NDR_NETR_SERVERPASSWORDSET2];
 
 	r = talloc(talloc_tos(), struct netr_ServerPasswordSet2);
 	if (r == NULL) {
@@ -2532,7 +2532,7 @@ static bool api_netr_ServerPasswordGet(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerPasswordGet *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERPASSWORDGET];
+	call = &p->interface->calls[NDR_NETR_SERVERPASSWORDGET];
 
 	r = talloc(talloc_tos(), struct netr_ServerPasswordGet);
 	if (r == NULL) {
@@ -2618,7 +2618,7 @@ static bool api_netr_NETRLOGONSENDTOSAM(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NETRLOGONSENDTOSAM *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONSENDTOSAM];
+	call = &p->interface->calls[NDR_NETR_NETRLOGONSENDTOSAM];
 
 	r = talloc(talloc_tos(), struct netr_NETRLOGONSENDTOSAM);
 	if (r == NULL) {
@@ -2691,7 +2691,7 @@ static bool api_netr_DsRAddressToSitenamesW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRAddressToSitenamesW *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRADDRESSTOSITENAMESW];
+	call = &p->interface->calls[NDR_NETR_DSRADDRESSTOSITENAMESW];
 
 	r = talloc(talloc_tos(), struct netr_DsRAddressToSitenamesW);
 	if (r == NULL) {
@@ -2771,7 +2771,7 @@ static bool api_netr_DsRGetDCNameEx2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRGetDCNameEx2 *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCNAMEEX2];
+	call = &p->interface->calls[NDR_NETR_DSRGETDCNAMEEX2];
 
 	r = talloc(talloc_tos(), struct netr_DsRGetDCNameEx2);
 	if (r == NULL) {
@@ -2851,7 +2851,7 @@ static bool api_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN];
+	call = &p->interface->calls[NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN];
 
 	r = talloc(talloc_tos(), struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN);
 	if (r == NULL) {
@@ -2924,7 +2924,7 @@ static bool api_netr_NetrEnumerateTrustedDomainsEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_NetrEnumerateTrustedDomainsEx *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX];
+	call = &p->interface->calls[NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX];
 
 	r = talloc(talloc_tos(), struct netr_NetrEnumerateTrustedDomainsEx);
 	if (r == NULL) {
@@ -3004,7 +3004,7 @@ static bool api_netr_DsRAddressToSitenamesExW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRAddressToSitenamesExW *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRADDRESSTOSITENAMESEXW];
+	call = &p->interface->calls[NDR_NETR_DSRADDRESSTOSITENAMESEXW];
 
 	r = talloc(talloc_tos(), struct netr_DsRAddressToSitenamesExW);
 	if (r == NULL) {
@@ -3084,7 +3084,7 @@ static bool api_netr_DsrGetDcSiteCoverageW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsrGetDcSiteCoverageW *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETDCSITECOVERAGEW];
+	call = &p->interface->calls[NDR_NETR_DSRGETDCSITECOVERAGEW];
 
 	r = talloc(talloc_tos(), struct netr_DsrGetDcSiteCoverageW);
 	if (r == NULL) {
@@ -3164,7 +3164,7 @@ static bool api_netr_LogonSamLogonEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonSamLogonEx *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGONEX];
+	call = &p->interface->calls[NDR_NETR_LOGONSAMLOGONEX];
 
 	r = talloc(talloc_tos(), struct netr_LogonSamLogonEx);
 	if (r == NULL) {
@@ -3251,7 +3251,7 @@ static bool api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsrEnumerateDomainTrusts *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRENUMERATEDOMAINTRUSTS];
+	call = &p->interface->calls[NDR_NETR_DSRENUMERATEDOMAINTRUSTS];
 
 	r = talloc(talloc_tos(), struct netr_DsrEnumerateDomainTrusts);
 	if (r == NULL) {
@@ -3331,7 +3331,7 @@ static bool api_netr_DsrDeregisterDNSHostRecords(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsrDeregisterDNSHostRecords *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS];
+	call = &p->interface->calls[NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS];
 
 	r = talloc(talloc_tos(), struct netr_DsrDeregisterDNSHostRecords);
 	if (r == NULL) {
@@ -3404,7 +3404,7 @@ static bool api_netr_ServerTrustPasswordsGet(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerTrustPasswordsGet *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERTRUSTPASSWORDSGET];
+	call = &p->interface->calls[NDR_NETR_SERVERTRUSTPASSWORDSGET];
 
 	r = talloc(talloc_tos(), struct netr_ServerTrustPasswordsGet);
 	if (r == NULL) {
@@ -3496,7 +3496,7 @@ static bool api_netr_DsRGetForestTrustInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_DsRGetForestTrustInformation *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_DSRGETFORESTTRUSTINFORMATION];
+	call = &p->interface->calls[NDR_NETR_DSRGETFORESTTRUSTINFORMATION];
 
 	r = talloc(talloc_tos(), struct netr_DsRGetForestTrustInformation);
 	if (r == NULL) {
@@ -3576,7 +3576,7 @@ static bool api_netr_GetForestTrustInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_GetForestTrustInformation *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_GETFORESTTRUSTINFORMATION];
+	call = &p->interface->calls[NDR_NETR_GETFORESTTRUSTINFORMATION];
 
 	r = talloc(talloc_tos(), struct netr_GetForestTrustInformation);
 	if (r == NULL) {
@@ -3662,7 +3662,7 @@ static bool api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_LogonSamLogonWithFlags *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_LOGONSAMLOGONWITHFLAGS];
+	call = &p->interface->calls[NDR_NETR_LOGONSAMLOGONWITHFLAGS];
 
 	r = talloc(talloc_tos(), struct netr_LogonSamLogonWithFlags);
 	if (r == NULL) {
@@ -3750,7 +3750,7 @@ static bool api_netr_ServerGetTrustInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct netr_ServerGetTrustInfo *r;
 
-	call = &ndr_table_netlogon.calls[NDR_NETR_SERVERGETTRUSTINFO];
+	call = &p->interface->calls[NDR_NETR_SERVERGETTRUSTINFO];
 
 	r = talloc(talloc_tos(), struct netr_ServerGetTrustInfo);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_ntsvcs.c b/librpc/gen_ndr/srv_ntsvcs.c
index 026a8c5a5e9..0b451b8d657 100644
--- a/librpc/gen_ndr/srv_ntsvcs.c
+++ b/librpc/gen_ndr/srv_ntsvcs.c
@@ -15,7 +15,7 @@ static bool api_PNP_Disconnect(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_Disconnect *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_DISCONNECT];
+	call = &p->interface->calls[NDR_PNP_DISCONNECT];
 
 	r = talloc(talloc_tos(), struct PNP_Disconnect);
 	if (r == NULL) {
@@ -88,7 +88,7 @@ static bool api_PNP_Connect(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_Connect *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_CONNECT];
+	call = &p->interface->calls[NDR_PNP_CONNECT];
 
 	r = talloc(talloc_tos(), struct PNP_Connect);
 	if (r == NULL) {
@@ -161,7 +161,7 @@ static bool api_PNP_GetVersion(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetVersion *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETVERSION];
+	call = &p->interface->calls[NDR_PNP_GETVERSION];
 
 	r = talloc(talloc_tos(), struct PNP_GetVersion);
 	if (r == NULL) {
@@ -241,7 +241,7 @@ static bool api_PNP_GetGlobalState(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetGlobalState *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETGLOBALSTATE];
+	call = &p->interface->calls[NDR_PNP_GETGLOBALSTATE];
 
 	r = talloc(talloc_tos(), struct PNP_GetGlobalState);
 	if (r == NULL) {
@@ -314,7 +314,7 @@ static bool api_PNP_InitDetection(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_InitDetection *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_INITDETECTION];
+	call = &p->interface->calls[NDR_PNP_INITDETECTION];
 
 	r = talloc(talloc_tos(), struct PNP_InitDetection);
 	if (r == NULL) {
@@ -387,7 +387,7 @@ static bool api_PNP_ReportLogOn(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_ReportLogOn *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_REPORTLOGON];
+	call = &p->interface->calls[NDR_PNP_REPORTLOGON];
 
 	r = talloc(talloc_tos(), struct PNP_ReportLogOn);
 	if (r == NULL) {
@@ -460,7 +460,7 @@ static bool api_PNP_ValidateDeviceInstance(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_ValidateDeviceInstance *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_VALIDATEDEVICEINSTANCE];
+	call = &p->interface->calls[NDR_PNP_VALIDATEDEVICEINSTANCE];
 
 	r = talloc(talloc_tos(), struct PNP_ValidateDeviceInstance);
 	if (r == NULL) {
@@ -533,7 +533,7 @@ static bool api_PNP_GetRootDeviceInstance(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetRootDeviceInstance *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETROOTDEVICEINSTANCE];
+	call = &p->interface->calls[NDR_PNP_GETROOTDEVICEINSTANCE];
 
 	r = talloc(talloc_tos(), struct PNP_GetRootDeviceInstance);
 	if (r == NULL) {
@@ -606,7 +606,7 @@ static bool api_PNP_GetRelatedDeviceInstance(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetRelatedDeviceInstance *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETRELATEDDEVICEINSTANCE];
+	call = &p->interface->calls[NDR_PNP_GETRELATEDDEVICEINSTANCE];
 
 	r = talloc(talloc_tos(), struct PNP_GetRelatedDeviceInstance);
 	if (r == NULL) {
@@ -679,7 +679,7 @@ static bool api_PNP_EnumerateSubKeys(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_EnumerateSubKeys *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_ENUMERATESUBKEYS];
+	call = &p->interface->calls[NDR_PNP_ENUMERATESUBKEYS];
 
 	r = talloc(talloc_tos(), struct PNP_EnumerateSubKeys);
 	if (r == NULL) {
@@ -752,7 +752,7 @@ static bool api_PNP_GetDeviceList(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetDeviceList *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETDEVICELIST];
+	call = &p->interface->calls[NDR_PNP_GETDEVICELIST];
 
 	r = talloc(talloc_tos(), struct PNP_GetDeviceList);
 	if (r == NULL) {
@@ -833,7 +833,7 @@ static bool api_PNP_GetDeviceListSize(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetDeviceListSize *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETDEVICELISTSIZE];
+	call = &p->interface->calls[NDR_PNP_GETDEVICELISTSIZE];
 
 	r = talloc(talloc_tos(), struct PNP_GetDeviceListSize);
 	if (r == NULL) {
@@ -913,7 +913,7 @@ static bool api_PNP_GetDepth(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetDepth *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETDEPTH];
+	call = &p->interface->calls[NDR_PNP_GETDEPTH];
 
 	r = talloc(talloc_tos(), struct PNP_GetDepth);
 	if (r == NULL) {
@@ -986,7 +986,7 @@ static bool api_PNP_GetDeviceRegProp(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetDeviceRegProp *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETDEVICEREGPROP];
+	call = &p->interface->calls[NDR_PNP_GETDEVICEREGPROP];
 
 	r = talloc(talloc_tos(), struct PNP_GetDeviceRegProp);
 	if (r == NULL) {
@@ -1069,7 +1069,7 @@ static bool api_PNP_SetDeviceRegProp(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_SetDeviceRegProp *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_SETDEVICEREGPROP];
+	call = &p->interface->calls[NDR_PNP_SETDEVICEREGPROP];
 
 	r = talloc(talloc_tos(), struct PNP_SetDeviceRegProp);
 	if (r == NULL) {
@@ -1142,7 +1142,7 @@ static bool api_PNP_GetClassInstance(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetClassInstance *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETCLASSINSTANCE];
+	call = &p->interface->calls[NDR_PNP_GETCLASSINSTANCE];
 
 	r = talloc(talloc_tos(), struct PNP_GetClassInstance);
 	if (r == NULL) {
@@ -1215,7 +1215,7 @@ static bool api_PNP_CreateKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_CreateKey *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_CREATEKEY];
+	call = &p->interface->calls[NDR_PNP_CREATEKEY];
 
 	r = talloc(talloc_tos(), struct PNP_CreateKey);
 	if (r == NULL) {
@@ -1288,7 +1288,7 @@ static bool api_PNP_DeleteRegistryKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_DeleteRegistryKey *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_DELETEREGISTRYKEY];
+	call = &p->interface->calls[NDR_PNP_DELETEREGISTRYKEY];
 
 	r = talloc(talloc_tos(), struct PNP_DeleteRegistryKey);
 	if (r == NULL) {
@@ -1361,7 +1361,7 @@ static bool api_PNP_GetClassCount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetClassCount *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETCLASSCOUNT];
+	call = &p->interface->calls[NDR_PNP_GETCLASSCOUNT];
 
 	r = talloc(talloc_tos(), struct PNP_GetClassCount);
 	if (r == NULL) {
@@ -1434,7 +1434,7 @@ static bool api_PNP_GetClassName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetClassName *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETCLASSNAME];
+	call = &p->interface->calls[NDR_PNP_GETCLASSNAME];
 
 	r = talloc(talloc_tos(), struct PNP_GetClassName);
 	if (r == NULL) {
@@ -1507,7 +1507,7 @@ static bool api_PNP_DeleteClassKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_DeleteClassKey *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_DELETECLASSKEY];
+	call = &p->interface->calls[NDR_PNP_DELETECLASSKEY];
 
 	r = talloc(talloc_tos(), struct PNP_DeleteClassKey);
 	if (r == NULL) {
@@ -1580,7 +1580,7 @@ static bool api_PNP_GetInterfaceDeviceAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetInterfaceDeviceAlias *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETINTERFACEDEVICEALIAS];
+	call = &p->interface->calls[NDR_PNP_GETINTERFACEDEVICEALIAS];
 
 	r = talloc(talloc_tos(), struct PNP_GetInterfaceDeviceAlias);
 	if (r == NULL) {
@@ -1653,7 +1653,7 @@ static bool api_PNP_GetInterfaceDeviceList(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetInterfaceDeviceList *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETINTERFACEDEVICELIST];
+	call = &p->interface->calls[NDR_PNP_GETINTERFACEDEVICELIST];
 
 	r = talloc(talloc_tos(), struct PNP_GetInterfaceDeviceList);
 	if (r == NULL) {
@@ -1726,7 +1726,7 @@ static bool api_PNP_GetInterfaceDeviceListSize(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetInterfaceDeviceListSize *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETINTERFACEDEVICELISTSIZE];
+	call = &p->interface->calls[NDR_PNP_GETINTERFACEDEVICELISTSIZE];
 
 	r = talloc(talloc_tos(), struct PNP_GetInterfaceDeviceListSize);
 	if (r == NULL) {
@@ -1799,7 +1799,7 @@ static bool api_PNP_RegisterDeviceClassAssociation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_RegisterDeviceClassAssociation *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_REGISTERDEVICECLASSASSOCIATION];
+	call = &p->interface->calls[NDR_PNP_REGISTERDEVICECLASSASSOCIATION];
 
 	r = talloc(talloc_tos(), struct PNP_RegisterDeviceClassAssociation);
 	if (r == NULL) {
@@ -1872,7 +1872,7 @@ static bool api_PNP_UnregisterDeviceClassAssociation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_UnregisterDeviceClassAssociation *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_UNREGISTERDEVICECLASSASSOCIATION];
+	call = &p->interface->calls[NDR_PNP_UNREGISTERDEVICECLASSASSOCIATION];
 
 	r = talloc(talloc_tos(), struct PNP_UnregisterDeviceClassAssociation);
 	if (r == NULL) {
@@ -1945,7 +1945,7 @@ static bool api_PNP_GetClassRegProp(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetClassRegProp *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETCLASSREGPROP];
+	call = &p->interface->calls[NDR_PNP_GETCLASSREGPROP];
 
 	r = talloc(talloc_tos(), struct PNP_GetClassRegProp);
 	if (r == NULL) {
@@ -2018,7 +2018,7 @@ static bool api_PNP_SetClassRegProp(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_SetClassRegProp *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_SETCLASSREGPROP];
+	call = &p->interface->calls[NDR_PNP_SETCLASSREGPROP];
 
 	r = talloc(talloc_tos(), struct PNP_SetClassRegProp);
 	if (r == NULL) {
@@ -2091,7 +2091,7 @@ static bool api_PNP_CreateDevInst(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_CreateDevInst *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_CREATEDEVINST];
+	call = &p->interface->calls[NDR_PNP_CREATEDEVINST];
 
 	r = talloc(talloc_tos(), struct PNP_CreateDevInst);
 	if (r == NULL) {
@@ -2164,7 +2164,7 @@ static bool api_PNP_DeviceInstanceAction(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_DeviceInstanceAction *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_DEVICEINSTANCEACTION];
+	call = &p->interface->calls[NDR_PNP_DEVICEINSTANCEACTION];
 
 	r = talloc(talloc_tos(), struct PNP_DeviceInstanceAction);
 	if (r == NULL) {
@@ -2237,7 +2237,7 @@ static bool api_PNP_GetDeviceStatus(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetDeviceStatus *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETDEVICESTATUS];
+	call = &p->interface->calls[NDR_PNP_GETDEVICESTATUS];
 
 	r = talloc(talloc_tos(), struct PNP_GetDeviceStatus);
 	if (r == NULL) {
@@ -2310,7 +2310,7 @@ static bool api_PNP_SetDeviceProblem(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_SetDeviceProblem *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_SETDEVICEPROBLEM];
+	call = &p->interface->calls[NDR_PNP_SETDEVICEPROBLEM];
 
 	r = talloc(talloc_tos(), struct PNP_SetDeviceProblem);
 	if (r == NULL) {
@@ -2383,7 +2383,7 @@ static bool api_PNP_DisableDevInst(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_DisableDevInst *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_DISABLEDEVINST];
+	call = &p->interface->calls[NDR_PNP_DISABLEDEVINST];
 
 	r = talloc(talloc_tos(), struct PNP_DisableDevInst);
 	if (r == NULL) {
@@ -2456,7 +2456,7 @@ static bool api_PNP_UninstallDevInst(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_UninstallDevInst *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_UNINSTALLDEVINST];
+	call = &p->interface->calls[NDR_PNP_UNINSTALLDEVINST];
 
 	r = talloc(talloc_tos(), struct PNP_UninstallDevInst);
 	if (r == NULL) {
@@ -2529,7 +2529,7 @@ static bool api_PNP_AddID(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_AddID *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_ADDID];
+	call = &p->interface->calls[NDR_PNP_ADDID];
 
 	r = talloc(talloc_tos(), struct PNP_AddID);
 	if (r == NULL) {
@@ -2602,7 +2602,7 @@ static bool api_PNP_RegisterDriver(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_RegisterDriver *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_REGISTERDRIVER];
+	call = &p->interface->calls[NDR_PNP_REGISTERDRIVER];
 
 	r = talloc(talloc_tos(), struct PNP_RegisterDriver);
 	if (r == NULL) {
@@ -2675,7 +2675,7 @@ static bool api_PNP_QueryRemove(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_QueryRemove *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_QUERYREMOVE];
+	call = &p->interface->calls[NDR_PNP_QUERYREMOVE];
 
 	r = talloc(talloc_tos(), struct PNP_QueryRemove);
 	if (r == NULL) {
@@ -2748,7 +2748,7 @@ static bool api_PNP_RequestDeviceEject(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_RequestDeviceEject *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_REQUESTDEVICEEJECT];
+	call = &p->interface->calls[NDR_PNP_REQUESTDEVICEEJECT];
 
 	r = talloc(talloc_tos(), struct PNP_RequestDeviceEject);
 	if (r == NULL) {
@@ -2821,7 +2821,7 @@ static bool api_PNP_IsDockStationPresent(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_IsDockStationPresent *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_ISDOCKSTATIONPRESENT];
+	call = &p->interface->calls[NDR_PNP_ISDOCKSTATIONPRESENT];
 
 	r = talloc(talloc_tos(), struct PNP_IsDockStationPresent);
 	if (r == NULL) {
@@ -2894,7 +2894,7 @@ static bool api_PNP_RequestEjectPC(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_RequestEjectPC *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_REQUESTEJECTPC];
+	call = &p->interface->calls[NDR_PNP_REQUESTEJECTPC];
 
 	r = talloc(talloc_tos(), struct PNP_RequestEjectPC);
 	if (r == NULL) {
@@ -2967,7 +2967,7 @@ static bool api_PNP_HwProfFlags(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_HwProfFlags *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_HWPROFFLAGS];
+	call = &p->interface->calls[NDR_PNP_HWPROFFLAGS];
 
 	r = talloc(talloc_tos(), struct PNP_HwProfFlags);
 	if (r == NULL) {
@@ -3049,7 +3049,7 @@ static bool api_PNP_GetHwProfInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetHwProfInfo *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETHWPROFINFO];
+	call = &p->interface->calls[NDR_PNP_GETHWPROFINFO];
 
 	r = talloc(talloc_tos(), struct PNP_GetHwProfInfo);
 	if (r == NULL) {
@@ -3124,7 +3124,7 @@ static bool api_PNP_AddEmptyLogConf(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_AddEmptyLogConf *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_ADDEMPTYLOGCONF];
+	call = &p->interface->calls[NDR_PNP_ADDEMPTYLOGCONF];
 
 	r = talloc(talloc_tos(), struct PNP_AddEmptyLogConf);
 	if (r == NULL) {
@@ -3197,7 +3197,7 @@ static bool api_PNP_FreeLogConf(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_FreeLogConf *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_FREELOGCONF];
+	call = &p->interface->calls[NDR_PNP_FREELOGCONF];
 
 	r = talloc(talloc_tos(), struct PNP_FreeLogConf);
 	if (r == NULL) {
@@ -3270,7 +3270,7 @@ static bool api_PNP_GetFirstLogConf(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetFirstLogConf *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETFIRSTLOGCONF];
+	call = &p->interface->calls[NDR_PNP_GETFIRSTLOGCONF];
 
 	r = talloc(talloc_tos(), struct PNP_GetFirstLogConf);
 	if (r == NULL) {
@@ -3343,7 +3343,7 @@ static bool api_PNP_GetNextLogConf(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetNextLogConf *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETNEXTLOGCONF];
+	call = &p->interface->calls[NDR_PNP_GETNEXTLOGCONF];
 
 	r = talloc(talloc_tos(), struct PNP_GetNextLogConf);
 	if (r == NULL) {
@@ -3416,7 +3416,7 @@ static bool api_PNP_GetLogConfPriority(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetLogConfPriority *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETLOGCONFPRIORITY];
+	call = &p->interface->calls[NDR_PNP_GETLOGCONFPRIORITY];
 
 	r = talloc(talloc_tos(), struct PNP_GetLogConfPriority);
 	if (r == NULL) {
@@ -3489,7 +3489,7 @@ static bool api_PNP_AddResDes(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_AddResDes *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_ADDRESDES];
+	call = &p->interface->calls[NDR_PNP_ADDRESDES];
 
 	r = talloc(talloc_tos(), struct PNP_AddResDes);
 	if (r == NULL) {
@@ -3562,7 +3562,7 @@ static bool api_PNP_FreeResDes(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_FreeResDes *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_FREERESDES];
+	call = &p->interface->calls[NDR_PNP_FREERESDES];
 
 	r = talloc(talloc_tos(), struct PNP_FreeResDes);
 	if (r == NULL) {
@@ -3635,7 +3635,7 @@ static bool api_PNP_GetNextResDes(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetNextResDes *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETNEXTRESDES];
+	call = &p->interface->calls[NDR_PNP_GETNEXTRESDES];
 
 	r = talloc(talloc_tos(), struct PNP_GetNextResDes);
 	if (r == NULL) {
@@ -3708,7 +3708,7 @@ static bool api_PNP_GetResDesData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetResDesData *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETRESDESDATA];
+	call = &p->interface->calls[NDR_PNP_GETRESDESDATA];
 
 	r = talloc(talloc_tos(), struct PNP_GetResDesData);
 	if (r == NULL) {
@@ -3781,7 +3781,7 @@ static bool api_PNP_GetResDesDataSize(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetResDesDataSize *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETRESDESDATASIZE];
+	call = &p->interface->calls[NDR_PNP_GETRESDESDATASIZE];
 
 	r = talloc(talloc_tos(), struct PNP_GetResDesDataSize);
 	if (r == NULL) {
@@ -3854,7 +3854,7 @@ static bool api_PNP_ModifyResDes(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_ModifyResDes *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_MODIFYRESDES];
+	call = &p->interface->calls[NDR_PNP_MODIFYRESDES];
 
 	r = talloc(talloc_tos(), struct PNP_ModifyResDes);
 	if (r == NULL) {
@@ -3927,7 +3927,7 @@ static bool api_PNP_DetectResourceLimit(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_DetectResourceLimit *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_DETECTRESOURCELIMIT];
+	call = &p->interface->calls[NDR_PNP_DETECTRESOURCELIMIT];
 
 	r = talloc(talloc_tos(), struct PNP_DetectResourceLimit);
 	if (r == NULL) {
@@ -4000,7 +4000,7 @@ static bool api_PNP_QueryResConfList(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_QueryResConfList *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_QUERYRESCONFLIST];
+	call = &p->interface->calls[NDR_PNP_QUERYRESCONFLIST];
 
 	r = talloc(talloc_tos(), struct PNP_QueryResConfList);
 	if (r == NULL) {
@@ -4073,7 +4073,7 @@ static bool api_PNP_SetHwProf(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_SetHwProf *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_SETHWPROF];
+	call = &p->interface->calls[NDR_PNP_SETHWPROF];
 
 	r = talloc(talloc_tos(), struct PNP_SetHwProf);
 	if (r == NULL) {
@@ -4146,7 +4146,7 @@ static bool api_PNP_QueryArbitratorFreeData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_QueryArbitratorFreeData *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_QUERYARBITRATORFREEDATA];
+	call = &p->interface->calls[NDR_PNP_QUERYARBITRATORFREEDATA];
 
 	r = talloc(talloc_tos(), struct PNP_QueryArbitratorFreeData);
 	if (r == NULL) {
@@ -4219,7 +4219,7 @@ static bool api_PNP_QueryArbitratorFreeSize(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_QueryArbitratorFreeSize *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_QUERYARBITRATORFREESIZE];
+	call = &p->interface->calls[NDR_PNP_QUERYARBITRATORFREESIZE];
 
 	r = talloc(talloc_tos(), struct PNP_QueryArbitratorFreeSize);
 	if (r == NULL) {
@@ -4292,7 +4292,7 @@ static bool api_PNP_RunDetection(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_RunDetection *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_RUNDETECTION];
+	call = &p->interface->calls[NDR_PNP_RUNDETECTION];
 
 	r = talloc(talloc_tos(), struct PNP_RunDetection);
 	if (r == NULL) {
@@ -4365,7 +4365,7 @@ static bool api_PNP_RegisterNotification(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_RegisterNotification *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_REGISTERNOTIFICATION];
+	call = &p->interface->calls[NDR_PNP_REGISTERNOTIFICATION];
 
 	r = talloc(talloc_tos(), struct PNP_RegisterNotification);
 	if (r == NULL) {
@@ -4438,7 +4438,7 @@ static bool api_PNP_UnregisterNotification(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_UnregisterNotification *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_UNREGISTERNOTIFICATION];
+	call = &p->interface->calls[NDR_PNP_UNREGISTERNOTIFICATION];
 
 	r = talloc(talloc_tos(), struct PNP_UnregisterNotification);
 	if (r == NULL) {
@@ -4511,7 +4511,7 @@ static bool api_PNP_GetCustomDevProp(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetCustomDevProp *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETCUSTOMDEVPROP];
+	call = &p->interface->calls[NDR_PNP_GETCUSTOMDEVPROP];
 
 	r = talloc(talloc_tos(), struct PNP_GetCustomDevProp);
 	if (r == NULL) {
@@ -4584,7 +4584,7 @@ static bool api_PNP_GetVersionInternal(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetVersionInternal *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETVERSIONINTERNAL];
+	call = &p->interface->calls[NDR_PNP_GETVERSIONINTERNAL];
 
 	r = talloc(talloc_tos(), struct PNP_GetVersionInternal);
 	if (r == NULL) {
@@ -4657,7 +4657,7 @@ static bool api_PNP_GetBlockedDriverInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetBlockedDriverInfo *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETBLOCKEDDRIVERINFO];
+	call = &p->interface->calls[NDR_PNP_GETBLOCKEDDRIVERINFO];
 
 	r = talloc(talloc_tos(), struct PNP_GetBlockedDriverInfo);
 	if (r == NULL) {
@@ -4730,7 +4730,7 @@ static bool api_PNP_GetServerSideDeviceInstallFlags(pipes_struct *p)
 	DATA_BLOB blob;
 	struct PNP_GetServerSideDeviceInstallFlags *r;
 
-	call = &ndr_table_ntsvcs.calls[NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS];
+	call = &p->interface->calls[NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS];
 
 	r = talloc(talloc_tos(), struct PNP_GetServerSideDeviceInstallFlags);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_samr.c b/librpc/gen_ndr/srv_samr.c
index 2b866bf8988..62a2aedea78 100644
--- a/librpc/gen_ndr/srv_samr.c
+++ b/librpc/gen_ndr/srv_samr.c
@@ -15,7 +15,7 @@ static bool api_samr_Connect(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Connect *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT];
+	call = &p->interface->calls[NDR_SAMR_CONNECT];
 
 	r = talloc(talloc_tos(), struct samr_Connect);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_samr_Close(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Close *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CLOSE];
+	call = &p->interface->calls[NDR_SAMR_CLOSE];
 
 	r = talloc(talloc_tos(), struct samr_Close);
 	if (r == NULL) {
@@ -170,7 +170,7 @@ static bool api_samr_SetSecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetSecurity *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETSECURITY];
+	call = &p->interface->calls[NDR_SAMR_SETSECURITY];
 
 	r = talloc(talloc_tos(), struct samr_SetSecurity);
 	if (r == NULL) {
@@ -243,7 +243,7 @@ static bool api_samr_QuerySecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QuerySecurity *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYSECURITY];
+	call = &p->interface->calls[NDR_SAMR_QUERYSECURITY];
 
 	r = talloc(talloc_tos(), struct samr_QuerySecurity);
 	if (r == NULL) {
@@ -323,7 +323,7 @@ static bool api_samr_Shutdown(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Shutdown *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SHUTDOWN];
+	call = &p->interface->calls[NDR_SAMR_SHUTDOWN];
 
 	r = talloc(talloc_tos(), struct samr_Shutdown);
 	if (r == NULL) {
@@ -396,7 +396,7 @@ static bool api_samr_LookupDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_LookupDomain *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_LOOKUPDOMAIN];
+	call = &p->interface->calls[NDR_SAMR_LOOKUPDOMAIN];
 
 	r = talloc(talloc_tos(), struct samr_LookupDomain);
 	if (r == NULL) {
@@ -476,7 +476,7 @@ static bool api_samr_EnumDomains(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_EnumDomains *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINS];
+	call = &p->interface->calls[NDR_SAMR_ENUMDOMAINS];
 
 	r = talloc(talloc_tos(), struct samr_EnumDomains);
 	if (r == NULL) {
@@ -563,7 +563,7 @@ static bool api_samr_OpenDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_OpenDomain *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_OPENDOMAIN];
+	call = &p->interface->calls[NDR_SAMR_OPENDOMAIN];
 
 	r = talloc(talloc_tos(), struct samr_OpenDomain);
 	if (r == NULL) {
@@ -643,7 +643,7 @@ static bool api_samr_QueryDomainInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryDomainInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDOMAININFO];
+	call = &p->interface->calls[NDR_SAMR_QUERYDOMAININFO];
 
 	r = talloc(talloc_tos(), struct samr_QueryDomainInfo);
 	if (r == NULL) {
@@ -723,7 +723,7 @@ static bool api_samr_SetDomainInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetDomainInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETDOMAININFO];
+	call = &p->interface->calls[NDR_SAMR_SETDOMAININFO];
 
 	r = talloc(talloc_tos(), struct samr_SetDomainInfo);
 	if (r == NULL) {
@@ -796,7 +796,7 @@ static bool api_samr_CreateDomainGroup(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_CreateDomainGroup *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CREATEDOMAINGROUP];
+	call = &p->interface->calls[NDR_SAMR_CREATEDOMAINGROUP];
 
 	r = talloc(talloc_tos(), struct samr_CreateDomainGroup);
 	if (r == NULL) {
@@ -882,7 +882,7 @@ static bool api_samr_EnumDomainGroups(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_EnumDomainGroups *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINGROUPS];
+	call = &p->interface->calls[NDR_SAMR_ENUMDOMAINGROUPS];
 
 	r = talloc(talloc_tos(), struct samr_EnumDomainGroups);
 	if (r == NULL) {
@@ -969,7 +969,7 @@ static bool api_samr_CreateUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_CreateUser *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CREATEUSER];
+	call = &p->interface->calls[NDR_SAMR_CREATEUSER];
 
 	r = talloc(talloc_tos(), struct samr_CreateUser);
 	if (r == NULL) {
@@ -1055,7 +1055,7 @@ static bool api_samr_EnumDomainUsers(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_EnumDomainUsers *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINUSERS];
+	call = &p->interface->calls[NDR_SAMR_ENUMDOMAINUSERS];
 
 	r = talloc(talloc_tos(), struct samr_EnumDomainUsers);
 	if (r == NULL) {
@@ -1142,7 +1142,7 @@ static bool api_samr_CreateDomAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_CreateDomAlias *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CREATEDOMALIAS];
+	call = &p->interface->calls[NDR_SAMR_CREATEDOMALIAS];
 
 	r = talloc(talloc_tos(), struct samr_CreateDomAlias);
 	if (r == NULL) {
@@ -1228,7 +1228,7 @@ static bool api_samr_EnumDomainAliases(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_EnumDomainAliases *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ENUMDOMAINALIASES];
+	call = &p->interface->calls[NDR_SAMR_ENUMDOMAINALIASES];
 
 	r = talloc(talloc_tos(), struct samr_EnumDomainAliases);
 	if (r == NULL) {
@@ -1315,7 +1315,7 @@ static bool api_samr_GetAliasMembership(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetAliasMembership *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETALIASMEMBERSHIP];
+	call = &p->interface->calls[NDR_SAMR_GETALIASMEMBERSHIP];
 
 	r = talloc(talloc_tos(), struct samr_GetAliasMembership);
 	if (r == NULL) {
@@ -1395,7 +1395,7 @@ static bool api_samr_LookupNames(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_LookupNames *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_LOOKUPNAMES];
+	call = &p->interface->calls[NDR_SAMR_LOOKUPNAMES];
 
 	r = talloc(talloc_tos(), struct samr_LookupNames);
 	if (r == NULL) {
@@ -1481,7 +1481,7 @@ static bool api_samr_LookupRids(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_LookupRids *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_LOOKUPRIDS];
+	call = &p->interface->calls[NDR_SAMR_LOOKUPRIDS];
 
 	r = talloc(talloc_tos(), struct samr_LookupRids);
 	if (r == NULL) {
@@ -1567,7 +1567,7 @@ static bool api_samr_OpenGroup(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_OpenGroup *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_OPENGROUP];
+	call = &p->interface->calls[NDR_SAMR_OPENGROUP];
 
 	r = talloc(talloc_tos(), struct samr_OpenGroup);
 	if (r == NULL) {
@@ -1647,7 +1647,7 @@ static bool api_samr_QueryGroupInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryGroupInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYGROUPINFO];
+	call = &p->interface->calls[NDR_SAMR_QUERYGROUPINFO];
 
 	r = talloc(talloc_tos(), struct samr_QueryGroupInfo);
 	if (r == NULL) {
@@ -1727,7 +1727,7 @@ static bool api_samr_SetGroupInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetGroupInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETGROUPINFO];
+	call = &p->interface->calls[NDR_SAMR_SETGROUPINFO];
 
 	r = talloc(talloc_tos(), struct samr_SetGroupInfo);
 	if (r == NULL) {
@@ -1800,7 +1800,7 @@ static bool api_samr_AddGroupMember(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_AddGroupMember *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ADDGROUPMEMBER];
+	call = &p->interface->calls[NDR_SAMR_ADDGROUPMEMBER];
 
 	r = talloc(talloc_tos(), struct samr_AddGroupMember);
 	if (r == NULL) {
@@ -1873,7 +1873,7 @@ static bool api_samr_DeleteDomainGroup(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_DeleteDomainGroup *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_DELETEDOMAINGROUP];
+	call = &p->interface->calls[NDR_SAMR_DELETEDOMAINGROUP];
 
 	r = talloc(talloc_tos(), struct samr_DeleteDomainGroup);
 	if (r == NULL) {
@@ -1948,7 +1948,7 @@ static bool api_samr_DeleteGroupMember(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_DeleteGroupMember *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_DELETEGROUPMEMBER];
+	call = &p->interface->calls[NDR_SAMR_DELETEGROUPMEMBER];
 
 	r = talloc(talloc_tos(), struct samr_DeleteGroupMember);
 	if (r == NULL) {
@@ -2021,7 +2021,7 @@ static bool api_samr_QueryGroupMember(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryGroupMember *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYGROUPMEMBER];
+	call = &p->interface->calls[NDR_SAMR_QUERYGROUPMEMBER];
 
 	r = talloc(talloc_tos(), struct samr_QueryGroupMember);
 	if (r == NULL) {
@@ -2101,7 +2101,7 @@ static bool api_samr_SetMemberAttributesOfGroup(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetMemberAttributesOfGroup *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP];
+	call = &p->interface->calls[NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP];
 
 	r = talloc(talloc_tos(), struct samr_SetMemberAttributesOfGroup);
 	if (r == NULL) {
@@ -2174,7 +2174,7 @@ static bool api_samr_OpenAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_OpenAlias *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_OPENALIAS];
+	call = &p->interface->calls[NDR_SAMR_OPENALIAS];
 
 	r = talloc(talloc_tos(), struct samr_OpenAlias);
 	if (r == NULL) {
@@ -2254,7 +2254,7 @@ static bool api_samr_QueryAliasInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryAliasInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYALIASINFO];
+	call = &p->interface->calls[NDR_SAMR_QUERYALIASINFO];
 
 	r = talloc(talloc_tos(), struct samr_QueryAliasInfo);
 	if (r == NULL) {
@@ -2334,7 +2334,7 @@ static bool api_samr_SetAliasInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetAliasInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETALIASINFO];
+	call = &p->interface->calls[NDR_SAMR_SETALIASINFO];
 
 	r = talloc(talloc_tos(), struct samr_SetAliasInfo);
 	if (r == NULL) {
@@ -2407,7 +2407,7 @@ static bool api_samr_DeleteDomAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_DeleteDomAlias *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_DELETEDOMALIAS];
+	call = &p->interface->calls[NDR_SAMR_DELETEDOMALIAS];
 
 	r = talloc(talloc_tos(), struct samr_DeleteDomAlias);
 	if (r == NULL) {
@@ -2482,7 +2482,7 @@ static bool api_samr_AddAliasMember(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_AddAliasMember *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ADDALIASMEMBER];
+	call = &p->interface->calls[NDR_SAMR_ADDALIASMEMBER];
 
 	r = talloc(talloc_tos(), struct samr_AddAliasMember);
 	if (r == NULL) {
@@ -2555,7 +2555,7 @@ static bool api_samr_DeleteAliasMember(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_DeleteAliasMember *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_DELETEALIASMEMBER];
+	call = &p->interface->calls[NDR_SAMR_DELETEALIASMEMBER];
 
 	r = talloc(talloc_tos(), struct samr_DeleteAliasMember);
 	if (r == NULL) {
@@ -2628,7 +2628,7 @@ static bool api_samr_GetMembersInAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetMembersInAlias *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETMEMBERSINALIAS];
+	call = &p->interface->calls[NDR_SAMR_GETMEMBERSINALIAS];
 
 	r = talloc(talloc_tos(), struct samr_GetMembersInAlias);
 	if (r == NULL) {
@@ -2708,7 +2708,7 @@ static bool api_samr_OpenUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_OpenUser *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_OPENUSER];
+	call = &p->interface->calls[NDR_SAMR_OPENUSER];
 
 	r = talloc(talloc_tos(), struct samr_OpenUser);
 	if (r == NULL) {
@@ -2788,7 +2788,7 @@ static bool api_samr_DeleteUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_DeleteUser *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_DELETEUSER];
+	call = &p->interface->calls[NDR_SAMR_DELETEUSER];
 
 	r = talloc(talloc_tos(), struct samr_DeleteUser);
 	if (r == NULL) {
@@ -2863,7 +2863,7 @@ static bool api_samr_QueryUserInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryUserInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYUSERINFO];
+	call = &p->interface->calls[NDR_SAMR_QUERYUSERINFO];
 
 	r = talloc(talloc_tos(), struct samr_QueryUserInfo);
 	if (r == NULL) {
@@ -2943,7 +2943,7 @@ static bool api_samr_SetUserInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetUserInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETUSERINFO];
+	call = &p->interface->calls[NDR_SAMR_SETUSERINFO];
 
 	r = talloc(talloc_tos(), struct samr_SetUserInfo);
 	if (r == NULL) {
@@ -3016,7 +3016,7 @@ static bool api_samr_ChangePasswordUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_ChangePasswordUser *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CHANGEPASSWORDUSER];
+	call = &p->interface->calls[NDR_SAMR_CHANGEPASSWORDUSER];
 
 	r = talloc(talloc_tos(), struct samr_ChangePasswordUser);
 	if (r == NULL) {
@@ -3089,7 +3089,7 @@ static bool api_samr_GetGroupsForUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetGroupsForUser *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETGROUPSFORUSER];
+	call = &p->interface->calls[NDR_SAMR_GETGROUPSFORUSER];
 
 	r = talloc(talloc_tos(), struct samr_GetGroupsForUser);
 	if (r == NULL) {
@@ -3169,7 +3169,7 @@ static bool api_samr_QueryDisplayInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryDisplayInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDISPLAYINFO];
+	call = &p->interface->calls[NDR_SAMR_QUERYDISPLAYINFO];
 
 	r = talloc(talloc_tos(), struct samr_QueryDisplayInfo);
 	if (r == NULL) {
@@ -3261,7 +3261,7 @@ static bool api_samr_GetDisplayEnumerationIndex(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetDisplayEnumerationIndex *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETDISPLAYENUMERATIONINDEX];
+	call = &p->interface->calls[NDR_SAMR_GETDISPLAYENUMERATIONINDEX];
 
 	r = talloc(talloc_tos(), struct samr_GetDisplayEnumerationIndex);
 	if (r == NULL) {
@@ -3341,7 +3341,7 @@ static bool api_samr_TestPrivateFunctionsDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_TestPrivateFunctionsDomain *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN];
+	call = &p->interface->calls[NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN];
 
 	r = talloc(talloc_tos(), struct samr_TestPrivateFunctionsDomain);
 	if (r == NULL) {
@@ -3414,7 +3414,7 @@ static bool api_samr_TestPrivateFunctionsUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_TestPrivateFunctionsUser *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_TESTPRIVATEFUNCTIONSUSER];
+	call = &p->interface->calls[NDR_SAMR_TESTPRIVATEFUNCTIONSUSER];
 
 	r = talloc(talloc_tos(), struct samr_TestPrivateFunctionsUser);
 	if (r == NULL) {
@@ -3487,7 +3487,7 @@ static bool api_samr_GetUserPwInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetUserPwInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETUSERPWINFO];
+	call = &p->interface->calls[NDR_SAMR_GETUSERPWINFO];
 
 	r = talloc(talloc_tos(), struct samr_GetUserPwInfo);
 	if (r == NULL) {
@@ -3567,7 +3567,7 @@ static bool api_samr_RemoveMemberFromForeignDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_RemoveMemberFromForeignDomain *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN];
+	call = &p->interface->calls[NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN];
 
 	r = talloc(talloc_tos(), struct samr_RemoveMemberFromForeignDomain);
 	if (r == NULL) {
@@ -3640,7 +3640,7 @@ static bool api_samr_QueryDomainInfo2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryDomainInfo2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDOMAININFO2];
+	call = &p->interface->calls[NDR_SAMR_QUERYDOMAININFO2];
 
 	r = talloc(talloc_tos(), struct samr_QueryDomainInfo2);
 	if (r == NULL) {
@@ -3720,7 +3720,7 @@ static bool api_samr_QueryUserInfo2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryUserInfo2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYUSERINFO2];
+	call = &p->interface->calls[NDR_SAMR_QUERYUSERINFO2];
 
 	r = talloc(talloc_tos(), struct samr_QueryUserInfo2);
 	if (r == NULL) {
@@ -3800,7 +3800,7 @@ static bool api_samr_QueryDisplayInfo2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryDisplayInfo2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDISPLAYINFO2];
+	call = &p->interface->calls[NDR_SAMR_QUERYDISPLAYINFO2];
 
 	r = talloc(talloc_tos(), struct samr_QueryDisplayInfo2);
 	if (r == NULL) {
@@ -3892,7 +3892,7 @@ static bool api_samr_GetDisplayEnumerationIndex2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetDisplayEnumerationIndex2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETDISPLAYENUMERATIONINDEX2];
+	call = &p->interface->calls[NDR_SAMR_GETDISPLAYENUMERATIONINDEX2];
 
 	r = talloc(talloc_tos(), struct samr_GetDisplayEnumerationIndex2);
 	if (r == NULL) {
@@ -3972,7 +3972,7 @@ static bool api_samr_CreateUser2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_CreateUser2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CREATEUSER2];
+	call = &p->interface->calls[NDR_SAMR_CREATEUSER2];
 
 	r = talloc(talloc_tos(), struct samr_CreateUser2);
 	if (r == NULL) {
@@ -4064,7 +4064,7 @@ static bool api_samr_QueryDisplayInfo3(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_QueryDisplayInfo3 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_QUERYDISPLAYINFO3];
+	call = &p->interface->calls[NDR_SAMR_QUERYDISPLAYINFO3];
 
 	r = talloc(talloc_tos(), struct samr_QueryDisplayInfo3);
 	if (r == NULL) {
@@ -4156,7 +4156,7 @@ static bool api_samr_AddMultipleMembersToAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_AddMultipleMembersToAlias *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS];
+	call = &p->interface->calls[NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS];
 
 	r = talloc(talloc_tos(), struct samr_AddMultipleMembersToAlias);
 	if (r == NULL) {
@@ -4229,7 +4229,7 @@ static bool api_samr_RemoveMultipleMembersFromAlias(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_RemoveMultipleMembersFromAlias *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS];
+	call = &p->interface->calls[NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS];
 
 	r = talloc(talloc_tos(), struct samr_RemoveMultipleMembersFromAlias);
 	if (r == NULL) {
@@ -4302,7 +4302,7 @@ static bool api_samr_OemChangePasswordUser2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_OemChangePasswordUser2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_OEMCHANGEPASSWORDUSER2];
+	call = &p->interface->calls[NDR_SAMR_OEMCHANGEPASSWORDUSER2];
 
 	r = talloc(talloc_tos(), struct samr_OemChangePasswordUser2);
 	if (r == NULL) {
@@ -4375,7 +4375,7 @@ static bool api_samr_ChangePasswordUser2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_ChangePasswordUser2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CHANGEPASSWORDUSER2];
+	call = &p->interface->calls[NDR_SAMR_CHANGEPASSWORDUSER2];
 
 	r = talloc(talloc_tos(), struct samr_ChangePasswordUser2);
 	if (r == NULL) {
@@ -4448,7 +4448,7 @@ static bool api_samr_GetDomPwInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetDomPwInfo *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETDOMPWINFO];
+	call = &p->interface->calls[NDR_SAMR_GETDOMPWINFO];
 
 	r = talloc(talloc_tos(), struct samr_GetDomPwInfo);
 	if (r == NULL) {
@@ -4528,7 +4528,7 @@ static bool api_samr_Connect2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Connect2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT2];
+	call = &p->interface->calls[NDR_SAMR_CONNECT2];
 
 	r = talloc(talloc_tos(), struct samr_Connect2);
 	if (r == NULL) {
@@ -4608,7 +4608,7 @@ static bool api_samr_SetUserInfo2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetUserInfo2 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETUSERINFO2];
+	call = &p->interface->calls[NDR_SAMR_SETUSERINFO2];
 
 	r = talloc(talloc_tos(), struct samr_SetUserInfo2);
 	if (r == NULL) {
@@ -4681,7 +4681,7 @@ static bool api_samr_SetBootKeyInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetBootKeyInformation *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETBOOTKEYINFORMATION];
+	call = &p->interface->calls[NDR_SAMR_SETBOOTKEYINFORMATION];
 
 	r = talloc(talloc_tos(), struct samr_SetBootKeyInformation);
 	if (r == NULL) {
@@ -4754,7 +4754,7 @@ static bool api_samr_GetBootKeyInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_GetBootKeyInformation *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_GETBOOTKEYINFORMATION];
+	call = &p->interface->calls[NDR_SAMR_GETBOOTKEYINFORMATION];
 
 	r = talloc(talloc_tos(), struct samr_GetBootKeyInformation);
 	if (r == NULL) {
@@ -4834,7 +4834,7 @@ static bool api_samr_Connect3(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Connect3 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT3];
+	call = &p->interface->calls[NDR_SAMR_CONNECT3];
 
 	r = talloc(talloc_tos(), struct samr_Connect3);
 	if (r == NULL) {
@@ -4914,7 +4914,7 @@ static bool api_samr_Connect4(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Connect4 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT4];
+	call = &p->interface->calls[NDR_SAMR_CONNECT4];
 
 	r = talloc(talloc_tos(), struct samr_Connect4);
 	if (r == NULL) {
@@ -4994,7 +4994,7 @@ static bool api_samr_ChangePasswordUser3(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_ChangePasswordUser3 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CHANGEPASSWORDUSER3];
+	call = &p->interface->calls[NDR_SAMR_CHANGEPASSWORDUSER3];
 
 	r = talloc(talloc_tos(), struct samr_ChangePasswordUser3);
 	if (r == NULL) {
@@ -5080,7 +5080,7 @@ static bool api_samr_Connect5(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_Connect5 *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_CONNECT5];
+	call = &p->interface->calls[NDR_SAMR_CONNECT5];
 
 	r = talloc(talloc_tos(), struct samr_Connect5);
 	if (r == NULL) {
@@ -5172,7 +5172,7 @@ static bool api_samr_RidToSid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_RidToSid *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_RIDTOSID];
+	call = &p->interface->calls[NDR_SAMR_RIDTOSID];
 
 	r = talloc(talloc_tos(), struct samr_RidToSid);
 	if (r == NULL) {
@@ -5252,7 +5252,7 @@ static bool api_samr_SetDsrmPassword(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_SetDsrmPassword *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_SETDSRMPASSWORD];
+	call = &p->interface->calls[NDR_SAMR_SETDSRMPASSWORD];
 
 	r = talloc(talloc_tos(), struct samr_SetDsrmPassword);
 	if (r == NULL) {
@@ -5325,7 +5325,7 @@ static bool api_samr_ValidatePassword(pipes_struct *p)
 	DATA_BLOB blob;
 	struct samr_ValidatePassword *r;
 
-	call = &ndr_table_samr.calls[NDR_SAMR_VALIDATEPASSWORD];
+	call = &p->interface->calls[NDR_SAMR_VALIDATEPASSWORD];
 
 	r = talloc(talloc_tos(), struct samr_ValidatePassword);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_spoolss.c b/librpc/gen_ndr/srv_spoolss.c
index e078b98ee75..72132dc3120 100644
--- a/librpc/gen_ndr/srv_spoolss.c
+++ b/librpc/gen_ndr/srv_spoolss.c
@@ -15,7 +15,7 @@ static bool api_spoolss_EnumPrinters(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrinters *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTERS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTERS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrinters);
 	if (r == NULL) {
@@ -107,7 +107,7 @@ static bool api_spoolss_OpenPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_OpenPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_OPENPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_OPENPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_OpenPrinter);
 	if (r == NULL) {
@@ -187,7 +187,7 @@ static bool api_spoolss_SetJob(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_SetJob *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SETJOB];
+	call = &p->interface->calls[NDR_SPOOLSS_SETJOB];
 
 	r = talloc(talloc_tos(), struct spoolss_SetJob);
 	if (r == NULL) {
@@ -260,7 +260,7 @@ static bool api_spoolss_GetJob(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetJob *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETJOB];
+	call = &p->interface->calls[NDR_SPOOLSS_GETJOB];
 
 	r = talloc(talloc_tos(), struct spoolss_GetJob);
 	if (r == NULL) {
@@ -346,7 +346,7 @@ static bool api_spoolss_EnumJobs(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumJobs *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMJOBS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMJOBS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumJobs);
 	if (r == NULL) {
@@ -438,7 +438,7 @@ static bool api_spoolss_AddPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrinter);
 	if (r == NULL) {
@@ -518,7 +518,7 @@ static bool api_spoolss_DeletePrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinter);
 	if (r == NULL) {
@@ -591,7 +591,7 @@ static bool api_spoolss_SetPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_SetPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SETPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_SETPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_SetPrinter);
 	if (r == NULL) {
@@ -664,7 +664,7 @@ static bool api_spoolss_GetPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinter);
 	if (r == NULL) {
@@ -750,7 +750,7 @@ static bool api_spoolss_AddPrinterDriver(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrinterDriver *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTERDRIVER];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTERDRIVER];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrinterDriver);
 	if (r == NULL) {
@@ -823,7 +823,7 @@ static bool api_spoolss_EnumPrinterDrivers(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrinterDrivers *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTERDRIVERS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTERDRIVERS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrinterDrivers);
 	if (r == NULL) {
@@ -915,7 +915,7 @@ static bool api_spoolss_GetPrinterDriver(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinterDriver *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTERDRIVER];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTERDRIVER];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinterDriver);
 	if (r == NULL) {
@@ -1001,7 +1001,7 @@ static bool api_spoolss_GetPrinterDriverDirectory(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinterDriverDirectory *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTERDRIVERDIRECTORY];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTERDRIVERDIRECTORY];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinterDriverDirectory);
 	if (r == NULL) {
@@ -1087,7 +1087,7 @@ static bool api_spoolss_DeletePrinterDriver(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterDriver *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERDRIVER];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERDRIVER];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterDriver);
 	if (r == NULL) {
@@ -1160,7 +1160,7 @@ static bool api_spoolss_AddPrintProcessor(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrintProcessor *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTPROCESSOR];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTPROCESSOR];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrintProcessor);
 	if (r == NULL) {
@@ -1233,7 +1233,7 @@ static bool api_spoolss_EnumPrintProcessors(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrintProcessors *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTPROCESSORS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTPROCESSORS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrintProcessors);
 	if (r == NULL) {
@@ -1325,7 +1325,7 @@ static bool api_spoolss_GetPrintProcessorDirectory(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrintProcessorDirectory *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTPROCESSORDIRECTORY];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTPROCESSORDIRECTORY];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrintProcessorDirectory);
 	if (r == NULL) {
@@ -1411,7 +1411,7 @@ static bool api_spoolss_StartDocPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_StartDocPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_STARTDOCPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_STARTDOCPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_StartDocPrinter);
 	if (r == NULL) {
@@ -1491,7 +1491,7 @@ static bool api_spoolss_StartPagePrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_StartPagePrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_STARTPAGEPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_STARTPAGEPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_StartPagePrinter);
 	if (r == NULL) {
@@ -1564,7 +1564,7 @@ static bool api_spoolss_WritePrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_WritePrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_WRITEPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_WRITEPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_WritePrinter);
 	if (r == NULL) {
@@ -1644,7 +1644,7 @@ static bool api_spoolss_EndPagePrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EndPagePrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENDPAGEPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_ENDPAGEPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_EndPagePrinter);
 	if (r == NULL) {
@@ -1717,7 +1717,7 @@ static bool api_spoolss_AbortPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AbortPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ABORTPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_ABORTPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_AbortPrinter);
 	if (r == NULL) {
@@ -1790,7 +1790,7 @@ static bool api_spoolss_ReadPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ReadPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_READPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_READPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_ReadPrinter);
 	if (r == NULL) {
@@ -1876,7 +1876,7 @@ static bool api_spoolss_EndDocPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EndDocPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENDDOCPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_ENDDOCPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_EndDocPrinter);
 	if (r == NULL) {
@@ -1949,7 +1949,7 @@ static bool api_spoolss_AddJob(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddJob *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDJOB];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDJOB];
 
 	r = talloc(talloc_tos(), struct spoolss_AddJob);
 	if (r == NULL) {
@@ -2030,7 +2030,7 @@ static bool api_spoolss_ScheduleJob(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ScheduleJob *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SCHEDULEJOB];
+	call = &p->interface->calls[NDR_SPOOLSS_SCHEDULEJOB];
 
 	r = talloc(talloc_tos(), struct spoolss_ScheduleJob);
 	if (r == NULL) {
@@ -2103,7 +2103,7 @@ static bool api_spoolss_GetPrinterData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinterData *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTERDATA];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTERDATA];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinterData);
 	if (r == NULL) {
@@ -2195,7 +2195,7 @@ static bool api_spoolss_SetPrinterData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_SetPrinterData *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SETPRINTERDATA];
+	call = &p->interface->calls[NDR_SPOOLSS_SETPRINTERDATA];
 
 	r = talloc(talloc_tos(), struct spoolss_SetPrinterData);
 	if (r == NULL) {
@@ -2268,7 +2268,7 @@ static bool api_spoolss_WaitForPrinterChange(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_WaitForPrinterChange *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_WAITFORPRINTERCHANGE];
+	call = &p->interface->calls[NDR_SPOOLSS_WAITFORPRINTERCHANGE];
 
 	r = talloc(talloc_tos(), struct spoolss_WaitForPrinterChange);
 	if (r == NULL) {
@@ -2341,7 +2341,7 @@ static bool api_spoolss_ClosePrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ClosePrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_CLOSEPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_CLOSEPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_ClosePrinter);
 	if (r == NULL) {
@@ -2416,7 +2416,7 @@ static bool api_spoolss_AddForm(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddForm *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDFORM];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDFORM];
 
 	r = talloc(talloc_tos(), struct spoolss_AddForm);
 	if (r == NULL) {
@@ -2489,7 +2489,7 @@ static bool api_spoolss_DeleteForm(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeleteForm *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEFORM];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEFORM];
 
 	r = talloc(talloc_tos(), struct spoolss_DeleteForm);
 	if (r == NULL) {
@@ -2562,7 +2562,7 @@ static bool api_spoolss_GetForm(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetForm *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETFORM];
+	call = &p->interface->calls[NDR_SPOOLSS_GETFORM];
 
 	r = talloc(talloc_tos(), struct spoolss_GetForm);
 	if (r == NULL) {
@@ -2648,7 +2648,7 @@ static bool api_spoolss_SetForm(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_SetForm *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SETFORM];
+	call = &p->interface->calls[NDR_SPOOLSS_SETFORM];
 
 	r = talloc(talloc_tos(), struct spoolss_SetForm);
 	if (r == NULL) {
@@ -2721,7 +2721,7 @@ static bool api_spoolss_EnumForms(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumForms *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMFORMS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMFORMS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumForms);
 	if (r == NULL) {
@@ -2813,7 +2813,7 @@ static bool api_spoolss_EnumPorts(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPorts *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPORTS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPORTS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPorts);
 	if (r == NULL) {
@@ -2905,7 +2905,7 @@ static bool api_spoolss_EnumMonitors(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumMonitors *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMMONITORS];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMMONITORS];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumMonitors);
 	if (r == NULL) {
@@ -2997,7 +2997,7 @@ static bool api_spoolss_AddPort(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPort *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPORT];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPORT];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPort);
 	if (r == NULL) {
@@ -3070,7 +3070,7 @@ static bool api_spoolss_ConfigurePort(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ConfigurePort *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_CONFIGUREPORT];
+	call = &p->interface->calls[NDR_SPOOLSS_CONFIGUREPORT];
 
 	r = talloc(talloc_tos(), struct spoolss_ConfigurePort);
 	if (r == NULL) {
@@ -3143,7 +3143,7 @@ static bool api_spoolss_DeletePort(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePort *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPORT];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPORT];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePort);
 	if (r == NULL) {
@@ -3216,7 +3216,7 @@ static bool api_spoolss_CreatePrinterIC(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_CreatePrinterIC *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_CREATEPRINTERIC];
+	call = &p->interface->calls[NDR_SPOOLSS_CREATEPRINTERIC];
 
 	r = talloc(talloc_tos(), struct spoolss_CreatePrinterIC);
 	if (r == NULL) {
@@ -3296,7 +3296,7 @@ static bool api_spoolss_PlayGDIScriptOnPrinterIC(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_PlayGDIScriptOnPrinterIC *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_PLAYGDISCRIPTONPRINTERIC];
+	call = &p->interface->calls[NDR_SPOOLSS_PLAYGDISCRIPTONPRINTERIC];
 
 	r = talloc(talloc_tos(), struct spoolss_PlayGDIScriptOnPrinterIC);
 	if (r == NULL) {
@@ -3369,7 +3369,7 @@ static bool api_spoolss_DeletePrinterIC(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterIC *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERIC];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERIC];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterIC);
 	if (r == NULL) {
@@ -3444,7 +3444,7 @@ static bool api_spoolss_AddPrinterConnection(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrinterConnection *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTERCONNECTION];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTERCONNECTION];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrinterConnection);
 	if (r == NULL) {
@@ -3517,7 +3517,7 @@ static bool api_spoolss_DeletePrinterConnection(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterConnection *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERCONNECTION];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERCONNECTION];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterConnection);
 	if (r == NULL) {
@@ -3590,7 +3590,7 @@ static bool api_spoolss_PrinterMessageBox(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_PrinterMessageBox *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_PRINTERMESSAGEBOX];
+	call = &p->interface->calls[NDR_SPOOLSS_PRINTERMESSAGEBOX];
 
 	r = talloc(talloc_tos(), struct spoolss_PrinterMessageBox);
 	if (r == NULL) {
@@ -3663,7 +3663,7 @@ static bool api_spoolss_AddMonitor(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddMonitor *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDMONITOR];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDMONITOR];
 
 	r = talloc(talloc_tos(), struct spoolss_AddMonitor);
 	if (r == NULL) {
@@ -3736,7 +3736,7 @@ static bool api_spoolss_DeleteMonitor(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeleteMonitor *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEMONITOR];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEMONITOR];
 
 	r = talloc(talloc_tos(), struct spoolss_DeleteMonitor);
 	if (r == NULL) {
@@ -3809,7 +3809,7 @@ static bool api_spoolss_DeletePrintProcessor(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrintProcessor *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTPROCESSOR];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTPROCESSOR];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrintProcessor);
 	if (r == NULL) {
@@ -3882,7 +3882,7 @@ static bool api_spoolss_AddPrintProvidor(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrintProvidor *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTPROVIDOR];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTPROVIDOR];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrintProvidor);
 	if (r == NULL) {
@@ -3955,7 +3955,7 @@ static bool api_spoolss_DeletePrintProvidor(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrintProvidor *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTPROVIDOR];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTPROVIDOR];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrintProvidor);
 	if (r == NULL) {
@@ -4028,7 +4028,7 @@ static bool api_spoolss_EnumPrintProcDataTypes(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrintProcDataTypes *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTPROCDATATYPES];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTPROCDATATYPES];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrintProcDataTypes);
 	if (r == NULL) {
@@ -4120,7 +4120,7 @@ static bool api_spoolss_ResetPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ResetPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_RESETPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_RESETPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_ResetPrinter);
 	if (r == NULL) {
@@ -4193,7 +4193,7 @@ static bool api_spoolss_GetPrinterDriver2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinterDriver2 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTERDRIVER2];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTERDRIVER2];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinterDriver2);
 	if (r == NULL) {
@@ -4291,7 +4291,7 @@ static bool api_spoolss_FindFirstPrinterChangeNotification(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_FindFirstPrinterChangeNotification *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION];
+	call = &p->interface->calls[NDR_SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION];
 
 	r = talloc(talloc_tos(), struct spoolss_FindFirstPrinterChangeNotification);
 	if (r == NULL) {
@@ -4364,7 +4364,7 @@ static bool api_spoolss_FindNextPrinterChangeNotification(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_FindNextPrinterChangeNotification *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION];
+	call = &p->interface->calls[NDR_SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION];
 
 	r = talloc(talloc_tos(), struct spoolss_FindNextPrinterChangeNotification);
 	if (r == NULL) {
@@ -4437,7 +4437,7 @@ static bool api_spoolss_FindClosePrinterNotify(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_FindClosePrinterNotify *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_FINDCLOSEPRINTERNOTIFY];
+	call = &p->interface->calls[NDR_SPOOLSS_FINDCLOSEPRINTERNOTIFY];
 
 	r = talloc(talloc_tos(), struct spoolss_FindClosePrinterNotify);
 	if (r == NULL) {
@@ -4510,7 +4510,7 @@ static bool api_spoolss_RouterFindFirstPrinterChangeNotificationOld(pipes_struct
 	DATA_BLOB blob;
 	struct spoolss_RouterFindFirstPrinterChangeNotificationOld *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATIONOLD];
+	call = &p->interface->calls[NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATIONOLD];
 
 	r = talloc(talloc_tos(), struct spoolss_RouterFindFirstPrinterChangeNotificationOld);
 	if (r == NULL) {
@@ -4583,7 +4583,7 @@ static bool api_spoolss_ReplyOpenPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ReplyOpenPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_REPLYOPENPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_REPLYOPENPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_ReplyOpenPrinter);
 	if (r == NULL) {
@@ -4663,7 +4663,7 @@ static bool api_spoolss_RouterReplyPrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_RouterReplyPrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERREPLYPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_ROUTERREPLYPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_RouterReplyPrinter);
 	if (r == NULL) {
@@ -4736,7 +4736,7 @@ static bool api_spoolss_ReplyClosePrinter(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ReplyClosePrinter *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_REPLYCLOSEPRINTER];
+	call = &p->interface->calls[NDR_SPOOLSS_REPLYCLOSEPRINTER];
 
 	r = talloc(talloc_tos(), struct spoolss_ReplyClosePrinter);
 	if (r == NULL) {
@@ -4811,7 +4811,7 @@ static bool api_spoolss_AddPortEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPortEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPORTEX];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPORTEX];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPortEx);
 	if (r == NULL) {
@@ -4884,7 +4884,7 @@ static bool api_spoolss_RouterFindFirstPrinterChangeNotification(pipes_struct *p
 	DATA_BLOB blob;
 	struct spoolss_RouterFindFirstPrinterChangeNotification *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATION];
+	call = &p->interface->calls[NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATION];
 
 	r = talloc(talloc_tos(), struct spoolss_RouterFindFirstPrinterChangeNotification);
 	if (r == NULL) {
@@ -4957,7 +4957,7 @@ static bool api_spoolss_SpoolerInit(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_SpoolerInit *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SPOOLERINIT];
+	call = &p->interface->calls[NDR_SPOOLSS_SPOOLERINIT];
 
 	r = talloc(talloc_tos(), struct spoolss_SpoolerInit);
 	if (r == NULL) {
@@ -5030,7 +5030,7 @@ static bool api_spoolss_ResetPrinterEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_ResetPrinterEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_RESETPRINTEREX];
+	call = &p->interface->calls[NDR_SPOOLSS_RESETPRINTEREX];
 
 	r = talloc(talloc_tos(), struct spoolss_ResetPrinterEx);
 	if (r == NULL) {
@@ -5103,7 +5103,7 @@ static bool api_spoolss_RemoteFindFirstPrinterChangeNotifyEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_RemoteFindFirstPrinterChangeNotifyEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX];
+	call = &p->interface->calls[NDR_SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX];
 
 	r = talloc(talloc_tos(), struct spoolss_RemoteFindFirstPrinterChangeNotifyEx);
 	if (r == NULL) {
@@ -5176,7 +5176,7 @@ static bool api_spoolss_RouterReplyPrinterEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_RouterReplyPrinterEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERREPLYPRINTEREX];
+	call = &p->interface->calls[NDR_SPOOLSS_ROUTERREPLYPRINTEREX];
 
 	r = talloc(talloc_tos(), struct spoolss_RouterReplyPrinterEx);
 	if (r == NULL) {
@@ -5256,7 +5256,7 @@ static bool api_spoolss_RouterRefreshPrinterChangeNotify(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_RouterRefreshPrinterChangeNotify *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY];
+	call = &p->interface->calls[NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY];
 
 	r = talloc(talloc_tos(), struct spoolss_RouterRefreshPrinterChangeNotify);
 	if (r == NULL) {
@@ -5336,7 +5336,7 @@ static bool api_spoolss_44(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_44 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_44];
+	call = &p->interface->calls[NDR_SPOOLSS_44];
 
 	r = talloc(talloc_tos(), struct spoolss_44);
 	if (r == NULL) {
@@ -5409,7 +5409,7 @@ static bool api_spoolss_OpenPrinterEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_OpenPrinterEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_OPENPRINTEREX];
+	call = &p->interface->calls[NDR_SPOOLSS_OPENPRINTEREX];
 
 	r = talloc(talloc_tos(), struct spoolss_OpenPrinterEx);
 	if (r == NULL) {
@@ -5489,7 +5489,7 @@ static bool api_spoolss_AddPrinterEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrinterEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTEREX];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTEREX];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrinterEx);
 	if (r == NULL) {
@@ -5569,7 +5569,7 @@ static bool api_spoolss_47(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_47 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_47];
+	call = &p->interface->calls[NDR_SPOOLSS_47];
 
 	r = talloc(talloc_tos(), struct spoolss_47);
 	if (r == NULL) {
@@ -5642,7 +5642,7 @@ static bool api_spoolss_EnumPrinterData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrinterData *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTERDATA];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTERDATA];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrinterData);
 	if (r == NULL) {
@@ -5746,7 +5746,7 @@ static bool api_spoolss_DeletePrinterData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterData *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERDATA];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERDATA];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterData);
 	if (r == NULL) {
@@ -5819,7 +5819,7 @@ static bool api_spoolss_4a(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_4a *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_4A];
+	call = &p->interface->calls[NDR_SPOOLSS_4A];
 
 	r = talloc(talloc_tos(), struct spoolss_4a);
 	if (r == NULL) {
@@ -5892,7 +5892,7 @@ static bool api_spoolss_4b(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_4b *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_4B];
+	call = &p->interface->calls[NDR_SPOOLSS_4B];
 
 	r = talloc(talloc_tos(), struct spoolss_4b);
 	if (r == NULL) {
@@ -5965,7 +5965,7 @@ static bool api_spoolss_4c(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_4c *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_4C];
+	call = &p->interface->calls[NDR_SPOOLSS_4C];
 
 	r = talloc(talloc_tos(), struct spoolss_4c);
 	if (r == NULL) {
@@ -6038,7 +6038,7 @@ static bool api_spoolss_SetPrinterDataEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_SetPrinterDataEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_SETPRINTERDATAEX];
+	call = &p->interface->calls[NDR_SPOOLSS_SETPRINTERDATAEX];
 
 	r = talloc(talloc_tos(), struct spoolss_SetPrinterDataEx);
 	if (r == NULL) {
@@ -6111,7 +6111,7 @@ static bool api_spoolss_GetPrinterDataEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinterDataEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTERDATAEX];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTERDATAEX];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinterDataEx);
 	if (r == NULL) {
@@ -6203,7 +6203,7 @@ static bool api_spoolss_EnumPrinterDataEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrinterDataEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTERDATAEX];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTERDATAEX];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrinterDataEx);
 	if (r == NULL) {
@@ -6295,7 +6295,7 @@ static bool api_spoolss_EnumPrinterKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_EnumPrinterKey *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ENUMPRINTERKEY];
+	call = &p->interface->calls[NDR_SPOOLSS_ENUMPRINTERKEY];
 
 	r = talloc(talloc_tos(), struct spoolss_EnumPrinterKey);
 	if (r == NULL) {
@@ -6381,7 +6381,7 @@ static bool api_spoolss_DeletePrinterDataEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterDataEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERDATAEX];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERDATAEX];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterDataEx);
 	if (r == NULL) {
@@ -6454,7 +6454,7 @@ static bool api_spoolss_DeletePrinterKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterKey *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERKEY];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERKEY];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterKey);
 	if (r == NULL) {
@@ -6527,7 +6527,7 @@ static bool api_spoolss_53(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_53 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_53];
+	call = &p->interface->calls[NDR_SPOOLSS_53];
 
 	r = talloc(talloc_tos(), struct spoolss_53);
 	if (r == NULL) {
@@ -6600,7 +6600,7 @@ static bool api_spoolss_DeletePrinterDriverEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_DeletePrinterDriverEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_DELETEPRINTERDRIVEREX];
+	call = &p->interface->calls[NDR_SPOOLSS_DELETEPRINTERDRIVEREX];
 
 	r = talloc(talloc_tos(), struct spoolss_DeletePrinterDriverEx);
 	if (r == NULL) {
@@ -6673,7 +6673,7 @@ static bool api_spoolss_55(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_55 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_55];
+	call = &p->interface->calls[NDR_SPOOLSS_55];
 
 	r = talloc(talloc_tos(), struct spoolss_55);
 	if (r == NULL) {
@@ -6746,7 +6746,7 @@ static bool api_spoolss_56(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_56 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_56];
+	call = &p->interface->calls[NDR_SPOOLSS_56];
 
 	r = talloc(talloc_tos(), struct spoolss_56);
 	if (r == NULL) {
@@ -6819,7 +6819,7 @@ static bool api_spoolss_57(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_57 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_57];
+	call = &p->interface->calls[NDR_SPOOLSS_57];
 
 	r = talloc(talloc_tos(), struct spoolss_57);
 	if (r == NULL) {
@@ -6892,7 +6892,7 @@ static bool api_spoolss_XcvData(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_XcvData *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_XCVDATA];
+	call = &p->interface->calls[NDR_SPOOLSS_XCVDATA];
 
 	r = talloc(talloc_tos(), struct spoolss_XcvData);
 	if (r == NULL) {
@@ -6979,7 +6979,7 @@ static bool api_spoolss_AddPrinterDriverEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_AddPrinterDriverEx *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ADDPRINTERDRIVEREX];
+	call = &p->interface->calls[NDR_SPOOLSS_ADDPRINTERDRIVEREX];
 
 	r = talloc(talloc_tos(), struct spoolss_AddPrinterDriverEx);
 	if (r == NULL) {
@@ -7052,7 +7052,7 @@ static bool api_spoolss_5a(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_5a *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_5A];
+	call = &p->interface->calls[NDR_SPOOLSS_5A];
 
 	r = talloc(talloc_tos(), struct spoolss_5a);
 	if (r == NULL) {
@@ -7125,7 +7125,7 @@ static bool api_spoolss_5b(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_5b *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_5B];
+	call = &p->interface->calls[NDR_SPOOLSS_5B];
 
 	r = talloc(talloc_tos(), struct spoolss_5b);
 	if (r == NULL) {
@@ -7198,7 +7198,7 @@ static bool api_spoolss_5c(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_5c *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_5C];
+	call = &p->interface->calls[NDR_SPOOLSS_5C];
 
 	r = talloc(talloc_tos(), struct spoolss_5c);
 	if (r == NULL) {
@@ -7271,7 +7271,7 @@ static bool api_spoolss_5d(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_5d *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_5D];
+	call = &p->interface->calls[NDR_SPOOLSS_5D];
 
 	r = talloc(talloc_tos(), struct spoolss_5d);
 	if (r == NULL) {
@@ -7344,7 +7344,7 @@ static bool api_spoolss_5e(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_5e *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_5E];
+	call = &p->interface->calls[NDR_SPOOLSS_5E];
 
 	r = talloc(talloc_tos(), struct spoolss_5e);
 	if (r == NULL) {
@@ -7417,7 +7417,7 @@ static bool api_spoolss_5f(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_5f *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_5F];
+	call = &p->interface->calls[NDR_SPOOLSS_5F];
 
 	r = talloc(talloc_tos(), struct spoolss_5f);
 	if (r == NULL) {
@@ -7490,7 +7490,7 @@ static bool api_spoolss_60(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_60 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_60];
+	call = &p->interface->calls[NDR_SPOOLSS_60];
 
 	r = talloc(talloc_tos(), struct spoolss_60);
 	if (r == NULL) {
@@ -7563,7 +7563,7 @@ static bool api_spoolss_61(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_61 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_61];
+	call = &p->interface->calls[NDR_SPOOLSS_61];
 
 	r = talloc(talloc_tos(), struct spoolss_61);
 	if (r == NULL) {
@@ -7636,7 +7636,7 @@ static bool api_spoolss_62(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_62 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_62];
+	call = &p->interface->calls[NDR_SPOOLSS_62];
 
 	r = talloc(talloc_tos(), struct spoolss_62);
 	if (r == NULL) {
@@ -7709,7 +7709,7 @@ static bool api_spoolss_63(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_63 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_63];
+	call = &p->interface->calls[NDR_SPOOLSS_63];
 
 	r = talloc(talloc_tos(), struct spoolss_63);
 	if (r == NULL) {
@@ -7782,7 +7782,7 @@ static bool api_spoolss_64(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_64 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_64];
+	call = &p->interface->calls[NDR_SPOOLSS_64];
 
 	r = talloc(talloc_tos(), struct spoolss_64);
 	if (r == NULL) {
@@ -7855,7 +7855,7 @@ static bool api_spoolss_65(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_65 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_65];
+	call = &p->interface->calls[NDR_SPOOLSS_65];
 
 	r = talloc(talloc_tos(), struct spoolss_65);
 	if (r == NULL) {
@@ -7928,7 +7928,7 @@ static bool api_spoolss_GetCorePrinterDrivers(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetCorePrinterDrivers *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETCOREPRINTERDRIVERS];
+	call = &p->interface->calls[NDR_SPOOLSS_GETCOREPRINTERDRIVERS];
 
 	r = talloc(talloc_tos(), struct spoolss_GetCorePrinterDrivers);
 	if (r == NULL) {
@@ -8008,7 +8008,7 @@ static bool api_spoolss_67(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_67 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_67];
+	call = &p->interface->calls[NDR_SPOOLSS_67];
 
 	r = talloc(talloc_tos(), struct spoolss_67);
 	if (r == NULL) {
@@ -8081,7 +8081,7 @@ static bool api_spoolss_GetPrinterDriverPackagePath(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_GetPrinterDriverPackagePath *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_GETPRINTERDRIVERPACKAGEPATH];
+	call = &p->interface->calls[NDR_SPOOLSS_GETPRINTERDRIVERPACKAGEPATH];
 
 	r = talloc(talloc_tos(), struct spoolss_GetPrinterDriverPackagePath);
 	if (r == NULL) {
@@ -8162,7 +8162,7 @@ static bool api_spoolss_69(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_69 *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_69];
+	call = &p->interface->calls[NDR_SPOOLSS_69];
 
 	r = talloc(talloc_tos(), struct spoolss_69);
 	if (r == NULL) {
@@ -8235,7 +8235,7 @@ static bool api_spoolss_6a(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_6a *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_6A];
+	call = &p->interface->calls[NDR_SPOOLSS_6A];
 
 	r = talloc(talloc_tos(), struct spoolss_6a);
 	if (r == NULL) {
@@ -8308,7 +8308,7 @@ static bool api_spoolss_6b(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_6b *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_6B];
+	call = &p->interface->calls[NDR_SPOOLSS_6B];
 
 	r = talloc(talloc_tos(), struct spoolss_6b);
 	if (r == NULL) {
@@ -8381,7 +8381,7 @@ static bool api_spoolss_6c(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_6c *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_6C];
+	call = &p->interface->calls[NDR_SPOOLSS_6C];
 
 	r = talloc(talloc_tos(), struct spoolss_6c);
 	if (r == NULL) {
@@ -8454,7 +8454,7 @@ static bool api_spoolss_6d(pipes_struct *p)
 	DATA_BLOB blob;
 	struct spoolss_6d *r;
 
-	call = &ndr_table_spoolss.calls[NDR_SPOOLSS_6D];
+	call = &p->interface->calls[NDR_SPOOLSS_6D];
 
 	r = talloc(talloc_tos(), struct spoolss_6d);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_srvsvc.c b/librpc/gen_ndr/srv_srvsvc.c
index 176a9ce46df..f84bfd934bf 100644
--- a/librpc/gen_ndr/srv_srvsvc.c
+++ b/librpc/gen_ndr/srv_srvsvc.c
@@ -15,7 +15,7 @@ static bool api_srvsvc_NetCharDevEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevEnum);
 	if (r == NULL) {
@@ -97,7 +97,7 @@ static bool api_srvsvc_NetCharDevGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevGetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVGETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVGETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevGetInfo);
 	if (r == NULL) {
@@ -177,7 +177,7 @@ static bool api_srvsvc_NetCharDevControl(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevControl *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVCONTROL];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVCONTROL];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevControl);
 	if (r == NULL) {
@@ -250,7 +250,7 @@ static bool api_srvsvc_NetCharDevQEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevQEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVQENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQEnum);
 	if (r == NULL) {
@@ -332,7 +332,7 @@ static bool api_srvsvc_NetCharDevQGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevQGetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQGETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVQGETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQGetInfo);
 	if (r == NULL) {
@@ -412,7 +412,7 @@ static bool api_srvsvc_NetCharDevQSetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevQSetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQSETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVQSETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQSetInfo);
 	if (r == NULL) {
@@ -487,7 +487,7 @@ static bool api_srvsvc_NetCharDevQPurge(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevQPurge *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQPURGE];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVQPURGE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQPurge);
 	if (r == NULL) {
@@ -560,7 +560,7 @@ static bool api_srvsvc_NetCharDevQPurgeSelf(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetCharDevQPurgeSelf *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCHARDEVQPURGESELF];
+	call = &p->interface->calls[NDR_SRVSVC_NETCHARDEVQPURGESELF];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetCharDevQPurgeSelf);
 	if (r == NULL) {
@@ -633,7 +633,7 @@ static bool api_srvsvc_NetConnEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetConnEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETCONNENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETCONNENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetConnEnum);
 	if (r == NULL) {
@@ -715,7 +715,7 @@ static bool api_srvsvc_NetFileEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetFileEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETFILEENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETFILEENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetFileEnum);
 	if (r == NULL) {
@@ -797,7 +797,7 @@ static bool api_srvsvc_NetFileGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetFileGetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETFILEGETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETFILEGETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetFileGetInfo);
 	if (r == NULL) {
@@ -877,7 +877,7 @@ static bool api_srvsvc_NetFileClose(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetFileClose *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETFILECLOSE];
+	call = &p->interface->calls[NDR_SRVSVC_NETFILECLOSE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetFileClose);
 	if (r == NULL) {
@@ -950,7 +950,7 @@ static bool api_srvsvc_NetSessEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetSessEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSESSENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETSESSENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetSessEnum);
 	if (r == NULL) {
@@ -1032,7 +1032,7 @@ static bool api_srvsvc_NetSessDel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetSessDel *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSESSDEL];
+	call = &p->interface->calls[NDR_SRVSVC_NETSESSDEL];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetSessDel);
 	if (r == NULL) {
@@ -1105,7 +1105,7 @@ static bool api_srvsvc_NetShareAdd(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareAdd *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREADD];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREADD];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareAdd);
 	if (r == NULL) {
@@ -1180,7 +1180,7 @@ static bool api_srvsvc_NetShareEnumAll(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareEnumAll *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREENUMALL];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREENUMALL];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareEnumAll);
 	if (r == NULL) {
@@ -1262,7 +1262,7 @@ static bool api_srvsvc_NetShareGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareGetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREGETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREGETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareGetInfo);
 	if (r == NULL) {
@@ -1342,7 +1342,7 @@ static bool api_srvsvc_NetShareSetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareSetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHARESETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHARESETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareSetInfo);
 	if (r == NULL) {
@@ -1417,7 +1417,7 @@ static bool api_srvsvc_NetShareDel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareDel *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDEL];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREDEL];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareDel);
 	if (r == NULL) {
@@ -1490,7 +1490,7 @@ static bool api_srvsvc_NetShareDelSticky(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareDelSticky *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDELSTICKY];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREDELSTICKY];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareDelSticky);
 	if (r == NULL) {
@@ -1563,7 +1563,7 @@ static bool api_srvsvc_NetShareCheck(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareCheck *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHARECHECK];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHARECHECK];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareCheck);
 	if (r == NULL) {
@@ -1643,7 +1643,7 @@ static bool api_srvsvc_NetSrvGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetSrvGetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSRVGETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETSRVGETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetSrvGetInfo);
 	if (r == NULL) {
@@ -1723,7 +1723,7 @@ static bool api_srvsvc_NetSrvSetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetSrvSetInfo *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSRVSETINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETSRVSETINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetSrvSetInfo);
 	if (r == NULL) {
@@ -1798,7 +1798,7 @@ static bool api_srvsvc_NetDiskEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetDiskEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETDISKENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETDISKENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetDiskEnum);
 	if (r == NULL) {
@@ -1880,7 +1880,7 @@ static bool api_srvsvc_NetServerStatisticsGet(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetServerStatisticsGet *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSERVERSTATISTICSGET];
+	call = &p->interface->calls[NDR_SRVSVC_NETSERVERSTATISTICSGET];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetServerStatisticsGet);
 	if (r == NULL) {
@@ -1960,7 +1960,7 @@ static bool api_srvsvc_NetTransportAdd(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetTransportAdd *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETTRANSPORTADD];
+	call = &p->interface->calls[NDR_SRVSVC_NETTRANSPORTADD];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetTransportAdd);
 	if (r == NULL) {
@@ -2033,7 +2033,7 @@ static bool api_srvsvc_NetTransportEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetTransportEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETTRANSPORTENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETTRANSPORTENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetTransportEnum);
 	if (r == NULL) {
@@ -2115,7 +2115,7 @@ static bool api_srvsvc_NetTransportDel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetTransportDel *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETTRANSPORTDEL];
+	call = &p->interface->calls[NDR_SRVSVC_NETTRANSPORTDEL];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetTransportDel);
 	if (r == NULL) {
@@ -2188,7 +2188,7 @@ static bool api_srvsvc_NetRemoteTOD(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetRemoteTOD *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETREMOTETOD];
+	call = &p->interface->calls[NDR_SRVSVC_NETREMOTETOD];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetRemoteTOD);
 	if (r == NULL) {
@@ -2268,7 +2268,7 @@ static bool api_srvsvc_NetSetServiceBits(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetSetServiceBits *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSETSERVICEBITS];
+	call = &p->interface->calls[NDR_SRVSVC_NETSETSERVICEBITS];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetSetServiceBits);
 	if (r == NULL) {
@@ -2341,7 +2341,7 @@ static bool api_srvsvc_NetPathType(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetPathType *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPATHTYPE];
+	call = &p->interface->calls[NDR_SRVSVC_NETPATHTYPE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetPathType);
 	if (r == NULL) {
@@ -2421,7 +2421,7 @@ static bool api_srvsvc_NetPathCanonicalize(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetPathCanonicalize *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPATHCANONICALIZE];
+	call = &p->interface->calls[NDR_SRVSVC_NETPATHCANONICALIZE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetPathCanonicalize);
 	if (r == NULL) {
@@ -2502,7 +2502,7 @@ static bool api_srvsvc_NetPathCompare(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetPathCompare *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPATHCOMPARE];
+	call = &p->interface->calls[NDR_SRVSVC_NETPATHCOMPARE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetPathCompare);
 	if (r == NULL) {
@@ -2575,7 +2575,7 @@ static bool api_srvsvc_NetNameValidate(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetNameValidate *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETNAMEVALIDATE];
+	call = &p->interface->calls[NDR_SRVSVC_NETNAMEVALIDATE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetNameValidate);
 	if (r == NULL) {
@@ -2648,7 +2648,7 @@ static bool api_srvsvc_NETRPRNAMECANONICALIZE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRPRNAMECANONICALIZE *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRPRNAMECANONICALIZE];
+	call = &p->interface->calls[NDR_SRVSVC_NETRPRNAMECANONICALIZE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRPRNAMECANONICALIZE);
 	if (r == NULL) {
@@ -2721,7 +2721,7 @@ static bool api_srvsvc_NetPRNameCompare(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetPRNameCompare *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETPRNAMECOMPARE];
+	call = &p->interface->calls[NDR_SRVSVC_NETPRNAMECOMPARE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetPRNameCompare);
 	if (r == NULL) {
@@ -2794,7 +2794,7 @@ static bool api_srvsvc_NetShareEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareEnum *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREENUM];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREENUM];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareEnum);
 	if (r == NULL) {
@@ -2876,7 +2876,7 @@ static bool api_srvsvc_NetShareDelStart(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareDelStart *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDELSTART];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREDELSTART];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareDelStart);
 	if (r == NULL) {
@@ -2956,7 +2956,7 @@ static bool api_srvsvc_NetShareDelCommit(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetShareDelCommit *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSHAREDELCOMMIT];
+	call = &p->interface->calls[NDR_SRVSVC_NETSHAREDELCOMMIT];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetShareDelCommit);
 	if (r == NULL) {
@@ -3031,7 +3031,7 @@ static bool api_srvsvc_NetGetFileSecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetGetFileSecurity *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETGETFILESECURITY];
+	call = &p->interface->calls[NDR_SRVSVC_NETGETFILESECURITY];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetGetFileSecurity);
 	if (r == NULL) {
@@ -3111,7 +3111,7 @@ static bool api_srvsvc_NetSetFileSecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetSetFileSecurity *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSETFILESECURITY];
+	call = &p->interface->calls[NDR_SRVSVC_NETSETFILESECURITY];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetSetFileSecurity);
 	if (r == NULL) {
@@ -3184,7 +3184,7 @@ static bool api_srvsvc_NetServerTransportAddEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetServerTransportAddEx *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSERVERTRANSPORTADDEX];
+	call = &p->interface->calls[NDR_SRVSVC_NETSERVERTRANSPORTADDEX];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetServerTransportAddEx);
 	if (r == NULL) {
@@ -3257,7 +3257,7 @@ static bool api_srvsvc_NetServerSetServiceBitsEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NetServerSetServiceBitsEx *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETSERVERSETSERVICEBITSEX];
+	call = &p->interface->calls[NDR_SRVSVC_NETSERVERSETSERVICEBITSEX];
 
 	r = talloc(talloc_tos(), struct srvsvc_NetServerSetServiceBitsEx);
 	if (r == NULL) {
@@ -3330,7 +3330,7 @@ static bool api_srvsvc_NETRDFSGETVERSION(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSGETVERSION *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSGETVERSION];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSGETVERSION];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSGETVERSION);
 	if (r == NULL) {
@@ -3403,7 +3403,7 @@ static bool api_srvsvc_NETRDFSCREATELOCALPARTITION(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSCREATELOCALPARTITION *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSCREATELOCALPARTITION];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSCREATELOCALPARTITION];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSCREATELOCALPARTITION);
 	if (r == NULL) {
@@ -3476,7 +3476,7 @@ static bool api_srvsvc_NETRDFSDELETELOCALPARTITION(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSDELETELOCALPARTITION *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSDELETELOCALPARTITION];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSDELETELOCALPARTITION];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSDELETELOCALPARTITION);
 	if (r == NULL) {
@@ -3549,7 +3549,7 @@ static bool api_srvsvc_NETRDFSSETLOCALVOLUMESTATE(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSSETLOCALVOLUMESTATE);
 	if (r == NULL) {
@@ -3622,7 +3622,7 @@ static bool api_srvsvc_NETRDFSSETSERVERINFO(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSSETSERVERINFO *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSSETSERVERINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSSETSERVERINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSSETSERVERINFO);
 	if (r == NULL) {
@@ -3695,7 +3695,7 @@ static bool api_srvsvc_NETRDFSCREATEEXITPOINT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSCREATEEXITPOINT *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSCREATEEXITPOINT];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSCREATEEXITPOINT];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSCREATEEXITPOINT);
 	if (r == NULL) {
@@ -3768,7 +3768,7 @@ static bool api_srvsvc_NETRDFSDELETEEXITPOINT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSDELETEEXITPOINT *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSDELETEEXITPOINT];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSDELETEEXITPOINT];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSDELETEEXITPOINT);
 	if (r == NULL) {
@@ -3841,7 +3841,7 @@ static bool api_srvsvc_NETRDFSMODIFYPREFIX(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSMODIFYPREFIX *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSMODIFYPREFIX];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSMODIFYPREFIX];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSMODIFYPREFIX);
 	if (r == NULL) {
@@ -3914,7 +3914,7 @@ static bool api_srvsvc_NETRDFSFIXLOCALVOLUME(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSFIXLOCALVOLUME *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSFIXLOCALVOLUME];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSFIXLOCALVOLUME];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSFIXLOCALVOLUME);
 	if (r == NULL) {
@@ -3987,7 +3987,7 @@ static bool api_srvsvc_NETRDFSMANAGERREPORTSITEINFO(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO];
+	call = &p->interface->calls[NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRDFSMANAGERREPORTSITEINFO);
 	if (r == NULL) {
@@ -4060,7 +4060,7 @@ static bool api_srvsvc_NETRSERVERTRANSPORTDELEX(pipes_struct *p)
 	DATA_BLOB blob;
 	struct srvsvc_NETRSERVERTRANSPORTDELEX *r;
 
-	call = &ndr_table_srvsvc.calls[NDR_SRVSVC_NETRSERVERTRANSPORTDELEX];
+	call = &p->interface->calls[NDR_SRVSVC_NETRSERVERTRANSPORTDELEX];
 
 	r = talloc(talloc_tos(), struct srvsvc_NETRSERVERTRANSPORTDELEX);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_svcctl.c b/librpc/gen_ndr/srv_svcctl.c
index 227bcd3dc6e..8424a623548 100644
--- a/librpc/gen_ndr/srv_svcctl.c
+++ b/librpc/gen_ndr/srv_svcctl.c
@@ -15,7 +15,7 @@ static bool api_svcctl_CloseServiceHandle(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_CloseServiceHandle *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CLOSESERVICEHANDLE];
+	call = &p->interface->calls[NDR_SVCCTL_CLOSESERVICEHANDLE];
 
 	r = talloc(talloc_tos(), struct svcctl_CloseServiceHandle);
 	if (r == NULL) {
@@ -90,7 +90,7 @@ static bool api_svcctl_ControlService(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_ControlService *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CONTROLSERVICE];
+	call = &p->interface->calls[NDR_SVCCTL_CONTROLSERVICE];
 
 	r = talloc(talloc_tos(), struct svcctl_ControlService);
 	if (r == NULL) {
@@ -170,7 +170,7 @@ static bool api_svcctl_DeleteService(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_DeleteService *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_DELETESERVICE];
+	call = &p->interface->calls[NDR_SVCCTL_DELETESERVICE];
 
 	r = talloc(talloc_tos(), struct svcctl_DeleteService);
 	if (r == NULL) {
@@ -243,7 +243,7 @@ static bool api_svcctl_LockServiceDatabase(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_LockServiceDatabase *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_LOCKSERVICEDATABASE];
+	call = &p->interface->calls[NDR_SVCCTL_LOCKSERVICEDATABASE];
 
 	r = talloc(talloc_tos(), struct svcctl_LockServiceDatabase);
 	if (r == NULL) {
@@ -323,7 +323,7 @@ static bool api_svcctl_QueryServiceObjectSecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceObjectSecurity *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceObjectSecurity);
 	if (r == NULL) {
@@ -409,7 +409,7 @@ static bool api_svcctl_SetServiceObjectSecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_SetServiceObjectSecurity *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SETSERVICEOBJECTSECURITY];
+	call = &p->interface->calls[NDR_SVCCTL_SETSERVICEOBJECTSECURITY];
 
 	r = talloc(talloc_tos(), struct svcctl_SetServiceObjectSecurity);
 	if (r == NULL) {
@@ -482,7 +482,7 @@ static bool api_svcctl_QueryServiceStatus(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceStatus *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICESTATUS];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICESTATUS];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceStatus);
 	if (r == NULL) {
@@ -562,7 +562,7 @@ static bool api_svcctl_SetServiceStatus(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_SetServiceStatus *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SETSERVICESTATUS];
+	call = &p->interface->calls[NDR_SVCCTL_SETSERVICESTATUS];
 
 	r = talloc(talloc_tos(), struct svcctl_SetServiceStatus);
 	if (r == NULL) {
@@ -635,7 +635,7 @@ static bool api_svcctl_UnlockServiceDatabase(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_UnlockServiceDatabase *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_UNLOCKSERVICEDATABASE];
+	call = &p->interface->calls[NDR_SVCCTL_UNLOCKSERVICEDATABASE];
 
 	r = talloc(talloc_tos(), struct svcctl_UnlockServiceDatabase);
 	if (r == NULL) {
@@ -710,7 +710,7 @@ static bool api_svcctl_NotifyBootConfigStatus(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_NotifyBootConfigStatus *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS];
+	call = &p->interface->calls[NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS];
 
 	r = talloc(talloc_tos(), struct svcctl_NotifyBootConfigStatus);
 	if (r == NULL) {
@@ -783,7 +783,7 @@ static bool api_svcctl_SCSetServiceBitsW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_SCSetServiceBitsW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SCSETSERVICEBITSW];
+	call = &p->interface->calls[NDR_SVCCTL_SCSETSERVICEBITSW];
 
 	r = talloc(talloc_tos(), struct svcctl_SCSetServiceBitsW);
 	if (r == NULL) {
@@ -856,7 +856,7 @@ static bool api_svcctl_ChangeServiceConfigW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_ChangeServiceConfigW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIGW];
+	call = &p->interface->calls[NDR_SVCCTL_CHANGESERVICECONFIGW];
 
 	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfigW);
 	if (r == NULL) {
@@ -936,7 +936,7 @@ static bool api_svcctl_CreateServiceW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_CreateServiceW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CREATESERVICEW];
+	call = &p->interface->calls[NDR_SVCCTL_CREATESERVICEW];
 
 	r = talloc(talloc_tos(), struct svcctl_CreateServiceW);
 	if (r == NULL) {
@@ -1017,7 +1017,7 @@ static bool api_svcctl_EnumDependentServicesW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_EnumDependentServicesW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMDEPENDENTSERVICESW];
+	call = &p->interface->calls[NDR_SVCCTL_ENUMDEPENDENTSERVICESW];
 
 	r = talloc(talloc_tos(), struct svcctl_EnumDependentServicesW);
 	if (r == NULL) {
@@ -1109,7 +1109,7 @@ static bool api_svcctl_EnumServicesStatusW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_EnumServicesStatusW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMSERVICESSTATUSW];
+	call = &p->interface->calls[NDR_SVCCTL_ENUMSERVICESSTATUSW];
 
 	r = talloc(talloc_tos(), struct svcctl_EnumServicesStatusW);
 	if (r == NULL) {
@@ -1202,7 +1202,7 @@ static bool api_svcctl_OpenSCManagerW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_OpenSCManagerW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSCMANAGERW];
+	call = &p->interface->calls[NDR_SVCCTL_OPENSCMANAGERW];
 
 	r = talloc(talloc_tos(), struct svcctl_OpenSCManagerW);
 	if (r == NULL) {
@@ -1282,7 +1282,7 @@ static bool api_svcctl_OpenServiceW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_OpenServiceW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSERVICEW];
+	call = &p->interface->calls[NDR_SVCCTL_OPENSERVICEW];
 
 	r = talloc(talloc_tos(), struct svcctl_OpenServiceW);
 	if (r == NULL) {
@@ -1362,7 +1362,7 @@ static bool api_svcctl_QueryServiceConfigW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceConfigW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIGW];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICECONFIGW];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfigW);
 	if (r == NULL) {
@@ -1448,7 +1448,7 @@ static bool api_svcctl_QueryServiceLockStatusW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceLockStatusW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICELOCKSTATUSW];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICELOCKSTATUSW];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceLockStatusW);
 	if (r == NULL) {
@@ -1534,7 +1534,7 @@ static bool api_svcctl_StartServiceW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_StartServiceW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_STARTSERVICEW];
+	call = &p->interface->calls[NDR_SVCCTL_STARTSERVICEW];
 
 	r = talloc(talloc_tos(), struct svcctl_StartServiceW);
 	if (r == NULL) {
@@ -1607,7 +1607,7 @@ static bool api_svcctl_GetServiceDisplayNameW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_GetServiceDisplayNameW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEDISPLAYNAMEW];
+	call = &p->interface->calls[NDR_SVCCTL_GETSERVICEDISPLAYNAMEW];
 
 	r = talloc(talloc_tos(), struct svcctl_GetServiceDisplayNameW);
 	if (r == NULL) {
@@ -1688,7 +1688,7 @@ static bool api_svcctl_GetServiceKeyNameW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_GetServiceKeyNameW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEKEYNAMEW];
+	call = &p->interface->calls[NDR_SVCCTL_GETSERVICEKEYNAMEW];
 
 	r = talloc(talloc_tos(), struct svcctl_GetServiceKeyNameW);
 	if (r == NULL) {
@@ -1769,7 +1769,7 @@ static bool api_svcctl_SCSetServiceBitsA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_SCSetServiceBitsA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SCSETSERVICEBITSA];
+	call = &p->interface->calls[NDR_SVCCTL_SCSETSERVICEBITSA];
 
 	r = talloc(talloc_tos(), struct svcctl_SCSetServiceBitsA);
 	if (r == NULL) {
@@ -1842,7 +1842,7 @@ static bool api_svcctl_ChangeServiceConfigA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_ChangeServiceConfigA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIGA];
+	call = &p->interface->calls[NDR_SVCCTL_CHANGESERVICECONFIGA];
 
 	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfigA);
 	if (r == NULL) {
@@ -1922,7 +1922,7 @@ static bool api_svcctl_CreateServiceA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_CreateServiceA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CREATESERVICEA];
+	call = &p->interface->calls[NDR_SVCCTL_CREATESERVICEA];
 
 	r = talloc(talloc_tos(), struct svcctl_CreateServiceA);
 	if (r == NULL) {
@@ -2002,7 +2002,7 @@ static bool api_svcctl_EnumDependentServicesA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_EnumDependentServicesA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMDEPENDENTSERVICESA];
+	call = &p->interface->calls[NDR_SVCCTL_ENUMDEPENDENTSERVICESA];
 
 	r = talloc(talloc_tos(), struct svcctl_EnumDependentServicesA);
 	if (r == NULL) {
@@ -2094,7 +2094,7 @@ static bool api_svcctl_EnumServicesStatusA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_EnumServicesStatusA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMSERVICESSTATUSA];
+	call = &p->interface->calls[NDR_SVCCTL_ENUMSERVICESSTATUSA];
 
 	r = talloc(talloc_tos(), struct svcctl_EnumServicesStatusA);
 	if (r == NULL) {
@@ -2187,7 +2187,7 @@ static bool api_svcctl_OpenSCManagerA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_OpenSCManagerA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSCMANAGERA];
+	call = &p->interface->calls[NDR_SVCCTL_OPENSCMANAGERA];
 
 	r = talloc(talloc_tos(), struct svcctl_OpenSCManagerA);
 	if (r == NULL) {
@@ -2267,7 +2267,7 @@ static bool api_svcctl_OpenServiceA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_OpenServiceA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_OPENSERVICEA];
+	call = &p->interface->calls[NDR_SVCCTL_OPENSERVICEA];
 
 	r = talloc(talloc_tos(), struct svcctl_OpenServiceA);
 	if (r == NULL) {
@@ -2340,7 +2340,7 @@ static bool api_svcctl_QueryServiceConfigA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceConfigA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIGA];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICECONFIGA];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfigA);
 	if (r == NULL) {
@@ -2426,7 +2426,7 @@ static bool api_svcctl_QueryServiceLockStatusA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceLockStatusA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICELOCKSTATUSA];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICELOCKSTATUSA];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceLockStatusA);
 	if (r == NULL) {
@@ -2512,7 +2512,7 @@ static bool api_svcctl_StartServiceA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_StartServiceA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_STARTSERVICEA];
+	call = &p->interface->calls[NDR_SVCCTL_STARTSERVICEA];
 
 	r = talloc(talloc_tos(), struct svcctl_StartServiceA);
 	if (r == NULL) {
@@ -2585,7 +2585,7 @@ static bool api_svcctl_GetServiceDisplayNameA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_GetServiceDisplayNameA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEDISPLAYNAMEA];
+	call = &p->interface->calls[NDR_SVCCTL_GETSERVICEDISPLAYNAMEA];
 
 	r = talloc(talloc_tos(), struct svcctl_GetServiceDisplayNameA);
 	if (r == NULL) {
@@ -2666,7 +2666,7 @@ static bool api_svcctl_GetServiceKeyNameA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_GetServiceKeyNameA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETSERVICEKEYNAMEA];
+	call = &p->interface->calls[NDR_SVCCTL_GETSERVICEKEYNAMEA];
 
 	r = talloc(talloc_tos(), struct svcctl_GetServiceKeyNameA);
 	if (r == NULL) {
@@ -2747,7 +2747,7 @@ static bool api_svcctl_GetCurrentGroupeStateW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_GetCurrentGroupeStateW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_GETCURRENTGROUPESTATEW];
+	call = &p->interface->calls[NDR_SVCCTL_GETCURRENTGROUPESTATEW];
 
 	r = talloc(talloc_tos(), struct svcctl_GetCurrentGroupeStateW);
 	if (r == NULL) {
@@ -2820,7 +2820,7 @@ static bool api_svcctl_EnumServiceGroupW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_EnumServiceGroupW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_ENUMSERVICEGROUPW];
+	call = &p->interface->calls[NDR_SVCCTL_ENUMSERVICEGROUPW];
 
 	r = talloc(talloc_tos(), struct svcctl_EnumServiceGroupW);
 	if (r == NULL) {
@@ -2893,7 +2893,7 @@ static bool api_svcctl_ChangeServiceConfig2A(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_ChangeServiceConfig2A *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIG2A];
+	call = &p->interface->calls[NDR_SVCCTL_CHANGESERVICECONFIG2A];
 
 	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfig2A);
 	if (r == NULL) {
@@ -2966,7 +2966,7 @@ static bool api_svcctl_ChangeServiceConfig2W(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_ChangeServiceConfig2W *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_CHANGESERVICECONFIG2W];
+	call = &p->interface->calls[NDR_SVCCTL_CHANGESERVICECONFIG2W];
 
 	r = talloc(talloc_tos(), struct svcctl_ChangeServiceConfig2W);
 	if (r == NULL) {
@@ -3039,7 +3039,7 @@ static bool api_svcctl_QueryServiceConfig2A(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceConfig2A *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIG2A];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICECONFIG2A];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfig2A);
 	if (r == NULL) {
@@ -3125,7 +3125,7 @@ static bool api_svcctl_QueryServiceConfig2W(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceConfig2W *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICECONFIG2W];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICECONFIG2W];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceConfig2W);
 	if (r == NULL) {
@@ -3211,7 +3211,7 @@ static bool api_svcctl_QueryServiceStatusEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_QueryServiceStatusEx *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_QUERYSERVICESTATUSEX];
+	call = &p->interface->calls[NDR_SVCCTL_QUERYSERVICESTATUSEX];
 
 	r = talloc(talloc_tos(), struct svcctl_QueryServiceStatusEx);
 	if (r == NULL) {
@@ -3297,7 +3297,7 @@ static bool api_EnumServicesStatusExA(pipes_struct *p)
 	DATA_BLOB blob;
 	struct EnumServicesStatusExA *r;
 
-	call = &ndr_table_svcctl.calls[NDR_ENUMSERVICESSTATUSEXA];
+	call = &p->interface->calls[NDR_ENUMSERVICESSTATUSEXA];
 
 	r = talloc(talloc_tos(), struct EnumServicesStatusExA);
 	if (r == NULL) {
@@ -3396,7 +3396,7 @@ static bool api_EnumServicesStatusExW(pipes_struct *p)
 	DATA_BLOB blob;
 	struct EnumServicesStatusExW *r;
 
-	call = &ndr_table_svcctl.calls[NDR_ENUMSERVICESSTATUSEXW];
+	call = &p->interface->calls[NDR_ENUMSERVICESSTATUSEXW];
 
 	r = talloc(talloc_tos(), struct EnumServicesStatusExW);
 	if (r == NULL) {
@@ -3489,7 +3489,7 @@ static bool api_svcctl_SCSendTSMessage(pipes_struct *p)
 	DATA_BLOB blob;
 	struct svcctl_SCSendTSMessage *r;
 
-	call = &ndr_table_svcctl.calls[NDR_SVCCTL_SCSENDTSMESSAGE];
+	call = &p->interface->calls[NDR_SVCCTL_SCSENDTSMESSAGE];
 
 	r = talloc(talloc_tos(), struct svcctl_SCSendTSMessage);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_winreg.c b/librpc/gen_ndr/srv_winreg.c
index 95e06e16681..c4577322980 100644
--- a/librpc/gen_ndr/srv_winreg.c
+++ b/librpc/gen_ndr/srv_winreg.c
@@ -15,7 +15,7 @@ static bool api_winreg_OpenHKCR(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKCR *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKCR];
+	call = &p->interface->calls[NDR_WINREG_OPENHKCR];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKCR);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_winreg_OpenHKCU(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKCU *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKCU];
+	call = &p->interface->calls[NDR_WINREG_OPENHKCU];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKCU);
 	if (r == NULL) {
@@ -175,7 +175,7 @@ static bool api_winreg_OpenHKLM(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKLM *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKLM];
+	call = &p->interface->calls[NDR_WINREG_OPENHKLM];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKLM);
 	if (r == NULL) {
@@ -255,7 +255,7 @@ static bool api_winreg_OpenHKPD(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKPD *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKPD];
+	call = &p->interface->calls[NDR_WINREG_OPENHKPD];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKPD);
 	if (r == NULL) {
@@ -335,7 +335,7 @@ static bool api_winreg_OpenHKU(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKU *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKU];
+	call = &p->interface->calls[NDR_WINREG_OPENHKU];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKU);
 	if (r == NULL) {
@@ -415,7 +415,7 @@ static bool api_winreg_CloseKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_CloseKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_CLOSEKEY];
+	call = &p->interface->calls[NDR_WINREG_CLOSEKEY];
 
 	r = talloc(talloc_tos(), struct winreg_CloseKey);
 	if (r == NULL) {
@@ -490,7 +490,7 @@ static bool api_winreg_CreateKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_CreateKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_CREATEKEY];
+	call = &p->interface->calls[NDR_WINREG_CREATEKEY];
 
 	r = talloc(talloc_tos(), struct winreg_CreateKey);
 	if (r == NULL) {
@@ -571,7 +571,7 @@ static bool api_winreg_DeleteKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_DeleteKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_DELETEKEY];
+	call = &p->interface->calls[NDR_WINREG_DELETEKEY];
 
 	r = talloc(talloc_tos(), struct winreg_DeleteKey);
 	if (r == NULL) {
@@ -644,7 +644,7 @@ static bool api_winreg_DeleteValue(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_DeleteValue *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_DELETEVALUE];
+	call = &p->interface->calls[NDR_WINREG_DELETEVALUE];
 
 	r = talloc(talloc_tos(), struct winreg_DeleteValue);
 	if (r == NULL) {
@@ -717,7 +717,7 @@ static bool api_winreg_EnumKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_EnumKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_ENUMKEY];
+	call = &p->interface->calls[NDR_WINREG_ENUMKEY];
 
 	r = talloc(talloc_tos(), struct winreg_EnumKey);
 	if (r == NULL) {
@@ -794,7 +794,7 @@ static bool api_winreg_EnumValue(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_EnumValue *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_ENUMVALUE];
+	call = &p->interface->calls[NDR_WINREG_ENUMVALUE];
 
 	r = talloc(talloc_tos(), struct winreg_EnumValue);
 	if (r == NULL) {
@@ -873,7 +873,7 @@ static bool api_winreg_FlushKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_FlushKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_FLUSHKEY];
+	call = &p->interface->calls[NDR_WINREG_FLUSHKEY];
 
 	r = talloc(talloc_tos(), struct winreg_FlushKey);
 	if (r == NULL) {
@@ -946,7 +946,7 @@ static bool api_winreg_GetKeySecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_GetKeySecurity *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_GETKEYSECURITY];
+	call = &p->interface->calls[NDR_WINREG_GETKEYSECURITY];
 
 	r = talloc(talloc_tos(), struct winreg_GetKeySecurity);
 	if (r == NULL) {
@@ -1021,7 +1021,7 @@ static bool api_winreg_LoadKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_LoadKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_LOADKEY];
+	call = &p->interface->calls[NDR_WINREG_LOADKEY];
 
 	r = talloc(talloc_tos(), struct winreg_LoadKey);
 	if (r == NULL) {
@@ -1094,7 +1094,7 @@ static bool api_winreg_NotifyChangeKeyValue(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_NotifyChangeKeyValue *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_NOTIFYCHANGEKEYVALUE];
+	call = &p->interface->calls[NDR_WINREG_NOTIFYCHANGEKEYVALUE];
 
 	r = talloc(talloc_tos(), struct winreg_NotifyChangeKeyValue);
 	if (r == NULL) {
@@ -1167,7 +1167,7 @@ static bool api_winreg_OpenKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENKEY];
+	call = &p->interface->calls[NDR_WINREG_OPENKEY];
 
 	r = talloc(talloc_tos(), struct winreg_OpenKey);
 	if (r == NULL) {
@@ -1247,7 +1247,7 @@ static bool api_winreg_QueryInfoKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_QueryInfoKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYINFOKEY];
+	call = &p->interface->calls[NDR_WINREG_QUERYINFOKEY];
 
 	r = talloc(talloc_tos(), struct winreg_QueryInfoKey);
 	if (r == NULL) {
@@ -1370,7 +1370,7 @@ static bool api_winreg_QueryValue(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_QueryValue *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYVALUE];
+	call = &p->interface->calls[NDR_WINREG_QUERYVALUE];
 
 	r = talloc(talloc_tos(), struct winreg_QueryValue);
 	if (r == NULL) {
@@ -1448,7 +1448,7 @@ static bool api_winreg_ReplaceKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_ReplaceKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_REPLACEKEY];
+	call = &p->interface->calls[NDR_WINREG_REPLACEKEY];
 
 	r = talloc(talloc_tos(), struct winreg_ReplaceKey);
 	if (r == NULL) {
@@ -1521,7 +1521,7 @@ static bool api_winreg_RestoreKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_RestoreKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_RESTOREKEY];
+	call = &p->interface->calls[NDR_WINREG_RESTOREKEY];
 
 	r = talloc(talloc_tos(), struct winreg_RestoreKey);
 	if (r == NULL) {
@@ -1594,7 +1594,7 @@ static bool api_winreg_SaveKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_SaveKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_SAVEKEY];
+	call = &p->interface->calls[NDR_WINREG_SAVEKEY];
 
 	r = talloc(talloc_tos(), struct winreg_SaveKey);
 	if (r == NULL) {
@@ -1667,7 +1667,7 @@ static bool api_winreg_SetKeySecurity(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_SetKeySecurity *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_SETKEYSECURITY];
+	call = &p->interface->calls[NDR_WINREG_SETKEYSECURITY];
 
 	r = talloc(talloc_tos(), struct winreg_SetKeySecurity);
 	if (r == NULL) {
@@ -1740,7 +1740,7 @@ static bool api_winreg_SetValue(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_SetValue *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_SETVALUE];
+	call = &p->interface->calls[NDR_WINREG_SETVALUE];
 
 	r = talloc(talloc_tos(), struct winreg_SetValue);
 	if (r == NULL) {
@@ -1813,7 +1813,7 @@ static bool api_winreg_UnLoadKey(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_UnLoadKey *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_UNLOADKEY];
+	call = &p->interface->calls[NDR_WINREG_UNLOADKEY];
 
 	r = talloc(talloc_tos(), struct winreg_UnLoadKey);
 	if (r == NULL) {
@@ -1886,7 +1886,7 @@ static bool api_winreg_InitiateSystemShutdown(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_InitiateSystemShutdown *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_INITIATESYSTEMSHUTDOWN];
+	call = &p->interface->calls[NDR_WINREG_INITIATESYSTEMSHUTDOWN];
 
 	r = talloc(talloc_tos(), struct winreg_InitiateSystemShutdown);
 	if (r == NULL) {
@@ -1959,7 +1959,7 @@ static bool api_winreg_AbortSystemShutdown(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_AbortSystemShutdown *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_ABORTSYSTEMSHUTDOWN];
+	call = &p->interface->calls[NDR_WINREG_ABORTSYSTEMSHUTDOWN];
 
 	r = talloc(talloc_tos(), struct winreg_AbortSystemShutdown);
 	if (r == NULL) {
@@ -2032,7 +2032,7 @@ static bool api_winreg_GetVersion(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_GetVersion *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_GETVERSION];
+	call = &p->interface->calls[NDR_WINREG_GETVERSION];
 
 	r = talloc(talloc_tos(), struct winreg_GetVersion);
 	if (r == NULL) {
@@ -2112,7 +2112,7 @@ static bool api_winreg_OpenHKCC(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKCC *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKCC];
+	call = &p->interface->calls[NDR_WINREG_OPENHKCC];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKCC);
 	if (r == NULL) {
@@ -2192,7 +2192,7 @@ static bool api_winreg_OpenHKDD(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKDD *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKDD];
+	call = &p->interface->calls[NDR_WINREG_OPENHKDD];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKDD);
 	if (r == NULL) {
@@ -2272,7 +2272,7 @@ static bool api_winreg_QueryMultipleValues(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_QueryMultipleValues *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYMULTIPLEVALUES];
+	call = &p->interface->calls[NDR_WINREG_QUERYMULTIPLEVALUES];
 
 	r = talloc(talloc_tos(), struct winreg_QueryMultipleValues);
 	if (r == NULL) {
@@ -2349,7 +2349,7 @@ static bool api_winreg_InitiateSystemShutdownEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_InitiateSystemShutdownEx *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_INITIATESYSTEMSHUTDOWNEX];
+	call = &p->interface->calls[NDR_WINREG_INITIATESYSTEMSHUTDOWNEX];
 
 	r = talloc(talloc_tos(), struct winreg_InitiateSystemShutdownEx);
 	if (r == NULL) {
@@ -2422,7 +2422,7 @@ static bool api_winreg_SaveKeyEx(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_SaveKeyEx *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_SAVEKEYEX];
+	call = &p->interface->calls[NDR_WINREG_SAVEKEYEX];
 
 	r = talloc(talloc_tos(), struct winreg_SaveKeyEx);
 	if (r == NULL) {
@@ -2495,7 +2495,7 @@ static bool api_winreg_OpenHKPT(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKPT *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKPT];
+	call = &p->interface->calls[NDR_WINREG_OPENHKPT];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKPT);
 	if (r == NULL) {
@@ -2575,7 +2575,7 @@ static bool api_winreg_OpenHKPN(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_OpenHKPN *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_OPENHKPN];
+	call = &p->interface->calls[NDR_WINREG_OPENHKPN];
 
 	r = talloc(talloc_tos(), struct winreg_OpenHKPN);
 	if (r == NULL) {
@@ -2655,7 +2655,7 @@ static bool api_winreg_QueryMultipleValues2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct winreg_QueryMultipleValues2 *r;
 
-	call = &ndr_table_winreg.calls[NDR_WINREG_QUERYMULTIPLEVALUES2];
+	call = &p->interface->calls[NDR_WINREG_QUERYMULTIPLEVALUES2];
 
 	r = talloc(talloc_tos(), struct winreg_QueryMultipleValues2);
 	if (r == NULL) {
diff --git a/librpc/gen_ndr/srv_wkssvc.c b/librpc/gen_ndr/srv_wkssvc.c
index c6809f3cd3a..8b0ea51bfed 100644
--- a/librpc/gen_ndr/srv_wkssvc.c
+++ b/librpc/gen_ndr/srv_wkssvc.c
@@ -15,7 +15,7 @@ static bool api_wkssvc_NetWkstaGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetWkstaGetInfo *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTAGETINFO];
+	call = &p->interface->calls[NDR_WKSSVC_NETWKSTAGETINFO];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetWkstaGetInfo);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_wkssvc_NetWkstaSetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetWkstaSetInfo *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTASETINFO];
+	call = &p->interface->calls[NDR_WKSSVC_NETWKSTASETINFO];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetWkstaSetInfo);
 	if (r == NULL) {
@@ -170,7 +170,7 @@ static bool api_wkssvc_NetWkstaEnumUsers(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetWkstaEnumUsers *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTAENUMUSERS];
+	call = &p->interface->calls[NDR_WKSSVC_NETWKSTAENUMUSERS];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetWkstaEnumUsers);
 	if (r == NULL) {
@@ -252,7 +252,7 @@ static bool api_wkssvc_NetrWkstaUserGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrWkstaUserGetInfo *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTAUSERGETINFO];
+	call = &p->interface->calls[NDR_WKSSVC_NETRWKSTAUSERGETINFO];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaUserGetInfo);
 	if (r == NULL) {
@@ -332,7 +332,7 @@ static bool api_wkssvc_NetrWkstaUserSetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrWkstaUserSetInfo *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTAUSERSETINFO];
+	call = &p->interface->calls[NDR_WKSSVC_NETRWKSTAUSERSETINFO];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaUserSetInfo);
 	if (r == NULL) {
@@ -407,7 +407,7 @@ static bool api_wkssvc_NetWkstaTransportEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetWkstaTransportEnum *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETWKSTATRANSPORTENUM];
+	call = &p->interface->calls[NDR_WKSSVC_NETWKSTATRANSPORTENUM];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetWkstaTransportEnum);
 	if (r == NULL) {
@@ -489,7 +489,7 @@ static bool api_wkssvc_NetrWkstaTransportAdd(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrWkstaTransportAdd *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTATRANSPORTADD];
+	call = &p->interface->calls[NDR_WKSSVC_NETRWKSTATRANSPORTADD];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaTransportAdd);
 	if (r == NULL) {
@@ -564,7 +564,7 @@ static bool api_wkssvc_NetrWkstaTransportDel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrWkstaTransportDel *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWKSTATRANSPORTDEL];
+	call = &p->interface->calls[NDR_WKSSVC_NETRWKSTATRANSPORTDEL];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrWkstaTransportDel);
 	if (r == NULL) {
@@ -637,7 +637,7 @@ static bool api_wkssvc_NetrUseAdd(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrUseAdd *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEADD];
+	call = &p->interface->calls[NDR_WKSSVC_NETRUSEADD];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrUseAdd);
 	if (r == NULL) {
@@ -712,7 +712,7 @@ static bool api_wkssvc_NetrUseGetInfo(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrUseGetInfo *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEGETINFO];
+	call = &p->interface->calls[NDR_WKSSVC_NETRUSEGETINFO];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrUseGetInfo);
 	if (r == NULL) {
@@ -792,7 +792,7 @@ static bool api_wkssvc_NetrUseDel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrUseDel *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEDEL];
+	call = &p->interface->calls[NDR_WKSSVC_NETRUSEDEL];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrUseDel);
 	if (r == NULL) {
@@ -865,7 +865,7 @@ static bool api_wkssvc_NetrUseEnum(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrUseEnum *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUSEENUM];
+	call = &p->interface->calls[NDR_WKSSVC_NETRUSEENUM];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrUseEnum);
 	if (r == NULL) {
@@ -947,7 +947,7 @@ static bool api_wkssvc_NetrMessageBufferSend(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrMessageBufferSend *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRMESSAGEBUFFERSEND];
+	call = &p->interface->calls[NDR_WKSSVC_NETRMESSAGEBUFFERSEND];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrMessageBufferSend);
 	if (r == NULL) {
@@ -1020,7 +1020,7 @@ static bool api_wkssvc_NetrWorkstationStatisticsGet(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrWorkstationStatisticsGet *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET];
+	call = &p->interface->calls[NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrWorkstationStatisticsGet);
 	if (r == NULL) {
@@ -1100,7 +1100,7 @@ static bool api_wkssvc_NetrLogonDomainNameAdd(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrLogonDomainNameAdd *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRLOGONDOMAINNAMEADD];
+	call = &p->interface->calls[NDR_WKSSVC_NETRLOGONDOMAINNAMEADD];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrLogonDomainNameAdd);
 	if (r == NULL) {
@@ -1173,7 +1173,7 @@ static bool api_wkssvc_NetrLogonDomainNameDel(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrLogonDomainNameDel *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL];
+	call = &p->interface->calls[NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrLogonDomainNameDel);
 	if (r == NULL) {
@@ -1246,7 +1246,7 @@ static bool api_wkssvc_NetrJoinDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrJoinDomain *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRJOINDOMAIN];
+	call = &p->interface->calls[NDR_WKSSVC_NETRJOINDOMAIN];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrJoinDomain);
 	if (r == NULL) {
@@ -1319,7 +1319,7 @@ static bool api_wkssvc_NetrUnjoinDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrUnjoinDomain *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUNJOINDOMAIN];
+	call = &p->interface->calls[NDR_WKSSVC_NETRUNJOINDOMAIN];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrUnjoinDomain);
 	if (r == NULL) {
@@ -1392,7 +1392,7 @@ static bool api_wkssvc_NetrRenameMachineInDomain(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrRenameMachineInDomain *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN];
+	call = &p->interface->calls[NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrRenameMachineInDomain);
 	if (r == NULL) {
@@ -1465,7 +1465,7 @@ static bool api_wkssvc_NetrValidateName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrValidateName *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRVALIDATENAME];
+	call = &p->interface->calls[NDR_WKSSVC_NETRVALIDATENAME];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrValidateName);
 	if (r == NULL) {
@@ -1538,7 +1538,7 @@ static bool api_wkssvc_NetrGetJoinInformation(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrGetJoinInformation *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRGETJOININFORMATION];
+	call = &p->interface->calls[NDR_WKSSVC_NETRGETJOININFORMATION];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrGetJoinInformation);
 	if (r == NULL) {
@@ -1619,7 +1619,7 @@ static bool api_wkssvc_NetrGetJoinableOus(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrGetJoinableOus *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRGETJOINABLEOUS];
+	call = &p->interface->calls[NDR_WKSSVC_NETRGETJOINABLEOUS];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrGetJoinableOus);
 	if (r == NULL) {
@@ -1700,7 +1700,7 @@ static bool api_wkssvc_NetrJoinDomain2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrJoinDomain2 *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRJOINDOMAIN2];
+	call = &p->interface->calls[NDR_WKSSVC_NETRJOINDOMAIN2];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrJoinDomain2);
 	if (r == NULL) {
@@ -1773,7 +1773,7 @@ static bool api_wkssvc_NetrUnjoinDomain2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrUnjoinDomain2 *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRUNJOINDOMAIN2];
+	call = &p->interface->calls[NDR_WKSSVC_NETRUNJOINDOMAIN2];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrUnjoinDomain2);
 	if (r == NULL) {
@@ -1846,7 +1846,7 @@ static bool api_wkssvc_NetrRenameMachineInDomain2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrRenameMachineInDomain2 *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2];
+	call = &p->interface->calls[NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrRenameMachineInDomain2);
 	if (r == NULL) {
@@ -1919,7 +1919,7 @@ static bool api_wkssvc_NetrValidateName2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrValidateName2 *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRVALIDATENAME2];
+	call = &p->interface->calls[NDR_WKSSVC_NETRVALIDATENAME2];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrValidateName2);
 	if (r == NULL) {
@@ -1992,7 +1992,7 @@ static bool api_wkssvc_NetrGetJoinableOus2(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrGetJoinableOus2 *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRGETJOINABLEOUS2];
+	call = &p->interface->calls[NDR_WKSSVC_NETRGETJOINABLEOUS2];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrGetJoinableOus2);
 	if (r == NULL) {
@@ -2073,7 +2073,7 @@ static bool api_wkssvc_NetrAddAlternateComputerName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrAddAlternateComputerName *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME];
+	call = &p->interface->calls[NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrAddAlternateComputerName);
 	if (r == NULL) {
@@ -2146,7 +2146,7 @@ static bool api_wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrRemoveAlternateComputerName *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME];
+	call = &p->interface->calls[NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrRemoveAlternateComputerName);
 	if (r == NULL) {
@@ -2219,7 +2219,7 @@ static bool api_wkssvc_NetrSetPrimaryComputername(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrSetPrimaryComputername *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME];
+	call = &p->interface->calls[NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrSetPrimaryComputername);
 	if (r == NULL) {
@@ -2292,7 +2292,7 @@ static bool api_wkssvc_NetrEnumerateComputerNames(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wkssvc_NetrEnumerateComputerNames *r;
 
-	call = &ndr_table_wkssvc.calls[NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES];
+	call = &p->interface->calls[NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES];
 
 	r = talloc(talloc_tos(), struct wkssvc_NetrEnumerateComputerNames);
 	if (r == NULL) {
diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index fca55563abc..560f28d0e3a 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -148,7 +148,7 @@ sub ParseFunction($$)
 	pidl "DATA_BLOB blob;";
 	pidl "struct $fn->{NAME} *r;";
 	pidl "";
-	pidl "call = &ndr_table_$if->{NAME}.calls[$op];";
+	pidl "call = &p->interface->calls[$op];";
 	pidl "";
 	pidl "r = talloc(talloc_tos(), struct $fn->{NAME});";
 	pidl "if (r == NULL) {";
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index bbe653b8bd5..10cd32170d5 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -169,7 +169,7 @@ typedef struct pipes_struct {
 
 	struct auth_serversupplied_info *server_info;
 
-	struct ndr_syntax_id syntax;
+	const struct ndr_interface_table *interface;
 
 	/* linked list of rpc dispatch tables associated 
 	   with the open rpc contexts */
diff --git a/source3/librpc/gen_ndr/srv_wbint.c b/source3/librpc/gen_ndr/srv_wbint.c
index 08a346a3f6d..a7112cb94bf 100644
--- a/source3/librpc/gen_ndr/srv_wbint.c
+++ b/source3/librpc/gen_ndr/srv_wbint.c
@@ -15,7 +15,7 @@ static bool api_wbint_Ping(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_Ping *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_PING];
+	call = &p->interface->calls[NDR_WBINT_PING];
 
 	r = talloc(talloc_tos(), struct wbint_Ping);
 	if (r == NULL) {
@@ -95,7 +95,7 @@ static bool api_wbint_LookupSid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_LookupSid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_LOOKUPSID];
+	call = &p->interface->calls[NDR_WBINT_LOOKUPSID];
 
 	r = talloc(talloc_tos(), struct wbint_LookupSid);
 	if (r == NULL) {
@@ -187,7 +187,7 @@ static bool api_wbint_LookupName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_LookupName *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_LOOKUPNAME];
+	call = &p->interface->calls[NDR_WBINT_LOOKUPNAME];
 
 	r = talloc(talloc_tos(), struct wbint_LookupName);
 	if (r == NULL) {
@@ -273,7 +273,7 @@ static bool api_wbint_Sid2Uid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_Sid2Uid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_SID2UID];
+	call = &p->interface->calls[NDR_WBINT_SID2UID];
 
 	r = talloc(talloc_tos(), struct wbint_Sid2Uid);
 	if (r == NULL) {
@@ -353,7 +353,7 @@ static bool api_wbint_Sid2Gid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_Sid2Gid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_SID2GID];
+	call = &p->interface->calls[NDR_WBINT_SID2GID];
 
 	r = talloc(talloc_tos(), struct wbint_Sid2Gid);
 	if (r == NULL) {
@@ -433,7 +433,7 @@ static bool api_wbint_Uid2Sid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_Uid2Sid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_UID2SID];
+	call = &p->interface->calls[NDR_WBINT_UID2SID];
 
 	r = talloc(talloc_tos(), struct wbint_Uid2Sid);
 	if (r == NULL) {
@@ -513,7 +513,7 @@ static bool api_wbint_Gid2Sid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_Gid2Sid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_GID2SID];
+	call = &p->interface->calls[NDR_WBINT_GID2SID];
 
 	r = talloc(talloc_tos(), struct wbint_Gid2Sid);
 	if (r == NULL) {
@@ -593,7 +593,7 @@ static bool api_wbint_AllocateUid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_AllocateUid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_ALLOCATEUID];
+	call = &p->interface->calls[NDR_WBINT_ALLOCATEUID];
 
 	r = talloc(talloc_tos(), struct wbint_AllocateUid);
 	if (r == NULL) {
@@ -673,7 +673,7 @@ static bool api_wbint_AllocateGid(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_AllocateGid *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_ALLOCATEGID];
+	call = &p->interface->calls[NDR_WBINT_ALLOCATEGID];
 
 	r = talloc(talloc_tos(), struct wbint_AllocateGid);
 	if (r == NULL) {
@@ -753,7 +753,7 @@ static bool api_wbint_QueryUser(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_QueryUser *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_QUERYUSER];
+	call = &p->interface->calls[NDR_WBINT_QUERYUSER];
 
 	r = talloc(talloc_tos(), struct wbint_QueryUser);
 	if (r == NULL) {
@@ -833,7 +833,7 @@ static bool api_wbint_LookupUserAliases(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_LookupUserAliases *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_LOOKUPUSERALIASES];
+	call = &p->interface->calls[NDR_WBINT_LOOKUPUSERALIASES];
 
 	r = talloc(talloc_tos(), struct wbint_LookupUserAliases);
 	if (r == NULL) {
@@ -913,7 +913,7 @@ static bool api_wbint_LookupUserGroups(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_LookupUserGroups *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_LOOKUPUSERGROUPS];
+	call = &p->interface->calls[NDR_WBINT_LOOKUPUSERGROUPS];
 
 	r = talloc(talloc_tos(), struct wbint_LookupUserGroups);
 	if (r == NULL) {
@@ -993,7 +993,7 @@ static bool api_wbint_QuerySequenceNumber(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_QuerySequenceNumber *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_QUERYSEQUENCENUMBER];
+	call = &p->interface->calls[NDR_WBINT_QUERYSEQUENCENUMBER];
 
 	r = talloc(talloc_tos(), struct wbint_QuerySequenceNumber);
 	if (r == NULL) {
@@ -1073,7 +1073,7 @@ static bool api_wbint_LookupGroupMembers(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_LookupGroupMembers *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_LOOKUPGROUPMEMBERS];
+	call = &p->interface->calls[NDR_WBINT_LOOKUPGROUPMEMBERS];
 
 	r = talloc(talloc_tos(), struct wbint_LookupGroupMembers);
 	if (r == NULL) {
@@ -1153,7 +1153,7 @@ static bool api_wbint_QueryUserList(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_QueryUserList *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_QUERYUSERLIST];
+	call = &p->interface->calls[NDR_WBINT_QUERYUSERLIST];
 
 	r = talloc(talloc_tos(), struct wbint_QueryUserList);
 	if (r == NULL) {
@@ -1233,7 +1233,7 @@ static bool api_wbint_QueryGroupList(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_QueryGroupList *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_QUERYGROUPLIST];
+	call = &p->interface->calls[NDR_WBINT_QUERYGROUPLIST];
 
 	r = talloc(talloc_tos(), struct wbint_QueryGroupList);
 	if (r == NULL) {
@@ -1313,7 +1313,7 @@ static bool api_wbint_DsGetDcName(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_DsGetDcName *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_DSGETDCNAME];
+	call = &p->interface->calls[NDR_WBINT_DSGETDCNAME];
 
 	r = talloc(talloc_tos(), struct wbint_DsGetDcName);
 	if (r == NULL) {
@@ -1393,7 +1393,7 @@ static bool api_wbint_LookupRids(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_LookupRids *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_LOOKUPRIDS];
+	call = &p->interface->calls[NDR_WBINT_LOOKUPRIDS];
 
 	r = talloc(talloc_tos(), struct wbint_LookupRids);
 	if (r == NULL) {
@@ -1473,7 +1473,7 @@ static bool api_wbint_CheckMachineAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_CheckMachineAccount *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_CHECKMACHINEACCOUNT];
+	call = &p->interface->calls[NDR_WBINT_CHECKMACHINEACCOUNT];
 
 	r = talloc(talloc_tos(), struct wbint_CheckMachineAccount);
 	if (r == NULL) {
@@ -1546,7 +1546,7 @@ static bool api_wbint_ChangeMachineAccount(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_ChangeMachineAccount *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_CHANGEMACHINEACCOUNT];
+	call = &p->interface->calls[NDR_WBINT_CHANGEMACHINEACCOUNT];
 
 	r = talloc(talloc_tos(), struct wbint_ChangeMachineAccount);
 	if (r == NULL) {
@@ -1619,7 +1619,7 @@ static bool api_wbint_SetMapping(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_SetMapping *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_SETMAPPING];
+	call = &p->interface->calls[NDR_WBINT_SETMAPPING];
 
 	r = talloc(talloc_tos(), struct wbint_SetMapping);
 	if (r == NULL) {
@@ -1692,7 +1692,7 @@ static bool api_wbint_RemoveMapping(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_RemoveMapping *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_REMOVEMAPPING];
+	call = &p->interface->calls[NDR_WBINT_REMOVEMAPPING];
 
 	r = talloc(talloc_tos(), struct wbint_RemoveMapping);
 	if (r == NULL) {
@@ -1765,7 +1765,7 @@ static bool api_wbint_SetHWM(pipes_struct *p)
 	DATA_BLOB blob;
 	struct wbint_SetHWM *r;
 
-	call = &ndr_table_wbint.calls[NDR_WBINT_SETHWM];
+	call = &p->interface->calls[NDR_WBINT_SETHWM];
 
 	r = talloc(talloc_tos(), struct wbint_SetHWM);
 	if (r == NULL) {
diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c
index 4233b6f0e6d..8b4b4a9252f 100644
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -81,10 +81,11 @@ bool init_pipe_handle_list(pipes_struct *p, const struct ndr_syntax_id *syntax)
 	for (plist = get_first_internal_pipe();
 	     plist;
 	     plist = get_next_internal_pipe(plist)) {
-		if (ndr_syntax_id_equal(syntax, &plist->syntax)) {
+		if (ndr_syntax_id_equal(syntax,
+					&plist->interface->syntax_id)) {
 			break;
 		}
-		if (is_samr_lsa_pipe(&plist->syntax)
+		if (is_samr_lsa_pipe(&plist->interface->syntax_id)
 		    && is_samr_lsa_pipe(syntax)) {
 			/*
 			 * samr and lsa share a handle space (same process
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index e7d94d70ec2..8bc2bdd505c 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -57,7 +57,8 @@ pipes_struct *get_next_internal_pipe(pipes_struct *p)
 
 const char *get_pipe_name_tos(struct pipes_struct *p)
 {
-	return get_pipe_name_from_syntax(talloc_tos(), &p->syntax);
+	return get_pipe_name_from_syntax(talloc_tos(),
+					 &p->interface->syntax_id);
 }
 
 /****************************************************************************
@@ -119,6 +120,14 @@ static struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 
+	p->interface = get_iface_from_syntax(syntax);
+	if (p->interface == NULL) {
+		DEBUG(10, ("Could not find ndr table for syntax\n"));
+		TALLOC_FREE(p->mem_ctx);
+		TALLOC_FREE(p);
+		return NULL;
+	}
+
 	if (!init_pipe_handle_list(p, syntax)) {
 		DEBUG(0,("open_rpc_pipe_p: init_pipe_handles failed.\n"));
 		talloc_destroy(p->mem_ctx);
@@ -161,8 +170,6 @@ static struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
 	 */	
 	prs_init_empty(&p->out_data.rdata, p->mem_ctx, MARSHALL);
 
-	p->syntax = *syntax;
-
 	DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n",
 		 get_pipe_name_from_syntax(talloc_tos(), syntax), pipes_open));
 
diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index eb018aa87e7..916499ad9ce 100644
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -267,6 +267,7 @@ enum winbindd_result winbindd_dual_ndrcmd(struct winbindd_domain *domain,
 
 	ZERO_STRUCT(p);
 	p.mem_ctx = talloc_stackframe();
+	p.interface = &ndr_table_wbint;
 	p.in_data.data.buffer_size = state->request->extra_len;
 	p.in_data.data.data_p = state->request->extra_data.data;
 	prs_init(&p.out_data.rdata, 0, state->mem_ctx, false);