Allow overriding the function that ships the request in the Samba 3

client code.

diff --git a/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index d2c9b4f03f904518c9a94bf16da8a2c7469bb2b5..e8691dc63596fe9ef2906b036f0bd4feef9f46ad 100644 (file)
--- a/librpc/gen_ndr/cli_dfs.c
+++ b/librpc/gen_ndr/cli_dfs.c
@@ -19,7 +19,7 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_GetManagerVersion, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_GETMANAGERVERSION,
@@ -67,7 +67,7 @@ NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Add, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ADD,
@@ -114,7 +114,7 @@ NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Remove, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_REMOVE,
@@ -165,7 +165,7 @@ NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_SetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_SETINFO,
@@ -215,7 +215,7 @@ NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_GetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_GETINFO,
@@ -265,7 +265,7 @@ NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Enum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ENUM,
@@ -312,7 +312,7 @@ NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Rename, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_RENAME,
@@ -353,7 +353,7 @@ NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Move, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_MOVE,
@@ -394,7 +394,7 @@ NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_ManagerGetConfigInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_MANAGERGETCONFIGINFO,
@@ -435,7 +435,7 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_ManagerSendSiteInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_MANAGERSENDSITEINFO,
@@ -494,7 +494,7 @@ NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_AddFtRoot, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ADDFTROOT,
@@ -550,7 +550,7 @@ NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_RemoveFtRoot, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_REMOVEFTROOT,
@@ -602,7 +602,7 @@ NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_AddStdRoot, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ADDSTDROOT,
@@ -649,7 +649,7 @@ NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_RemoveStdRoot, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_REMOVESTDROOT,
@@ -694,7 +694,7 @@ NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_ManagerInitialize, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_MANAGERINITIALIZE,
@@ -743,7 +743,7 @@ NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_AddStdRootForced, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ADDSTDROOTFORCED,
@@ -792,7 +792,7 @@ NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_GetDcAddress, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_GETDCADDRESS,
@@ -844,7 +844,7 @@ NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_SetDcAddress, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_SETDCADDRESS,
@@ -889,7 +889,7 @@ NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_FlushFtTable, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_FLUSHFTTABLE,
@@ -930,7 +930,7 @@ NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Add2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ADD2,
@@ -971,7 +971,7 @@ NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_Remove2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_REMOVE2,
@@ -1022,7 +1022,7 @@ NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_EnumEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_ENUMEX,
@@ -1069,7 +1069,7 @@ NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dfs_SetInfo2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netdfs,
                                NDR_DFS_SETINFO2,

diff --git a/librpc/gen_ndr/cli_drsuapi.c b/librpc/gen_ndr/cli_drsuapi.c
index 4063a67c43ff11326bac9d5e83103ea062820f07..be83eebe1f772ca16fd4a8f72757cc48ba0288d6 100644 (file)
--- a/librpc/gen_ndr/cli_drsuapi.c
+++ b/librpc/gen_ndr/cli_drsuapi.c
@@ -24,7 +24,7 @@ NTSTATUS rpccli_drsuapi_DsBind(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsBind, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSBIND,
@@ -71,7 +71,7 @@ NTSTATUS rpccli_drsuapi_DsUnbind(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsUnbind, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSUNBIND,
@@ -119,7 +119,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaSync(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsReplicaSync, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSREPLICASYNC,
@@ -168,7 +168,7 @@ NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsGetNCChanges, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSGETNCCHANGES,
@@ -217,7 +217,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsReplicaUpdateRefs, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSREPLICAUPDATEREFS,
@@ -258,7 +258,7 @@ NTSTATUS rpccli_DRSUAPI_REPLICA_ADD(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_REPLICA_ADD, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_REPLICA_ADD,
@@ -299,7 +299,7 @@ NTSTATUS rpccli_DRSUAPI_REPLICA_DEL(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_REPLICA_DEL, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_REPLICA_DEL,
@@ -340,7 +340,7 @@ NTSTATUS rpccli_DRSUAPI_REPLICA_MODIFY(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_REPLICA_MODIFY, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_REPLICA_MODIFY,
@@ -381,7 +381,7 @@ NTSTATUS rpccli_DRSUAPI_VERIFY_NAMES(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_VERIFY_NAMES, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_VERIFY_NAMES,
@@ -430,7 +430,7 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsGetMemberships, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSGETMEMBERSHIPS,
@@ -473,7 +473,7 @@ NTSTATUS rpccli_DRSUAPI_INTER_DOMAIN_MOVE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_INTER_DOMAIN_MOVE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_INTER_DOMAIN_MOVE,
@@ -522,7 +522,7 @@ NTSTATUS rpccli_drsuapi_DsGetNT4ChangeLog(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsGetNT4ChangeLog, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSGETNT4CHANGELOG,
@@ -573,7 +573,7 @@ NTSTATUS rpccli_drsuapi_DsCrackNames(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsCrackNames, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSCRACKNAMES,
@@ -624,7 +624,7 @@ NTSTATUS rpccli_drsuapi_DsWriteAccountSpn(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsWriteAccountSpn, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSWRITEACCOUNTSPN,
@@ -675,7 +675,7 @@ NTSTATUS rpccli_drsuapi_DsRemoveDSServer(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsRemoveDSServer, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSREMOVEDSSERVER,
@@ -718,7 +718,7 @@ NTSTATUS rpccli_DRSUAPI_REMOVE_DS_DOMAIN(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_REMOVE_DS_DOMAIN, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_REMOVE_DS_DOMAIN,
@@ -767,7 +767,7 @@ NTSTATUS rpccli_drsuapi_DsGetDomainControllerInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsGetDomainControllerInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSGETDOMAINCONTROLLERINFO,
@@ -818,7 +818,7 @@ NTSTATUS rpccli_drsuapi_DsAddEntry(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsAddEntry, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSADDENTRY,
@@ -861,7 +861,7 @@ NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_EXECUTE_KCC, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_EXECUTE_KCC,
@@ -910,7 +910,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsReplicaGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSREPLICAGETINFO,
@@ -953,7 +953,7 @@ NTSTATUS rpccli_DRSUAPI_ADD_SID_HISTORY(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_ADD_SID_HISTORY, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_ADD_SID_HISTORY,
@@ -1002,7 +1002,7 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_DsGetMemberships2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_DSGETMEMBERSHIPS2,
@@ -1045,7 +1045,7 @@ NTSTATUS rpccli_DRSUAPI_REPLICA_VERIFY_OBJECTS(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_REPLICA_VERIFY_OBJECTS, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_REPLICA_VERIFY_OBJECTS,
@@ -1086,7 +1086,7 @@ NTSTATUS rpccli_DRSUAPI_GET_OBJECT_EXISTENCE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(DRSUAPI_GET_OBJECT_EXISTENCE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_GET_OBJECT_EXISTENCE,
@@ -1135,7 +1135,7 @@ NTSTATUS rpccli_drsuapi_QuerySitesByCost(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(drsuapi_QuerySitesByCost, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
                                NDR_DRSUAPI_QUERYSITESBYCOST,

diff --git a/librpc/gen_ndr/cli_dssetup.c b/librpc/gen_ndr/cli_dssetup.c
index 39abe34d4d1c7804ce813a0c9aab0b29c13ab36a..6cf923ff82b9ef28f12777fde656a25aa282a231 100644 (file)
--- a/librpc/gen_ndr/cli_dssetup.c
+++ b/librpc/gen_ndr/cli_dssetup.c
@@ -22,7 +22,7 @@ NTSTATUS rpccli_dssetup_DsRoleGetPrimaryDomainInformation(struct rpc_pipe_client
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleGetPrimaryDomainInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION,
@@ -66,7 +66,7 @@ NTSTATUS rpccli_dssetup_DsRoleDnsNameToFlatName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleDnsNameToFlatName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME,
@@ -107,7 +107,7 @@ NTSTATUS rpccli_dssetup_DsRoleDcAsDc(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleDcAsDc, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEDCASDC,
@@ -148,7 +148,7 @@ NTSTATUS rpccli_dssetup_DsRoleDcAsReplica(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleDcAsReplica, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEDCASREPLICA,
@@ -189,7 +189,7 @@ NTSTATUS rpccli_dssetup_DsRoleDemoteDc(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleDemoteDc, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEDEMOTEDC,
@@ -230,7 +230,7 @@ NTSTATUS rpccli_dssetup_DsRoleGetDcOperationProgress(struct rpc_pipe_client *cli
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleGetDcOperationProgress, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS,
@@ -271,7 +271,7 @@ NTSTATUS rpccli_dssetup_DsRoleGetDcOperationResults(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleGetDcOperationResults, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS,
@@ -312,7 +312,7 @@ NTSTATUS rpccli_dssetup_DsRoleCancel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleCancel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLECANCEL,
@@ -353,7 +353,7 @@ NTSTATUS rpccli_dssetup_DsRoleServerSaveStateForUpgrade(struct rpc_pipe_client *
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleServerSaveStateForUpgrade, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE,
@@ -394,7 +394,7 @@ NTSTATUS rpccli_dssetup_DsRoleUpgradeDownlevelServer(struct rpc_pipe_client *cli
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleUpgradeDownlevelServer, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER,
@@ -435,7 +435,7 @@ NTSTATUS rpccli_dssetup_DsRoleAbortDownlevelServerUpgrade(struct rpc_pipe_client
                NDR_PRINT_IN_DEBUG(dssetup_DsRoleAbortDownlevelServerUpgrade, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_dssetup,
                                NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE,

diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index f59a1918835c1c8c3aa4206284af0a87f3c5191b..ff369c7d5a9f65b6e76879a3a9d141c02b432f31 100644 (file)
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -21,7 +21,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_AddOne, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_ADDONE,
@@ -63,7 +63,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_EchoData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_ECHODATA,
@@ -104,7 +104,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_SinkData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_SINKDATA,
@@ -143,7 +143,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_SourceData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_SOURCEDATA,
@@ -183,7 +183,7 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_TestCall, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_TESTCALL,
@@ -223,7 +223,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_TestCall2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_TESTCALL2,
@@ -262,7 +262,7 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_TestSleep, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_TESTSLEEP,
@@ -304,7 +304,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_TestEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_TESTENUM,
@@ -345,7 +345,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_TESTSURROUNDING,
@@ -384,7 +384,7 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_rpcecho,
                                NDR_ECHO_TESTDOUBLEPOINTER,

diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 6ef5f9aae5ddcc23cf221f99ad2ddb59a6ed6b12..0ccefa97cb0d551510aa8b023ff552535f7765c6 100644 (file)
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -24,7 +24,7 @@ NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_Insert, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_INSERT,
@@ -64,7 +64,7 @@ NTSTATUS rpccli_epm_Delete(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_Delete, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_DELETE,
@@ -114,7 +114,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_Lookup, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_LOOKUP,
@@ -163,7 +163,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_Map, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_MAP,
@@ -204,7 +204,7 @@ NTSTATUS rpccli_epm_LookupHandleFree(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_LookupHandleFree, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_LOOKUPHANDLEFREE,
@@ -243,7 +243,7 @@ NTSTATUS rpccli_epm_InqObject(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_InqObject, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_INQOBJECT,
@@ -285,7 +285,7 @@ NTSTATUS rpccli_epm_MgmtDelete(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_MgmtDelete, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_MGMTDELETE,
@@ -321,7 +321,7 @@ NTSTATUS rpccli_epm_MapAuth(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(epm_MapAuth, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_epmapper,
                                NDR_EPM_MAPAUTH,

diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index cf441413a795d2384eaa0fd39ee495a0c816ffd2..2f4b9f21af92e5a9dbd7cc11297db45d16fe41c0 100644 (file)
--- a/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
@@ -22,7 +22,7 @@ NTSTATUS rpccli_eventlog_ClearEventLogW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ClearEventLogW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_CLEAREVENTLOGW,
@@ -58,7 +58,7 @@ NTSTATUS rpccli_eventlog_BackupEventLogW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_BackupEventLogW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_BACKUPEVENTLOGW,
@@ -96,7 +96,7 @@ NTSTATUS rpccli_eventlog_CloseEventLog(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_CloseEventLog, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_CLOSEEVENTLOG,
@@ -133,7 +133,7 @@ NTSTATUS rpccli_eventlog_DeregisterEventSource(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_DeregisterEventSource, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_DEREGISTEREVENTSOURCE,
@@ -172,7 +172,7 @@ NTSTATUS rpccli_eventlog_GetNumRecords(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_GetNumRecords, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_GETNUMRECORDS,
@@ -212,7 +212,7 @@ NTSTATUS rpccli_eventlog_GetOldestRecord(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_GetOldestRecord, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_GETOLDESTRECORD,
@@ -249,7 +249,7 @@ NTSTATUS rpccli_eventlog_ChangeNotify(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ChangeNotify, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_CHANGENOTIFY,
@@ -296,7 +296,7 @@ NTSTATUS rpccli_eventlog_OpenEventLogW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_OpenEventLogW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_OPENEVENTLOGW,
@@ -333,7 +333,7 @@ NTSTATUS rpccli_eventlog_RegisterEventSourceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_RegisterEventSourceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_REGISTEREVENTSOURCEW,
@@ -369,7 +369,7 @@ NTSTATUS rpccli_eventlog_OpenBackupEventLogW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_OpenBackupEventLogW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_OPENBACKUPEVENTLOGW,
@@ -416,7 +416,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ReadEventLogW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_READEVENTLOGW,
@@ -455,7 +455,7 @@ NTSTATUS rpccli_eventlog_ReportEventW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ReportEventW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_REPORTEVENTW,
@@ -491,7 +491,7 @@ NTSTATUS rpccli_eventlog_ClearEventLogA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ClearEventLogA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_CLEAREVENTLOGA,
@@ -527,7 +527,7 @@ NTSTATUS rpccli_eventlog_BackupEventLogA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_BackupEventLogA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_BACKUPEVENTLOGA,
@@ -563,7 +563,7 @@ NTSTATUS rpccli_eventlog_OpenEventLogA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_OpenEventLogA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_OPENEVENTLOGA,
@@ -599,7 +599,7 @@ NTSTATUS rpccli_eventlog_RegisterEventSourceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_RegisterEventSourceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_REGISTEREVENTSOURCEA,
@@ -635,7 +635,7 @@ NTSTATUS rpccli_eventlog_OpenBackupEventLogA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_OpenBackupEventLogA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_OPENBACKUPEVENTLOGA,
@@ -671,7 +671,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ReadEventLogA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_READEVENTLOGA,
@@ -707,7 +707,7 @@ NTSTATUS rpccli_eventlog_ReportEventA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_ReportEventA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_REPORTEVENTA,
@@ -743,7 +743,7 @@ NTSTATUS rpccli_eventlog_RegisterClusterSvc(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_RegisterClusterSvc, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_REGISTERCLUSTERSVC,
@@ -779,7 +779,7 @@ NTSTATUS rpccli_eventlog_DeregisterClusterSvc(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_DeregisterClusterSvc, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_DEREGISTERCLUSTERSVC,
@@ -815,7 +815,7 @@ NTSTATUS rpccli_eventlog_WriteClusterEvents(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_WriteClusterEvents, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_WRITECLUSTEREVENTS,
@@ -851,7 +851,7 @@ NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_GetLogIntormation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_GETLOGINTORMATION,
@@ -889,7 +889,7 @@ NTSTATUS rpccli_eventlog_FlushEventLog(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(eventlog_FlushEventLog, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
                                NDR_EVENTLOG_FLUSHEVENTLOG,

diff --git a/librpc/gen_ndr/cli_initshutdown.c b/librpc/gen_ndr/cli_initshutdown.c
index 40d7bdf40e9b17e98779821b99e5eb3c4c41c4cb..3861e0c3e4637a63f537e3a08d856454ebe91208 100644 (file)
--- a/librpc/gen_ndr/cli_initshutdown.c
+++ b/librpc/gen_ndr/cli_initshutdown.c
@@ -29,7 +29,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(initshutdown_Init, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_initshutdown,
                                NDR_INITSHUTDOWN_INIT,
@@ -72,7 +72,7 @@ NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(initshutdown_Abort, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_initshutdown,
                                NDR_INITSHUTDOWN_ABORT,
@@ -125,7 +125,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(initshutdown_InitEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_initshutdown,
                                NDR_INITSHUTDOWN_INITEX,

diff --git a/librpc/gen_ndr/cli_lsa.c b/librpc/gen_ndr/cli_lsa.c
index 306206fcafd6aa0ed7a608f214581f1a67a9e341..93362537b47526ff89ddbed06051966050ddb971 100644 (file)
--- a/librpc/gen_ndr/cli_lsa.c
+++ b/librpc/gen_ndr/cli_lsa.c
@@ -20,7 +20,7 @@ NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_Close, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CLOSE,
@@ -59,7 +59,7 @@ NTSTATUS rpccli_lsa_Delete(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_Delete, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_DELETE,
@@ -102,7 +102,7 @@ NTSTATUS rpccli_lsa_EnumPrivs(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumPrivs, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMPRIVS,
@@ -145,7 +145,7 @@ NTSTATUS rpccli_lsa_QuerySecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QuerySecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYSECURITY,
@@ -188,7 +188,7 @@ NTSTATUS rpccli_lsa_SetSecObj(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetSecObj, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETSECOBJ,
@@ -224,7 +224,7 @@ NTSTATUS rpccli_lsa_ChangePassword(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_ChangePassword, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CHANGEPASSWORD,
@@ -267,7 +267,7 @@ NTSTATUS rpccli_lsa_OpenPolicy(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_OpenPolicy, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_OPENPOLICY,
@@ -309,7 +309,7 @@ NTSTATUS rpccli_lsa_QueryInfoPolicy(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QueryInfoPolicy, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYINFOPOLICY,
@@ -352,7 +352,7 @@ NTSTATUS rpccli_lsa_SetInfoPolicy(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetInfoPolicy, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETINFOPOLICY,
@@ -388,7 +388,7 @@ NTSTATUS rpccli_lsa_ClearAuditLog(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_ClearAuditLog, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CLEARAUDITLOG,
@@ -431,7 +431,7 @@ NTSTATUS rpccli_lsa_CreateAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CreateAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREATEACCOUNT,
@@ -475,7 +475,7 @@ NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumAccounts, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMACCOUNTS,
@@ -520,7 +520,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CreateTrustedDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREATETRUSTEDDOMAIN,
@@ -564,7 +564,7 @@ NTSTATUS rpccli_lsa_EnumTrustDom(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumTrustDom, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMTRUSTDOM,
@@ -615,7 +615,7 @@ NTSTATUS rpccli_lsa_LookupNames(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupNames, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPNAMES,
@@ -665,7 +665,7 @@ NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupSids, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPSIDS,
@@ -711,7 +711,7 @@ NTSTATUS rpccli_lsa_CreateSecret(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CreateSecret, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREATESECRET,
@@ -755,7 +755,7 @@ NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_OpenAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_OPENACCOUNT,
@@ -795,7 +795,7 @@ NTSTATUS rpccli_lsa_EnumPrivsAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumPrivsAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMPRIVSACCOUNT,
@@ -836,7 +836,7 @@ NTSTATUS rpccli_lsa_AddPrivilegesToAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_AddPrivilegesToAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ADDPRIVILEGESTOACCOUNT,
@@ -878,7 +878,7 @@ NTSTATUS rpccli_lsa_RemovePrivilegesFromAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_RemovePrivilegesFromAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT,
@@ -914,7 +914,7 @@ NTSTATUS rpccli_lsa_GetQuotasForAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_GetQuotasForAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_GETQUOTASFORACCOUNT,
@@ -950,7 +950,7 @@ NTSTATUS rpccli_lsa_SetQuotasForAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetQuotasForAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETQUOTASFORACCOUNT,
@@ -989,7 +989,7 @@ NTSTATUS rpccli_lsa_GetSystemAccessAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_GetSystemAccessAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_GETSYSTEMACCESSACCOUNT,
@@ -1030,7 +1030,7 @@ NTSTATUS rpccli_lsa_SetSystemAccessAccount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetSystemAccessAccount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETSYSTEMACCESSACCOUNT,
@@ -1073,7 +1073,7 @@ NTSTATUS rpccli_lsa_OpenTrustedDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_OpenTrustedDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_OPENTRUSTEDDOMAIN,
@@ -1115,7 +1115,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QueryTrustedDomainInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYTRUSTEDDOMAININFO,
@@ -1158,7 +1158,7 @@ NTSTATUS rpccli_lsa_SetInformationTrustedDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetInformationTrustedDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN,
@@ -1201,7 +1201,7 @@ NTSTATUS rpccli_lsa_OpenSecret(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_OpenSecret, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_OPENSECRET,
@@ -1244,7 +1244,7 @@ NTSTATUS rpccli_lsa_SetSecret(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetSecret, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETSECRET,
@@ -1290,7 +1290,7 @@ NTSTATUS rpccli_lsa_QuerySecret(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QuerySecret, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYSECRET,
@@ -1343,7 +1343,7 @@ NTSTATUS rpccli_lsa_LookupPrivValue(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupPrivValue, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPPRIVVALUE,
@@ -1385,7 +1385,7 @@ NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupPrivName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPPRIVNAME,
@@ -1432,7 +1432,7 @@ NTSTATUS rpccli_lsa_LookupPrivDisplayName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupPrivDisplayName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPPRIVDISPLAYNAME,
@@ -1472,7 +1472,7 @@ NTSTATUS rpccli_lsa_DeleteObject(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_DeleteObject, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_DELETEOBJECT,
@@ -1514,7 +1514,7 @@ NTSTATUS rpccli_lsa_EnumAccountsWithUserRight(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumAccountsWithUserRight, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT,
@@ -1556,7 +1556,7 @@ NTSTATUS rpccli_lsa_EnumAccountRights(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumAccountRights, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMACCOUNTRIGHTS,
@@ -1599,7 +1599,7 @@ NTSTATUS rpccli_lsa_AddAccountRights(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_AddAccountRights, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ADDACCOUNTRIGHTS,
@@ -1643,7 +1643,7 @@ NTSTATUS rpccli_lsa_RemoveAccountRights(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_RemoveAccountRights, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_REMOVEACCOUNTRIGHTS,
@@ -1686,7 +1686,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QueryTrustedDomainInfoBySid, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID,
@@ -1731,7 +1731,7 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetTrustedDomainInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETTRUSTEDDOMAININFO,
@@ -1771,7 +1771,7 @@ NTSTATUS rpccli_lsa_DeleteTrustedDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_DeleteTrustedDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_DELETETRUSTEDDOMAIN,
@@ -1807,7 +1807,7 @@ NTSTATUS rpccli_lsa_StorePrivateData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_StorePrivateData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_STOREPRIVATEDATA,
@@ -1843,7 +1843,7 @@ NTSTATUS rpccli_lsa_RetrievePrivateData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_RetrievePrivateData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_RETRIEVEPRIVATEDATA,
@@ -1886,7 +1886,7 @@ NTSTATUS rpccli_lsa_OpenPolicy2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_OpenPolicy2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_OPENPOLICY2,
@@ -1929,7 +1929,7 @@ NTSTATUS rpccli_lsa_GetUserName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_GetUserName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_GETUSERNAME,
@@ -1974,7 +1974,7 @@ NTSTATUS rpccli_lsa_QueryInfoPolicy2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QueryInfoPolicy2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYINFOPOLICY2,
@@ -2017,7 +2017,7 @@ NTSTATUS rpccli_lsa_SetInfoPolicy2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetInfoPolicy2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETINFOPOLICY2,
@@ -2060,7 +2060,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QueryTrustedDomainInfoByName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME,
@@ -2105,7 +2105,7 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetTrustedDomainInfoByName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETTRUSTEDDOMAININFOBYNAME,
@@ -2148,7 +2148,7 @@ NTSTATUS rpccli_lsa_EnumTrustedDomainsEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_EnumTrustedDomainsEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_ENUMTRUSTEDDOMAINSEX,
@@ -2195,7 +2195,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomainEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CreateTrustedDomainEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREATETRUSTEDDOMAINEX,
@@ -2234,7 +2234,7 @@ NTSTATUS rpccli_lsa_CloseTrustedDomainEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CloseTrustedDomainEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CLOSETRUSTEDDOMAINEX,
@@ -2276,7 +2276,7 @@ NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_QueryDomainInformationPolicy, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_QUERYDOMAININFORMATIONPOLICY,
@@ -2319,7 +2319,7 @@ NTSTATUS rpccli_lsa_SetDomainInformationPolicy(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_SetDomainInformationPolicy, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_SETDOMAININFORMATIONPOLICY,
@@ -2362,7 +2362,7 @@ NTSTATUS rpccli_lsa_OpenTrustedDomainByName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_OpenTrustedDomainByName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_OPENTRUSTEDDOMAINBYNAME,
@@ -2399,7 +2399,7 @@ NTSTATUS rpccli_lsa_TestCall(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_TestCall, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_TESTCALL,
@@ -2450,7 +2450,7 @@ NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupSids2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPSIDS2,
@@ -2506,7 +2506,7 @@ NTSTATUS rpccli_lsa_LookupNames2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupNames2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPNAMES2,
@@ -2554,7 +2554,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomainEx2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CreateTrustedDomainEx2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREATETRUSTEDDOMAINEX2,
@@ -2591,7 +2591,7 @@ NTSTATUS rpccli_lsa_CREDRWRITE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRWRITE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRWRITE,
@@ -2627,7 +2627,7 @@ NTSTATUS rpccli_lsa_CREDRREAD(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRREAD, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRREAD,
@@ -2663,7 +2663,7 @@ NTSTATUS rpccli_lsa_CREDRENUMERATE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRENUMERATE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRENUMERATE,
@@ -2699,7 +2699,7 @@ NTSTATUS rpccli_lsa_CREDRWRITEDOMAINCREDENTIALS(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRWRITEDOMAINCREDENTIALS, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRWRITEDOMAINCREDENTIALS,
@@ -2735,7 +2735,7 @@ NTSTATUS rpccli_lsa_CREDRREADDOMAINCREDENTIALS(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRREADDOMAINCREDENTIALS, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRREADDOMAINCREDENTIALS,
@@ -2771,7 +2771,7 @@ NTSTATUS rpccli_lsa_CREDRDELETE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRDELETE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRDELETE,
@@ -2807,7 +2807,7 @@ NTSTATUS rpccli_lsa_CREDRGETTARGETINFO(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRGETTARGETINFO, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRGETTARGETINFO,
@@ -2843,7 +2843,7 @@ NTSTATUS rpccli_lsa_CREDRPROFILELOADED(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRPROFILELOADED, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRPROFILELOADED,
@@ -2896,7 +2896,7 @@ NTSTATUS rpccli_lsa_LookupNames3(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupNames3, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPNAMES3,
@@ -2935,7 +2935,7 @@ NTSTATUS rpccli_lsa_CREDRGETSESSIONTYPES(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRGETSESSIONTYPES, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRGETSESSIONTYPES,
@@ -2971,7 +2971,7 @@ NTSTATUS rpccli_lsa_LSARREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LSARREGISTERAUDITEVENT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARREGISTERAUDITEVENT,
@@ -3007,7 +3007,7 @@ NTSTATUS rpccli_lsa_LSARGENAUDITEVENT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LSARGENAUDITEVENT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARGENAUDITEVENT,
@@ -3043,7 +3043,7 @@ NTSTATUS rpccli_lsa_LSARUNREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LSARUNREGISTERAUDITEVENT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARUNREGISTERAUDITEVENT,
@@ -3086,7 +3086,7 @@ NTSTATUS rpccli_lsa_lsaRQueryForestTrustInformation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_lsaRQueryForestTrustInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION,
@@ -3123,7 +3123,7 @@ NTSTATUS rpccli_lsa_LSARSETFORESTTRUSTINFORMATION(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LSARSETFORESTTRUSTINFORMATION, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARSETFORESTTRUSTINFORMATION,
@@ -3159,7 +3159,7 @@ NTSTATUS rpccli_lsa_CREDRRENAME(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_CREDRRENAME, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_CREDRRENAME,
@@ -3208,7 +3208,7 @@ NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupSids3, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPSIDS3,
@@ -3262,7 +3262,7 @@ NTSTATUS rpccli_lsa_LookupNames4(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LookupNames4, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LOOKUPNAMES4,
@@ -3301,7 +3301,7 @@ NTSTATUS rpccli_lsa_LSAROPENPOLICYSCE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LSAROPENPOLICYSCE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSAROPENPOLICYSCE,
@@ -3337,7 +3337,7 @@ NTSTATUS rpccli_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(struct rpc_pipe_client *c
                NDR_PRINT_IN_DEBUG(lsa_LSARADTREGISTERSECURITYEVENTSOURCE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE,
@@ -3373,7 +3373,7 @@ NTSTATUS rpccli_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(struct rpc_pipe_client
                NDR_PRINT_IN_DEBUG(lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE,
@@ -3409,7 +3409,7 @@ NTSTATUS rpccli_lsa_LSARADTREPORTSECURITYEVENT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(lsa_LSARADTREPORTSECURITYEVENT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_lsarpc,
                                NDR_LSA_LSARADTREPORTSECURITYEVENT,

diff --git a/librpc/gen_ndr/cli_netlogon.c b/librpc/gen_ndr/cli_netlogon.c
index 2dcdbaeb9bae1e67ca782400621a2a0edda7076b..456bb71a3db5877b8b392abe511739bf9453749e 100644 (file)
--- a/librpc/gen_ndr/cli_netlogon.c
+++ b/librpc/gen_ndr/cli_netlogon.c
@@ -26,7 +26,7 @@ NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonUasLogon, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONUASLOGON,
@@ -75,7 +75,7 @@ NTSTATUS rpccli_netr_LogonUasLogoff(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonUasLogoff, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONUASLOGOFF,
@@ -132,7 +132,7 @@ NTSTATUS rpccli_netr_LogonSamLogon(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonSamLogon, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONSAMLOGON,
@@ -185,7 +185,7 @@ NTSTATUS rpccli_netr_LogonSamLogoff(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonSamLogoff, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONSAMLOGOFF,
@@ -231,7 +231,7 @@ NTSTATUS rpccli_netr_ServerReqChallenge(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerReqChallenge, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERREQCHALLENGE,
@@ -279,7 +279,7 @@ NTSTATUS rpccli_netr_ServerAuthenticate(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerAuthenticate, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERAUTHENTICATE,
@@ -329,7 +329,7 @@ NTSTATUS rpccli_netr_ServerPasswordSet(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerPasswordSet, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERPASSWORDSET,
@@ -381,7 +381,7 @@ NTSTATUS rpccli_netr_DatabaseDeltas(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DatabaseDeltas, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DATABASEDELTAS,
@@ -435,7 +435,7 @@ NTSTATUS rpccli_netr_DatabaseSync(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DatabaseSync, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DATABASESYNC,
@@ -494,7 +494,7 @@ NTSTATUS rpccli_netr_AccountDeltas(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_AccountDeltas, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_ACCOUNTDELTAS,
@@ -555,7 +555,7 @@ NTSTATUS rpccli_netr_AccountSync(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_AccountSync, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_ACCOUNTSYNC,
@@ -603,7 +603,7 @@ NTSTATUS rpccli_netr_GetDcName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_GetDcName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_GETDCNAME,
@@ -652,7 +652,7 @@ NTSTATUS rpccli_netr_LogonControl(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonControl, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONCONTROL,
@@ -699,7 +699,7 @@ NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_GetAnyDCName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_GETANYDCNAME,
@@ -750,7 +750,7 @@ NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonControl2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONCONTROL2,
@@ -804,7 +804,7 @@ NTSTATUS rpccli_netr_ServerAuthenticate2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerAuthenticate2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERAUTHENTICATE2,
@@ -859,7 +859,7 @@ NTSTATUS rpccli_netr_DatabaseSync2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DatabaseSync2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DATABASESYNC2,
@@ -911,7 +911,7 @@ NTSTATUS rpccli_netr_DatabaseRedo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DatabaseRedo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DATABASEREDO,
@@ -959,7 +959,7 @@ NTSTATUS rpccli_netr_LogonControl2Ex(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonControl2Ex, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONCONTROL2EX,
@@ -1004,7 +1004,7 @@ NTSTATUS rpccli_netr_NetrEnumerateTrustedDomains(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NetrEnumerateTrustedDomains, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRENUMERATETRUSTEDDOMAINS,
@@ -1057,7 +1057,7 @@ NTSTATUS rpccli_netr_DsRGetDCName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRGetDCName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRGETDCNAME,
@@ -1099,7 +1099,7 @@ NTSTATUS rpccli_netr_NETRLOGONDUMMYROUTINE1(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NETRLOGONDUMMYROUTINE1, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRLOGONDUMMYROUTINE1,
@@ -1140,7 +1140,7 @@ NTSTATUS rpccli_netr_NETRLOGONSETSERVICEBITS(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NETRLOGONSETSERVICEBITS, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRLOGONSETSERVICEBITS,
@@ -1186,7 +1186,7 @@ NTSTATUS rpccli_netr_LogonGetTrustRid(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonGetTrustRid, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONGETTRUSTRID,
@@ -1228,7 +1228,7 @@ NTSTATUS rpccli_netr_NETRLOGONCOMPUTESERVERDIGEST(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NETRLOGONCOMPUTESERVERDIGEST, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST,
@@ -1269,7 +1269,7 @@ NTSTATUS rpccli_netr_NETRLOGONCOMPUTECLIENTDIGEST(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NETRLOGONCOMPUTECLIENTDIGEST, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST,
@@ -1323,7 +1323,7 @@ NTSTATUS rpccli_netr_ServerAuthenticate3(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerAuthenticate3, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERAUTHENTICATE3,
@@ -1374,7 +1374,7 @@ NTSTATUS rpccli_netr_DsRGetDCNameEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRGetDCNameEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRGETDCNAMEEX,
@@ -1419,7 +1419,7 @@ NTSTATUS rpccli_netr_DsRGetSiteName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRGetSiteName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRGETSITENAME,
@@ -1473,7 +1473,7 @@ NTSTATUS rpccli_netr_LogonGetDomainInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonGetDomainInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONGETDOMAININFO,
@@ -1524,7 +1524,7 @@ NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerPasswordSet2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERPASSWORDSET2,
@@ -1574,7 +1574,7 @@ NTSTATUS rpccli_netr_ServerPasswordGet(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerPasswordGet, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERPASSWORDGET,
@@ -1617,7 +1617,7 @@ NTSTATUS rpccli_netr_NETRLOGONSENDTOSAM(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NETRLOGONSENDTOSAM, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRLOGONSENDTOSAM,
@@ -1665,7 +1665,7 @@ NTSTATUS rpccli_netr_DsRAddressToSitenamesW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRAddressToSitenamesW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRADDRESSTOSITENAMESW,
@@ -1722,7 +1722,7 @@ NTSTATUS rpccli_netr_DsRGetDCNameEx2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRGetDCNameEx2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRGETDCNAMEEX2,
@@ -1764,7 +1764,7 @@ NTSTATUS rpccli_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(struct rpc_pipe_client
                NDR_PRINT_IN_DEBUG(netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
@@ -1808,7 +1808,7 @@ NTSTATUS rpccli_netr_NetrEnumerateTrustedDomainsEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_NetrEnumerateTrustedDomainsEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX,
@@ -1857,7 +1857,7 @@ NTSTATUS rpccli_netr_DsRAddressToSitenamesExW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRAddressToSitenamesExW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRADDRESSTOSITENAMESEXW,
@@ -1902,7 +1902,7 @@ NTSTATUS rpccli_netr_DsrGetDcSiteCoverageW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsrGetDcSiteCoverageW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRGETDCSITECOVERAGEW,
@@ -1957,7 +1957,7 @@ NTSTATUS rpccli_netr_LogonSamLogonEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonSamLogonEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONSAMLOGONEX,
@@ -2002,7 +2002,7 @@ NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsrEnumerateDomainTrusts, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRENUMERATEDOMAINTRUSTS,
@@ -2054,7 +2054,7 @@ NTSTATUS rpccli_netr_DsrDeregisterDNSHostRecords(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsrDeregisterDNSHostRecords, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS,
@@ -2107,7 +2107,7 @@ NTSTATUS rpccli_netr_ServerTrustPasswordsGet(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerTrustPasswordsGet, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERTRUSTPASSWORDSGET,
@@ -2154,7 +2154,7 @@ NTSTATUS rpccli_netr_DsRGetForestTrustInformation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_DsRGetForestTrustInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_DSRGETFORESTTRUSTINFORMATION,
@@ -2206,7 +2206,7 @@ NTSTATUS rpccli_netr_GetForestTrustInformation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_GetForestTrustInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_GETFORESTTRUSTINFORMATION,
@@ -2266,7 +2266,7 @@ NTSTATUS rpccli_netr_LogonSamLogonWithFlags(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_LogonSamLogonWithFlags, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_LOGONSAMLOGONWITHFLAGS,
@@ -2322,7 +2322,7 @@ NTSTATUS rpccli_netr_ServerGetTrustInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(netr_ServerGetTrustInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_netlogon,
                                NDR_NETR_SERVERGETTRUSTINFO,

diff --git a/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c
index 0736a027f9adff0e19ae1d1c6f41c1d13929f92f..179368de14a454644948faefe663fb51e7ec7c3e 100644 (file)
--- a/librpc/gen_ndr/cli_ntsvcs.c
+++ b/librpc/gen_ndr/cli_ntsvcs.c
@@ -19,7 +19,7 @@ NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_Disconnect, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_DISCONNECT,
@@ -60,7 +60,7 @@ NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_Connect, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_CONNECT,
@@ -102,7 +102,7 @@ NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetVersion, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETVERSION,
@@ -144,7 +144,7 @@ NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetGlobalState, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETGLOBALSTATE,
@@ -185,7 +185,7 @@ NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_InitDetection, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_INITDETECTION,
@@ -226,7 +226,7 @@ NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_ReportLogOn, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_REPORTLOGON,
@@ -271,7 +271,7 @@ NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_ValidateDeviceInstance, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_VALIDATEDEVICEINSTANCE,
@@ -312,7 +312,7 @@ NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetRootDeviceInstance, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETROOTDEVICEINSTANCE,
@@ -353,7 +353,7 @@ NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetRelatedDeviceInstance, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETRELATEDDEVICEINSTANCE,
@@ -394,7 +394,7 @@ NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_EnumerateSubKeys, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_ENUMERATESUBKEYS,
@@ -442,7 +442,7 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetDeviceList, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETDEVICELIST,
@@ -490,7 +490,7 @@ NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetDeviceListSize, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETDEVICELISTSIZE,
@@ -532,7 +532,7 @@ NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetDepth, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETDEPTH,
@@ -586,7 +586,7 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetDeviceRegProp, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETDEVICEREGPROP,
@@ -631,7 +631,7 @@ NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_SetDeviceRegProp, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_SETDEVICEREGPROP,
@@ -672,7 +672,7 @@ NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetClassInstance, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETCLASSINSTANCE,
@@ -713,7 +713,7 @@ NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_CreateKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_CREATEKEY,
@@ -754,7 +754,7 @@ NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_DeleteRegistryKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_DELETEREGISTRYKEY,
@@ -795,7 +795,7 @@ NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetClassCount, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETCLASSCOUNT,
@@ -836,7 +836,7 @@ NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetClassName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETCLASSNAME,
@@ -877,7 +877,7 @@ NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_DeleteClassKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_DELETECLASSKEY,
@@ -918,7 +918,7 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetInterfaceDeviceAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETINTERFACEDEVICEALIAS,
@@ -959,7 +959,7 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetInterfaceDeviceList, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETINTERFACEDEVICELIST,
@@ -1000,7 +1000,7 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceListSize(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetInterfaceDeviceListSize, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETINTERFACEDEVICELISTSIZE,
@@ -1041,7 +1041,7 @@ NTSTATUS rpccli_PNP_RegisterDeviceClassAssociation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_RegisterDeviceClassAssociation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_REGISTERDEVICECLASSASSOCIATION,
@@ -1082,7 +1082,7 @@ NTSTATUS rpccli_PNP_UnregisterDeviceClassAssociation(struct rpc_pipe_client *cli
                NDR_PRINT_IN_DEBUG(PNP_UnregisterDeviceClassAssociation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_UNREGISTERDEVICECLASSASSOCIATION,
@@ -1123,7 +1123,7 @@ NTSTATUS rpccli_PNP_GetClassRegProp(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetClassRegProp, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETCLASSREGPROP,
@@ -1164,7 +1164,7 @@ NTSTATUS rpccli_PNP_SetClassRegProp(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_SetClassRegProp, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_SETCLASSREGPROP,
@@ -1205,7 +1205,7 @@ NTSTATUS rpccli_PNP_CreateDevInst(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_CreateDevInst, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_CREATEDEVINST,
@@ -1246,7 +1246,7 @@ NTSTATUS rpccli_PNP_DeviceInstanceAction(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_DeviceInstanceAction, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_DEVICEINSTANCEACTION,
@@ -1287,7 +1287,7 @@ NTSTATUS rpccli_PNP_GetDeviceStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetDeviceStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETDEVICESTATUS,
@@ -1328,7 +1328,7 @@ NTSTATUS rpccli_PNP_SetDeviceProblem(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_SetDeviceProblem, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_SETDEVICEPROBLEM,
@@ -1369,7 +1369,7 @@ NTSTATUS rpccli_PNP_DisableDevInst(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_DisableDevInst, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_DISABLEDEVINST,
@@ -1410,7 +1410,7 @@ NTSTATUS rpccli_PNP_UninstallDevInst(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_UninstallDevInst, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_UNINSTALLDEVINST,
@@ -1451,7 +1451,7 @@ NTSTATUS rpccli_PNP_AddID(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_AddID, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_ADDID,
@@ -1492,7 +1492,7 @@ NTSTATUS rpccli_PNP_RegisterDriver(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_RegisterDriver, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_REGISTERDRIVER,
@@ -1533,7 +1533,7 @@ NTSTATUS rpccli_PNP_QueryRemove(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_QueryRemove, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_QUERYREMOVE,
@@ -1574,7 +1574,7 @@ NTSTATUS rpccli_PNP_RequestDeviceEject(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_RequestDeviceEject, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_REQUESTDEVICEEJECT,
@@ -1615,7 +1615,7 @@ NTSTATUS rpccli_PNP_IsDockStationPresent(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_IsDockStationPresent, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_ISDOCKSTATIONPRESENT,
@@ -1656,7 +1656,7 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_RequestEjectPC, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_REQUESTEJECTPC,
@@ -1714,7 +1714,7 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_HwProfFlags, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_HWPROFFLAGS,
@@ -1770,7 +1770,7 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetHwProfInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETHWPROFINFO,
@@ -1812,7 +1812,7 @@ NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_AddEmptyLogConf, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_ADDEMPTYLOGCONF,
@@ -1853,7 +1853,7 @@ NTSTATUS rpccli_PNP_FreeLogConf(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_FreeLogConf, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_FREELOGCONF,
@@ -1894,7 +1894,7 @@ NTSTATUS rpccli_PNP_GetFirstLogConf(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetFirstLogConf, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETFIRSTLOGCONF,
@@ -1935,7 +1935,7 @@ NTSTATUS rpccli_PNP_GetNextLogConf(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetNextLogConf, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETNEXTLOGCONF,
@@ -1976,7 +1976,7 @@ NTSTATUS rpccli_PNP_GetLogConfPriority(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetLogConfPriority, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETLOGCONFPRIORITY,
@@ -2017,7 +2017,7 @@ NTSTATUS rpccli_PNP_AddResDes(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_AddResDes, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_ADDRESDES,
@@ -2058,7 +2058,7 @@ NTSTATUS rpccli_PNP_FreeResDes(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_FreeResDes, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_FREERESDES,
@@ -2099,7 +2099,7 @@ NTSTATUS rpccli_PNP_GetNextResDes(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetNextResDes, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETNEXTRESDES,
@@ -2140,7 +2140,7 @@ NTSTATUS rpccli_PNP_GetResDesData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetResDesData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETRESDESDATA,
@@ -2181,7 +2181,7 @@ NTSTATUS rpccli_PNP_GetResDesDataSize(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetResDesDataSize, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETRESDESDATASIZE,
@@ -2222,7 +2222,7 @@ NTSTATUS rpccli_PNP_ModifyResDes(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_ModifyResDes, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_MODIFYRESDES,
@@ -2263,7 +2263,7 @@ NTSTATUS rpccli_PNP_DetectResourceLimit(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_DetectResourceLimit, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_DETECTRESOURCELIMIT,
@@ -2304,7 +2304,7 @@ NTSTATUS rpccli_PNP_QueryResConfList(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_QueryResConfList, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_QUERYRESCONFLIST,
@@ -2345,7 +2345,7 @@ NTSTATUS rpccli_PNP_SetHwProf(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_SetHwProf, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_SETHWPROF,
@@ -2386,7 +2386,7 @@ NTSTATUS rpccli_PNP_QueryArbitratorFreeData(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_QueryArbitratorFreeData, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_QUERYARBITRATORFREEDATA,
@@ -2427,7 +2427,7 @@ NTSTATUS rpccli_PNP_QueryArbitratorFreeSize(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_QueryArbitratorFreeSize, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_QUERYARBITRATORFREESIZE,
@@ -2468,7 +2468,7 @@ NTSTATUS rpccli_PNP_RunDetection(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_RunDetection, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_RUNDETECTION,
@@ -2509,7 +2509,7 @@ NTSTATUS rpccli_PNP_RegisterNotification(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_RegisterNotification, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_REGISTERNOTIFICATION,
@@ -2550,7 +2550,7 @@ NTSTATUS rpccli_PNP_UnregisterNotification(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_UnregisterNotification, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_UNREGISTERNOTIFICATION,
@@ -2591,7 +2591,7 @@ NTSTATUS rpccli_PNP_GetCustomDevProp(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetCustomDevProp, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETCUSTOMDEVPROP,
@@ -2632,7 +2632,7 @@ NTSTATUS rpccli_PNP_GetVersionInternal(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetVersionInternal, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETVERSIONINTERNAL,
@@ -2673,7 +2673,7 @@ NTSTATUS rpccli_PNP_GetBlockedDriverInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetBlockedDriverInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETBLOCKEDDRIVERINFO,
@@ -2714,7 +2714,7 @@ NTSTATUS rpccli_PNP_GetServerSideDeviceInstallFlags(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(PNP_GetServerSideDeviceInstallFlags, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_ntsvcs,
                                NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS,

diff --git a/librpc/gen_ndr/cli_samr.c b/librpc/gen_ndr/cli_samr.c
index 9099d0b35d74809c0873c5fbc9628f692556b36f..1e3bd122b8faee308c3d635cd605b52f4bdd8139 100644 (file)
--- a/librpc/gen_ndr/cli_samr.c
+++ b/librpc/gen_ndr/cli_samr.c
@@ -23,7 +23,7 @@ NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Connect, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CONNECT,
@@ -62,7 +62,7 @@ NTSTATUS rpccli_samr_Close(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Close, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CLOSE,
@@ -105,7 +105,7 @@ NTSTATUS rpccli_samr_SetSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETSECURITY,
@@ -146,7 +146,7 @@ NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QuerySecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYSECURITY,
@@ -185,7 +185,7 @@ NTSTATUS rpccli_samr_Shutdown(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Shutdown, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SHUTDOWN,
@@ -226,7 +226,7 @@ NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_LookupDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_LOOKUPDOMAIN,
@@ -271,7 +271,7 @@ NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_EnumDomains, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ENUMDOMAINS,
@@ -317,7 +317,7 @@ NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_OpenDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_OPENDOMAIN,
@@ -359,7 +359,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryDomainInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYDOMAININFO,
@@ -402,7 +402,7 @@ NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetDomainInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETDOMAININFO,
@@ -446,7 +446,7 @@ NTSTATUS rpccli_samr_CreateDomainGroup(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_CreateDomainGroup, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CREATEDOMAINGROUP,
@@ -492,7 +492,7 @@ NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_EnumDomainGroups, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ENUMDOMAINGROUPS,
@@ -539,7 +539,7 @@ NTSTATUS rpccli_samr_CreateUser(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_CreateUser, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CREATEUSER,
@@ -587,7 +587,7 @@ NTSTATUS rpccli_samr_EnumDomainUsers(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_EnumDomainUsers, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ENUMDOMAINUSERS,
@@ -634,7 +634,7 @@ NTSTATUS rpccli_samr_CreateDomAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_CreateDomAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CREATEDOMALIAS,
@@ -680,7 +680,7 @@ NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_EnumDomainAliases, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ENUMDOMAINALIASES,
@@ -724,7 +724,7 @@ NTSTATUS rpccli_samr_GetAliasMembership(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetAliasMembership, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETALIASMEMBERSHIP,
@@ -769,7 +769,7 @@ NTSTATUS rpccli_samr_LookupNames(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_LookupNames, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_LOOKUPNAMES,
@@ -815,7 +815,7 @@ NTSTATUS rpccli_samr_LookupRids(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_LookupRids, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_LOOKUPRIDS,
@@ -860,7 +860,7 @@ NTSTATUS rpccli_samr_OpenGroup(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_OpenGroup, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_OPENGROUP,
@@ -902,7 +902,7 @@ NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryGroupInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYGROUPINFO,
@@ -945,7 +945,7 @@ NTSTATUS rpccli_samr_SetGroupInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetGroupInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETGROUPINFO,
@@ -987,7 +987,7 @@ NTSTATUS rpccli_samr_AddGroupMember(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_AddGroupMember, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ADDGROUPMEMBER,
@@ -1025,7 +1025,7 @@ NTSTATUS rpccli_samr_DeleteDomainGroup(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_DeleteDomainGroup, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_DELETEDOMAINGROUP,
@@ -1066,7 +1066,7 @@ NTSTATUS rpccli_samr_DeleteGroupMember(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_DeleteGroupMember, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_DELETEGROUPMEMBER,
@@ -1105,7 +1105,7 @@ NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryGroupMember, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYGROUPMEMBER,
@@ -1148,7 +1148,7 @@ NTSTATUS rpccli_samr_SetMemberAttributesOfGroup(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetMemberAttributesOfGroup, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP,
@@ -1191,7 +1191,7 @@ NTSTATUS rpccli_samr_OpenAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_OpenAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_OPENALIAS,
@@ -1233,7 +1233,7 @@ NTSTATUS rpccli_samr_QueryAliasInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryAliasInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYALIASINFO,
@@ -1276,7 +1276,7 @@ NTSTATUS rpccli_samr_SetAliasInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetAliasInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETALIASINFO,
@@ -1314,7 +1314,7 @@ NTSTATUS rpccli_samr_DeleteDomAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_DeleteDomAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_DELETEDOMALIAS,
@@ -1355,7 +1355,7 @@ NTSTATUS rpccli_samr_AddAliasMember(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_AddAliasMember, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ADDALIASMEMBER,
@@ -1395,7 +1395,7 @@ NTSTATUS rpccli_samr_DeleteAliasMember(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_DeleteAliasMember, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_DELETEALIASMEMBER,
@@ -1434,7 +1434,7 @@ NTSTATUS rpccli_samr_GetMembersInAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetMembersInAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETMEMBERSINALIAS,
@@ -1478,7 +1478,7 @@ NTSTATUS rpccli_samr_OpenUser(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_OpenUser, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_OPENUSER,
@@ -1517,7 +1517,7 @@ NTSTATUS rpccli_samr_DeleteUser(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_DeleteUser, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_DELETEUSER,
@@ -1559,7 +1559,7 @@ NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryUserInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYUSERINFO,
@@ -1602,7 +1602,7 @@ NTSTATUS rpccli_samr_SetUserInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetUserInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETUSERINFO,
@@ -1660,7 +1660,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_ChangePasswordUser, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CHANGEPASSWORDUSER,
@@ -1699,7 +1699,7 @@ NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetGroupsForUser, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETGROUPSFORUSER,
@@ -1749,7 +1749,7 @@ NTSTATUS rpccli_samr_QueryDisplayInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryDisplayInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYDISPLAYINFO,
@@ -1795,7 +1795,7 @@ NTSTATUS rpccli_samr_GetDisplayEnumerationIndex(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetDisplayEnumerationIndex, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETDISPLAYENUMERATIONINDEX,
@@ -1834,7 +1834,7 @@ NTSTATUS rpccli_samr_TestPrivateFunctionsDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_TestPrivateFunctionsDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN,
@@ -1872,7 +1872,7 @@ NTSTATUS rpccli_samr_TestPrivateFunctionsUser(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_TestPrivateFunctionsUser, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_TESTPRIVATEFUNCTIONSUSER,
@@ -1911,7 +1911,7 @@ NTSTATUS rpccli_samr_GetUserPwInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetUserPwInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETUSERPWINFO,
@@ -1952,7 +1952,7 @@ NTSTATUS rpccli_samr_RemoveMemberFromForeignDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_RemoveMemberFromForeignDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN,
@@ -1993,7 +1993,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryDomainInfo2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYDOMAININFO2,
@@ -2035,7 +2035,7 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryUserInfo2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYUSERINFO2,
@@ -2085,7 +2085,7 @@ NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryDisplayInfo2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYDISPLAYINFO2,
@@ -2131,7 +2131,7 @@ NTSTATUS rpccli_samr_GetDisplayEnumerationIndex2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetDisplayEnumerationIndex2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETDISPLAYENUMERATIONINDEX2,
@@ -2179,7 +2179,7 @@ NTSTATUS rpccli_samr_CreateUser2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_CreateUser2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CREATEUSER2,
@@ -2231,7 +2231,7 @@ NTSTATUS rpccli_samr_QueryDisplayInfo3(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_QueryDisplayInfo3, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_QUERYDISPLAYINFO3,
@@ -2274,7 +2274,7 @@ NTSTATUS rpccli_samr_AddMultipleMembersToAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_AddMultipleMembersToAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS,
@@ -2314,7 +2314,7 @@ NTSTATUS rpccli_samr_RemoveMultipleMembersFromAlias(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_RemoveMultipleMembersFromAlias, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS,
@@ -2358,7 +2358,7 @@ NTSTATUS rpccli_samr_OemChangePasswordUser2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_OemChangePasswordUser2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_OEMCHANGEPASSWORDUSER2,
@@ -2408,7 +2408,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_ChangePasswordUser2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CHANGEPASSWORDUSER2,
@@ -2447,7 +2447,7 @@ NTSTATUS rpccli_samr_GetDomPwInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetDomPwInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETDOMPWINFO,
@@ -2489,7 +2489,7 @@ NTSTATUS rpccli_samr_Connect2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Connect2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CONNECT2,
@@ -2532,7 +2532,7 @@ NTSTATUS rpccli_samr_SetUserInfo2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetUserInfo2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETUSERINFO2,
@@ -2576,7 +2576,7 @@ NTSTATUS rpccli_samr_SetBootKeyInformation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetBootKeyInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETBOOTKEYINFORMATION,
@@ -2615,7 +2615,7 @@ NTSTATUS rpccli_samr_GetBootKeyInformation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_GetBootKeyInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_GETBOOTKEYINFORMATION,
@@ -2659,7 +2659,7 @@ NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Connect3, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CONNECT3,
@@ -2703,7 +2703,7 @@ NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Connect4, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CONNECT4,
@@ -2758,7 +2758,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_ChangePasswordUser3, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CHANGEPASSWORDUSER3,
@@ -2807,7 +2807,7 @@ NTSTATUS rpccli_samr_Connect5(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_Connect5, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_CONNECT5,
@@ -2851,7 +2851,7 @@ NTSTATUS rpccli_samr_RidToSid(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_RidToSid, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_RIDTOSID,
@@ -2894,7 +2894,7 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_SetDsrmPassword, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_SETDSRMPASSWORD,
@@ -2935,7 +2935,7 @@ NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(samr_ValidatePassword, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_samr,
                                NDR_SAMR_VALIDATEPASSWORD,

diff --git a/librpc/gen_ndr/cli_srvsvc.c b/librpc/gen_ndr/cli_srvsvc.c
index 1428d3d88802cd3a910e1d96c63b97caedf9011b..d372510135bbf5c0b2a2a949eae823cde3bae5e8 100644 (file)
--- a/librpc/gen_ndr/cli_srvsvc.c
+++ b/librpc/gen_ndr/cli_srvsvc.c
@@ -28,7 +28,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVENUM,
@@ -81,7 +81,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVGETINFO,
@@ -129,7 +129,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevControl(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevControl, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVCONTROL,
@@ -181,7 +181,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevQEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVQENUM,
@@ -236,7 +236,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevQGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVQGETINFO,
@@ -288,7 +288,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQSetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevQSetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVQSETINFO,
@@ -336,7 +336,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQPurge(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevQPurge, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVQPURGE,
@@ -383,7 +383,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQPurgeSelf(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetCharDevQPurgeSelf, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCHARDEVQPURGESELF,
@@ -435,7 +435,7 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetConnEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETCONNENUM,
@@ -494,7 +494,7 @@ NTSTATUS rpccli_srvsvc_NetFileEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetFileEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETFILEENUM,
@@ -547,7 +547,7 @@ NTSTATUS rpccli_srvsvc_NetFileGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetFileGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETFILEGETINFO,
@@ -593,7 +593,7 @@ NTSTATUS rpccli_srvsvc_NetFileClose(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetFileClose, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETFILECLOSE,
@@ -647,7 +647,7 @@ NTSTATUS rpccli_srvsvc_NetSessEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetSessEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSESSENUM,
@@ -699,7 +699,7 @@ NTSTATUS rpccli_srvsvc_NetSessDel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetSessDel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSESSDEL,
@@ -748,7 +748,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareAdd, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREADD,
@@ -801,7 +801,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareEnumAll, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREENUMALL,
@@ -854,7 +854,7 @@ NTSTATUS rpccli_srvsvc_NetShareGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREGETINFO,
@@ -906,7 +906,7 @@ NTSTATUS rpccli_srvsvc_NetShareSetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareSetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHARESETINFO,
@@ -956,7 +956,7 @@ NTSTATUS rpccli_srvsvc_NetShareDel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareDel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREDEL,
@@ -1003,7 +1003,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelSticky(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareDelSticky, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREDELSTICKY,
@@ -1049,7 +1049,7 @@ NTSTATUS rpccli_srvsvc_NetShareCheck(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareCheck, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHARECHECK,
@@ -1096,7 +1096,7 @@ NTSTATUS rpccli_srvsvc_NetSrvGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetSrvGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSRVGETINFO,
@@ -1146,7 +1146,7 @@ NTSTATUS rpccli_srvsvc_NetSrvSetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetSrvSetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSRVSETINFO,
@@ -1201,7 +1201,7 @@ NTSTATUS rpccli_srvsvc_NetDiskEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetDiskEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETDISKENUM,
@@ -1256,7 +1256,7 @@ NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetServerStatisticsGet, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSERVERSTATISTICSGET,
@@ -1304,7 +1304,7 @@ NTSTATUS rpccli_srvsvc_NetTransportAdd(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetTransportAdd, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETTRANSPORTADD,
@@ -1354,7 +1354,7 @@ NTSTATUS rpccli_srvsvc_NetTransportEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetTransportEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETTRANSPORTENUM,
@@ -1406,7 +1406,7 @@ NTSTATUS rpccli_srvsvc_NetTransportDel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetTransportDel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETTRANSPORTDEL,
@@ -1450,7 +1450,7 @@ NTSTATUS rpccli_srvsvc_NetRemoteTOD(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetRemoteTOD, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETREMOTETOD,
@@ -1500,7 +1500,7 @@ NTSTATUS rpccli_srvsvc_NetSetServiceBits(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetSetServiceBits, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSETSERVICEBITS,
@@ -1548,7 +1548,7 @@ NTSTATUS rpccli_srvsvc_NetPathType(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetPathType, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETPATHTYPE,
@@ -1603,7 +1603,7 @@ NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetPathCanonicalize, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETPATHCANONICALIZE,
@@ -1656,7 +1656,7 @@ NTSTATUS rpccli_srvsvc_NetPathCompare(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetPathCompare, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETPATHCOMPARE,
@@ -1705,7 +1705,7 @@ NTSTATUS rpccli_srvsvc_NetNameValidate(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetNameValidate, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETNAMEVALIDATE,
@@ -1746,7 +1746,7 @@ NTSTATUS rpccli_srvsvc_NETRPRNAMECANONICALIZE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRPRNAMECANONICALIZE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRPRNAMECANONICALIZE,
@@ -1797,7 +1797,7 @@ NTSTATUS rpccli_srvsvc_NetPRNameCompare(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetPRNameCompare, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETPRNAMECOMPARE,
@@ -1847,7 +1847,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREENUM,
@@ -1900,7 +1900,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelStart(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareDelStart, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREDELSTART,
@@ -1946,7 +1946,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelCommit(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetShareDelCommit, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSHAREDELCOMMIT,
@@ -1999,7 +1999,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetGetFileSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETGETFILESECURITY,
@@ -2051,7 +2051,7 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetSetFileSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSETFILESECURITY,
@@ -2098,7 +2098,7 @@ NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetServerTransportAddEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSERVERTRANSPORTADDEX,
@@ -2151,7 +2151,7 @@ NTSTATUS rpccli_srvsvc_NetServerSetServiceBitsEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NetServerSetServiceBitsEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETSERVERSETSERVICEBITSEX,
@@ -2192,7 +2192,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSGETVERSION(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSGETVERSION, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSGETVERSION,
@@ -2233,7 +2233,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSCREATELOCALPARTITION(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSCREATELOCALPARTITION, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSCREATELOCALPARTITION,
@@ -2274,7 +2274,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSDELETELOCALPARTITION(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSDELETELOCALPARTITION, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSDELETELOCALPARTITION,
@@ -2315,7 +2315,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSSETLOCALVOLUMESTATE, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE,
@@ -2356,7 +2356,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSSETSERVERINFO(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSSETSERVERINFO, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSSETSERVERINFO,
@@ -2397,7 +2397,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSCREATEEXITPOINT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSCREATEEXITPOINT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSCREATEEXITPOINT,
@@ -2438,7 +2438,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSDELETEEXITPOINT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSDELETEEXITPOINT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSDELETEEXITPOINT,
@@ -2479,7 +2479,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSMODIFYPREFIX(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSMODIFYPREFIX, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSMODIFYPREFIX,
@@ -2520,7 +2520,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSFIXLOCALVOLUME(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSFIXLOCALVOLUME, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSFIXLOCALVOLUME,
@@ -2561,7 +2561,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRDFSMANAGERREPORTSITEINFO, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO,
@@ -2602,7 +2602,7 @@ NTSTATUS rpccli_srvsvc_NETRSERVERTRANSPORTDELEX(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(srvsvc_NETRSERVERTRANSPORTDELEX, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_srvsvc,
                                NDR_SRVSVC_NETRSERVERTRANSPORTDELEX,

diff --git a/librpc/gen_ndr/cli_svcctl.c b/librpc/gen_ndr/cli_svcctl.c
index 4a5f49049edbb6575d399990dec8e9ba7103fc98..4c013f52b3ea3b8ede35baeb497aabab0a280b5f 100644 (file)
--- a/librpc/gen_ndr/cli_svcctl.c
+++ b/librpc/gen_ndr/cli_svcctl.c
@@ -21,7 +21,7 @@ NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_CloseServiceHandle, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CLOSESERVICEHANDLE,
@@ -68,7 +68,7 @@ NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ControlService, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CONTROLSERVICE,
@@ -112,7 +112,7 @@ NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_DeleteService, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_DELETESERVICE,
@@ -156,7 +156,7 @@ NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_LockServiceDatabase, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_LOCKSERVICEDATABASE,
@@ -206,7 +206,7 @@ NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceObjectSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY,
@@ -257,7 +257,7 @@ NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SetServiceObjectSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SETSERVICEOBJECTSECURITY,
@@ -301,7 +301,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICESTATUS,
@@ -343,7 +343,7 @@ NTSTATUS rpccli_svcctl_SetServiceStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SetServiceStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SETSERVICESTATUS,
@@ -386,7 +386,7 @@ NTSTATUS rpccli_svcctl_UnlockServiceDatabase(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_UnlockServiceDatabase, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_UNLOCKSERVICEDATABASE,
@@ -428,7 +428,7 @@ NTSTATUS rpccli_svcctl_NotifyBootConfigStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_NotifyBootConfigStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS,
@@ -477,7 +477,7 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SCSetServiceBitsW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SCSETSERVICEBITSW,
@@ -539,7 +539,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfigW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIGW,
@@ -612,7 +612,7 @@ NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_CreateServiceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CREATESERVICEW,
@@ -666,7 +666,7 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_EnumDependentServicesW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMDEPENDENTSERVICESW,
@@ -723,7 +723,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_EnumServicesStatusW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMSERVICESSTATUSW,
@@ -777,7 +777,7 @@ NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenSCManagerW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSCMANAGERW,
@@ -826,7 +826,7 @@ NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenServiceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSERVICEW,
@@ -874,7 +874,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfigW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIGW,
@@ -923,7 +923,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceLockStatusW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICELOCKSTATUSW,
@@ -972,7 +972,7 @@ NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_StartServiceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_STARTSERVICEW,
@@ -1020,7 +1020,7 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceDisplayNameW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEDISPLAYNAMEW,
@@ -1072,7 +1072,7 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceKeyNameW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEKEYNAMEW,
@@ -1125,7 +1125,7 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SCSetServiceBitsA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SCSETSERVICEBITSA,
@@ -1187,7 +1187,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfigA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIGA,
@@ -1254,7 +1254,7 @@ NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_CreateServiceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CREATESERVICEA,
@@ -1307,7 +1307,7 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_EnumDependentServicesA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMDEPENDENTSERVICESA,
@@ -1366,7 +1366,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_EnumServicesStatusA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMSERVICESSTATUSA,
@@ -1420,7 +1420,7 @@ NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenSCManagerA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSCMANAGERA,
@@ -1468,7 +1468,7 @@ NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenServiceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSERVICEA,
@@ -1515,7 +1515,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfigA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIGA,
@@ -1564,7 +1564,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceLockStatusA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICELOCKSTATUSA,
@@ -1613,7 +1613,7 @@ NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_StartServiceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_STARTSERVICEA,
@@ -1661,7 +1661,7 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceDisplayNameA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEDISPLAYNAMEA,
@@ -1713,7 +1713,7 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceKeyNameA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEKEYNAMEA,
@@ -1758,7 +1758,7 @@ NTSTATUS rpccli_svcctl_GetCurrentGroupeStateW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetCurrentGroupeStateW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETCURRENTGROUPESTATEW,
@@ -1799,7 +1799,7 @@ NTSTATUS rpccli_svcctl_EnumServiceGroupW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_EnumServiceGroupW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMSERVICEGROUPW,
@@ -1846,7 +1846,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2A(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfig2A, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIG2A,
@@ -1893,7 +1893,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfig2W, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIG2W,
@@ -1942,7 +1942,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfig2A, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIG2A,
@@ -1993,7 +1993,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfig2W, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIG2W,
@@ -2044,7 +2044,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceStatusEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICESTATUSEX,
@@ -2103,7 +2103,7 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(EnumServicesStatusExA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_ENUMSERVICESSTATUSEXA,
@@ -2168,7 +2168,7 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(EnumServicesStatusExW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_ENUMSERVICESSTATUSEXW,
@@ -2215,7 +2215,7 @@ NTSTATUS rpccli_svcctl_SCSendTSMessage(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SCSendTSMessage, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SCSENDTSMESSAGE,

diff --git a/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c
index 00f9e2d610f96bb9d963610b9a763a90e3613d2d..b18554e63e11ee6f1ceaec5b27b7cccd8c8f6daa 100644 (file)
--- a/librpc/gen_ndr/cli_winreg.c
+++ b/librpc/gen_ndr/cli_winreg.c
@@ -24,7 +24,7 @@ NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKCR, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKCR,
@@ -71,7 +71,7 @@ NTSTATUS rpccli_winreg_OpenHKCU(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKCU, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKCU,
@@ -118,7 +118,7 @@ NTSTATUS rpccli_winreg_OpenHKLM(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKLM, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKLM,
@@ -165,7 +165,7 @@ NTSTATUS rpccli_winreg_OpenHKPD(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKPD, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKPD,
@@ -212,7 +212,7 @@ NTSTATUS rpccli_winreg_OpenHKU(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKU, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKU,
@@ -256,7 +256,7 @@ NTSTATUS rpccli_winreg_CloseKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_CloseKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_CLOSEKEY,
@@ -313,7 +313,7 @@ NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_CreateKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_CREATEKEY,
@@ -362,7 +362,7 @@ NTSTATUS rpccli_winreg_DeleteKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_DeleteKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_DELETEKEY,
@@ -407,7 +407,7 @@ NTSTATUS rpccli_winreg_DeleteValue(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_DeleteValue, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_DELETEVALUE,
@@ -458,7 +458,7 @@ NTSTATUS rpccli_winreg_EnumKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_EnumKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_ENUMKEY,
@@ -520,7 +520,7 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_EnumValue, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_ENUMVALUE,
@@ -576,7 +576,7 @@ NTSTATUS rpccli_winreg_FlushKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_FlushKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_FLUSHKEY,
@@ -623,7 +623,7 @@ NTSTATUS rpccli_winreg_GetKeySecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_GetKeySecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_GETKEYSECURITY,
@@ -671,7 +671,7 @@ NTSTATUS rpccli_winreg_LoadKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_LoadKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_LOADKEY,
@@ -726,7 +726,7 @@ NTSTATUS rpccli_winreg_NotifyChangeKeyValue(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_NotifyChangeKeyValue, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_NOTIFYCHANGEKEYVALUE,
@@ -776,7 +776,7 @@ NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENKEY,
@@ -830,7 +830,7 @@ NTSTATUS rpccli_winreg_QueryInfoKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_QueryInfoKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_QUERYINFOKEY,
@@ -892,7 +892,7 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_QueryValue, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_QUERYVALUE,
@@ -945,7 +945,7 @@ NTSTATUS rpccli_winreg_ReplaceKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_ReplaceKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_REPLACEKEY,
@@ -992,7 +992,7 @@ NTSTATUS rpccli_winreg_RestoreKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_RestoreKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_RESTOREKEY,
@@ -1039,7 +1039,7 @@ NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_SaveKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_SAVEKEY,
@@ -1086,7 +1086,7 @@ NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_SetKeySecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_SETKEYSECURITY,
@@ -1137,7 +1137,7 @@ NTSTATUS rpccli_winreg_SetValue(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_SetValue, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_SETVALUE,
@@ -1178,7 +1178,7 @@ NTSTATUS rpccli_winreg_UnLoadKey(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_UnLoadKey, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_UNLOADKEY,
@@ -1229,7 +1229,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_InitiateSystemShutdown, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_INITIATESYSTEMSHUTDOWN,
@@ -1272,7 +1272,7 @@ NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_AbortSystemShutdown, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_ABORTSYSTEMSHUTDOWN,
@@ -1316,7 +1316,7 @@ NTSTATUS rpccli_winreg_GetVersion(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_GetVersion, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_GETVERSION,
@@ -1363,7 +1363,7 @@ NTSTATUS rpccli_winreg_OpenHKCC(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKCC, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKCC,
@@ -1410,7 +1410,7 @@ NTSTATUS rpccli_winreg_OpenHKDD(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKDD, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKDD,
@@ -1462,7 +1462,7 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_QueryMultipleValues, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_QUERYMULTIPLEVALUES,
@@ -1520,7 +1520,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_InitiateSystemShutdownEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_INITIATESYSTEMSHUTDOWNEX,
@@ -1561,7 +1561,7 @@ NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_SaveKeyEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_SAVEKEYEX,
@@ -1607,7 +1607,7 @@ NTSTATUS rpccli_winreg_OpenHKPT(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKPT, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKPT,
@@ -1654,7 +1654,7 @@ NTSTATUS rpccli_winreg_OpenHKPN(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_OpenHKPN, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_OPENHKPN,
@@ -1696,7 +1696,7 @@ NTSTATUS rpccli_winreg_QueryMultipleValues2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(winreg_QueryMultipleValues2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_winreg,
                                NDR_WINREG_QUERYMULTIPLEVALUES2,

diff --git a/librpc/gen_ndr/cli_wkssvc.c b/librpc/gen_ndr/cli_wkssvc.c
index 628f7f973fe4b7c37accd2c57b0478e72b9245d8..c143058942cfcbc3cd046c1afa83cc94cf256450 100644 (file)
--- a/librpc/gen_ndr/cli_wkssvc.c
+++ b/librpc/gen_ndr/cli_wkssvc.c
@@ -24,7 +24,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetWkstaGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETWKSTAGETINFO,
@@ -74,7 +74,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetWkstaSetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETWKSTASETINFO,
@@ -125,7 +125,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetWkstaEnumUsers, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETWKSTAENUMUSERS,
@@ -176,7 +176,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaUserGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrWkstaUserGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRWKSTAUSERGETINFO,
@@ -226,7 +226,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaUserSetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrWkstaUserSetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRWKSTAUSERSETINFO,
@@ -279,7 +279,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetWkstaTransportEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETWKSTATRANSPORTENUM,
@@ -333,7 +333,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaTransportAdd(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrWkstaTransportAdd, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRWKSTATRANSPORTADD,
@@ -383,7 +383,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaTransportDel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrWkstaTransportDel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRWKSTATRANSPORTDEL,
@@ -432,7 +432,7 @@ NTSTATUS rpccli_wkssvc_NetrUseAdd(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrUseAdd, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRUSEADD,
@@ -483,7 +483,7 @@ NTSTATUS rpccli_wkssvc_NetrUseGetInfo(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrUseGetInfo, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRUSEGETINFO,
@@ -531,7 +531,7 @@ NTSTATUS rpccli_wkssvc_NetrUseDel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrUseDel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRUSEDEL,
@@ -581,7 +581,7 @@ NTSTATUS rpccli_wkssvc_NetrUseEnum(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrUseEnum, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRUSEENUM,
@@ -637,7 +637,7 @@ NTSTATUS rpccli_wkssvc_NetrMessageBufferSend(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrMessageBufferSend, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRMESSAGEBUFFERSEND,
@@ -687,7 +687,7 @@ NTSTATUS rpccli_wkssvc_NetrWorkstationStatisticsGet(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrWorkstationStatisticsGet, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET,
@@ -731,7 +731,7 @@ NTSTATUS rpccli_wkssvc_NetrLogonDomainNameAdd(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrLogonDomainNameAdd, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRLOGONDOMAINNAMEADD,
@@ -774,7 +774,7 @@ NTSTATUS rpccli_wkssvc_NetrLogonDomainNameDel(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrLogonDomainNameDel, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL,
@@ -827,7 +827,7 @@ NTSTATUS rpccli_wkssvc_NetrJoinDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrJoinDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRJOINDOMAIN,
@@ -876,7 +876,7 @@ NTSTATUS rpccli_wkssvc_NetrUnjoinDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrUnjoinDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRUNJOINDOMAIN,
@@ -927,7 +927,7 @@ NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrRenameMachineInDomain, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN,
@@ -978,7 +978,7 @@ NTSTATUS rpccli_wkssvc_NetrValidateName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrValidateName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRVALIDATENAME,
@@ -1024,7 +1024,7 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinInformation(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrGetJoinInformation, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRGETJOININFORMATION,
@@ -1078,7 +1078,7 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinableOus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrGetJoinableOus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRGETJOINABLEOUS,
@@ -1133,7 +1133,7 @@ NTSTATUS rpccli_wkssvc_NetrJoinDomain2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrJoinDomain2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRJOINDOMAIN2,
@@ -1182,7 +1182,7 @@ NTSTATUS rpccli_wkssvc_NetrUnjoinDomain2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrUnjoinDomain2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRUNJOINDOMAIN2,
@@ -1233,7 +1233,7 @@ NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrRenameMachineInDomain2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2,
@@ -1284,7 +1284,7 @@ NTSTATUS rpccli_wkssvc_NetrValidateName2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrValidateName2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRVALIDATENAME2,
@@ -1336,7 +1336,7 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinableOus2(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrGetJoinableOus2, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRGETJOINABLEOUS2,
@@ -1389,7 +1389,7 @@ NTSTATUS rpccli_wkssvc_NetrAddAlternateComputerName(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrAddAlternateComputerName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME,
@@ -1440,7 +1440,7 @@ NTSTATUS rpccli_wkssvc_NetrRemoveAlternateComputerName(struct rpc_pipe_client *c
                NDR_PRINT_IN_DEBUG(wkssvc_NetrRemoveAlternateComputerName, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME,
@@ -1491,7 +1491,7 @@ NTSTATUS rpccli_wkssvc_NetrSetPrimaryComputername(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrSetPrimaryComputername, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME,
@@ -1539,7 +1539,7 @@ NTSTATUS rpccli_wkssvc_NetrEnumerateComputerNames(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(wkssvc_NetrEnumerateComputerNames, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_wkssvc,
                                NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES,

diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 9a7a037b5444c6329d720db8326ff76844982a9d..1a0eb51438e373b1aeca05e1783cbd4741bc40f3 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -153,7 +153,7 @@ sub ParseFunction($$$)
        $self->deindent;
        $self->pidl("}");
        $self->pidl("");
-       $self->pidl("status = cli_do_rpc_ndr(cli,");
+       $self->pidl("status = cli->dispatch(cli,");
        $self->pidl("\t\t\tmem_ctx,");
        $self->pidl("\t\t\t&ndr_table_$if,");
        $self->pidl("\t\t\t$ufn,");

diff --git a/source3/include/client.h b/source3/include/client.h
index 587f3f6c67749274c1bc0fbf85c375c4180f3383..86b4bee662854027d31ca9a338347aaf90b09961 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -80,6 +80,11 @@ struct rpc_pipe_client {
        struct ndr_syntax_id abstract_syntax;
        struct ndr_syntax_id transfer_syntax;
 
+       NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
+                       TALLOC_CTX *mem_ctx,
+                       const struct ndr_interface_table *table,
+                       uint32_t opnum, void *r);
+
        char *desthost;
        char *srv_name_slash;
 

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index cf621343e741a02d95de22641c80028e46ded294..0a606f243852b0df4af609f638e8da5650f21b51 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3310,6 +3310,7 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
 
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
 
        result->desthost = talloc_strdup(result, host);
        result->srv_name_slash = talloc_asprintf_strupper_m(
@@ -3517,6 +3518,7 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
 
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
 
        result->desthost = talloc_get_myname(result);
        result->srv_name_slash = talloc_asprintf_strupper_m(
@@ -3602,6 +3604,7 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli,
        result->trans.np.cli = cli;
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
+       result->dispatch = cli_do_rpc_ndr;
        result->desthost = talloc_strdup(result, cli->desthost);
        result->srv_name_slash = talloc_asprintf_strupper_m(
                result, "\\\\%s", result->desthost);

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 2161286e08c6816f90069b537c6ffd23abdeacf5..b02a16229395f26938fe24ca8a0f8959cef42ad0 100644 (file)
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "events.h"
+#include "events/events.h"
 #include "ldb.h"
 #include "ldb_errors.h"
 #include "../lib/util/util_ldb.h"