s3: Do not reference ndr_table_<pipe> in the cli_ routines directly

diff --git a/librpc/gen_ndr/cli_dfs.c b/librpc/gen_ndr/cli_dfs.c
index 6ce5b5fcafb453f3aadc22ae3488597f7dc629e5..a8b6bfe83c1b17c6e64bc8c8aaac01a43c6a8b17 100644 (file)
--- a/librpc/gen_ndr/cli_dfs.c
+++ b/librpc/gen_ndr/cli_dfs.c
@@ -47,7 +47,7 @@ struct tevent_req *rpccli_dfs_GetManagerVersion_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_GETMANAGERVERSION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -118,7 +118,7 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_GETMANAGERVERSION,
                                &r);
 
@@ -183,7 +183,7 @@ struct tevent_req *rpccli_dfs_Add_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -270,7 +270,7 @@ NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ADD,
                                &r);
 
@@ -334,7 +334,7 @@ struct tevent_req *rpccli_dfs_Remove_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_REMOVE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -417,7 +417,7 @@ NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_REMOVE,
                                &r);
 
@@ -485,7 +485,7 @@ struct tevent_req *rpccli_dfs_SetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_SETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -572,7 +572,7 @@ NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_SETINFO,
                                &r);
 
@@ -646,7 +646,7 @@ struct tevent_req *rpccli_dfs_GetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_GETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -733,7 +733,7 @@ NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_GETINFO,
                                &r);
 
@@ -808,7 +808,7 @@ struct tevent_req *rpccli_dfs_Enum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -899,7 +899,7 @@ NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ENUM,
                                &r);
 
@@ -963,7 +963,7 @@ struct tevent_req *rpccli_dfs_Rename_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_RENAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1040,7 +1040,7 @@ NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_RENAME,
                                &r);
 
@@ -1098,7 +1098,7 @@ struct tevent_req *rpccli_dfs_Move_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_MOVE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1175,7 +1175,7 @@ NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_MOVE,
                                &r);
 
@@ -1233,7 +1233,7 @@ struct tevent_req *rpccli_dfs_ManagerGetConfigInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_MANAGERGETCONFIGINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1310,7 +1310,7 @@ NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_MANAGERGETCONFIGINFO,
                                &r);
 
@@ -1368,7 +1368,7 @@ struct tevent_req *rpccli_dfs_ManagerSendSiteInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_MANAGERSENDSITEINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1445,7 +1445,7 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_MANAGERSENDSITEINFO,
                                &r);
 
@@ -1528,7 +1528,7 @@ struct tevent_req *rpccli_dfs_AddFtRoot_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ADDFTROOT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1626,7 +1626,7 @@ NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ADDFTROOT,
                                &r);
 
@@ -1706,7 +1706,7 @@ struct tevent_req *rpccli_dfs_RemoveFtRoot_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_REMOVEFTROOT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1798,7 +1798,7 @@ NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_REMOVEFTROOT,
                                &r);
 
@@ -1867,7 +1867,7 @@ struct tevent_req *rpccli_dfs_AddStdRoot_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ADDSTDROOT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1952,7 +1952,7 @@ NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ADDSTDROOT,
                                &r);
 
@@ -2016,7 +2016,7 @@ struct tevent_req *rpccli_dfs_RemoveStdRoot_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_REMOVESTDROOT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2099,7 +2099,7 @@ NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_REMOVESTDROOT,
                                &r);
 
@@ -2161,7 +2161,7 @@ struct tevent_req *rpccli_dfs_ManagerInitialize_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_MANAGERINITIALIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2242,7 +2242,7 @@ NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_MANAGERINITIALIZE,
                                &r);
 
@@ -2308,7 +2308,7 @@ struct tevent_req *rpccli_dfs_AddStdRootForced_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ADDSTDROOTFORCED,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2393,7 +2393,7 @@ NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ADDSTDROOTFORCED,
                                &r);
 
@@ -2468,7 +2468,7 @@ struct tevent_req *rpccli_dfs_GetDcAddress_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_GETDCADDRESS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2556,7 +2556,7 @@ NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_GETDCADDRESS,
                                &r);
 
@@ -2625,7 +2625,7 @@ struct tevent_req *rpccli_dfs_SetDcAddress_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_SETDCADDRESS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2710,7 +2710,7 @@ NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_SETDCADDRESS,
                                &r);
 
@@ -2772,7 +2772,7 @@ struct tevent_req *rpccli_dfs_FlushFtTable_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_FLUSHFTTABLE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2853,7 +2853,7 @@ NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_FLUSHFTTABLE,
                                &r);
 
@@ -2911,7 +2911,7 @@ struct tevent_req *rpccli_dfs_Add2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ADD2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2988,7 +2988,7 @@ NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ADD2,
                                &r);
 
@@ -3046,7 +3046,7 @@ struct tevent_req *rpccli_dfs_Remove2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_REMOVE2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3123,7 +3123,7 @@ NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_REMOVE2,
                                &r);
 
@@ -3199,7 +3199,7 @@ struct tevent_req *rpccli_dfs_EnumEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_ENUMEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3292,7 +3292,7 @@ NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_ENUMEX,
                                &r);
 
@@ -3356,7 +3356,7 @@ struct tevent_req *rpccli_dfs_SetInfo2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netdfs,
+                                   NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                    NDR_DFS_SETINFO2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3433,7 +3433,7 @@ NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netdfs,
+                               NDR_NETDFS_UUID, NDR_NETDFS_VERSION,
                                NDR_DFS_SETINFO2,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_drsuapi.c b/librpc/gen_ndr/cli_drsuapi.c
index c261a79f62c1b63b55731e3d61a8c6f541ecc718..68e981370cbb6bf01ee554edb254040274576f7c 100644 (file)
--- a/librpc/gen_ndr/cli_drsuapi.c
+++ b/librpc/gen_ndr/cli_drsuapi.c
@@ -55,7 +55,7 @@ struct tevent_req *rpccli_drsuapi_DsBind_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSBIND,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -141,7 +141,7 @@ NTSTATUS rpccli_drsuapi_DsBind(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSBIND,
                                &r);
 
@@ -212,7 +212,7 @@ struct tevent_req *rpccli_drsuapi_DsUnbind_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSUNBIND,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -292,7 +292,7 @@ NTSTATUS rpccli_drsuapi_DsUnbind(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSUNBIND,
                                &r);
 
@@ -357,7 +357,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaSync_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREPLICASYNC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -440,7 +440,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaSync(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREPLICASYNC,
                                &r);
 
@@ -514,7 +514,7 @@ struct tevent_req *rpccli_drsuapi_DsGetNCChanges_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSGETNCCHANGES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -601,7 +601,7 @@ NTSTATUS rpccli_drsuapi_DsGetNCChanges(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSGETNCCHANGES,
                                &r);
 
@@ -667,7 +667,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaUpdateRefs_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREPLICAUPDATEREFS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -750,7 +750,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaUpdateRefs(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREPLICAUPDATEREFS,
                                &r);
 
@@ -814,7 +814,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaAdd_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREPLICAADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -897,7 +897,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaAdd(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREPLICAADD,
                                &r);
 
@@ -961,7 +961,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaDel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREPLICADEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1044,7 +1044,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREPLICADEL,
                                &r);
 
@@ -1108,7 +1108,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaMod_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREPLICAMOD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1191,7 +1191,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaMod(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREPLICAMOD,
                                &r);
 
@@ -1249,7 +1249,7 @@ struct tevent_req *rpccli_DRSUAPI_VERIFY_NAMES_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_VERIFY_NAMES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1326,7 +1326,7 @@ NTSTATUS rpccli_DRSUAPI_VERIFY_NAMES(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_VERIFY_NAMES,
                                &r);
 
@@ -1400,7 +1400,7 @@ struct tevent_req *rpccli_drsuapi_DsGetMemberships_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSGETMEMBERSHIPS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1487,7 +1487,7 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSGETMEMBERSHIPS,
                                &r);
 
@@ -1547,7 +1547,7 @@ struct tevent_req *rpccli_DRSUAPI_INTER_DOMAIN_MOVE_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_INTER_DOMAIN_MOVE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1624,7 +1624,7 @@ NTSTATUS rpccli_DRSUAPI_INTER_DOMAIN_MOVE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_INTER_DOMAIN_MOVE,
                                &r);
 
@@ -1698,7 +1698,7 @@ struct tevent_req *rpccli_drsuapi_DsGetNT4ChangeLog_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSGETNT4CHANGELOG,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1785,7 +1785,7 @@ NTSTATUS rpccli_drsuapi_DsGetNT4ChangeLog(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSGETNT4CHANGELOG,
                                &r);
 
@@ -1861,7 +1861,7 @@ struct tevent_req *rpccli_drsuapi_DsCrackNames_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSCRACKNAMES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1948,7 +1948,7 @@ NTSTATUS rpccli_drsuapi_DsCrackNames(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSCRACKNAMES,
                                &r);
 
@@ -2024,7 +2024,7 @@ struct tevent_req *rpccli_drsuapi_DsWriteAccountSpn_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSWRITEACCOUNTSPN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2111,7 +2111,7 @@ NTSTATUS rpccli_drsuapi_DsWriteAccountSpn(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSWRITEACCOUNTSPN,
                                &r);
 
@@ -2187,7 +2187,7 @@ struct tevent_req *rpccli_drsuapi_DsRemoveDSServer_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREMOVEDSSERVER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2274,7 +2274,7 @@ NTSTATUS rpccli_drsuapi_DsRemoveDSServer(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREMOVEDSSERVER,
                                &r);
 
@@ -2334,7 +2334,7 @@ struct tevent_req *rpccli_DRSUAPI_REMOVE_DS_DOMAIN_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_REMOVE_DS_DOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2411,7 +2411,7 @@ NTSTATUS rpccli_DRSUAPI_REMOVE_DS_DOMAIN(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_REMOVE_DS_DOMAIN,
                                &r);
 
@@ -2485,7 +2485,7 @@ struct tevent_req *rpccli_drsuapi_DsGetDomainControllerInfo_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSGETDOMAINCONTROLLERINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2572,7 +2572,7 @@ NTSTATUS rpccli_drsuapi_DsGetDomainControllerInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSGETDOMAINCONTROLLERINFO,
                                &r);
 
@@ -2648,7 +2648,7 @@ struct tevent_req *rpccli_drsuapi_DsAddEntry_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSADDENTRY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2735,7 +2735,7 @@ NTSTATUS rpccli_drsuapi_DsAddEntry(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSADDENTRY,
                                &r);
 
@@ -2801,7 +2801,7 @@ struct tevent_req *rpccli_drsuapi_DsExecuteKCC_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSEXECUTEKCC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2884,7 +2884,7 @@ NTSTATUS rpccli_drsuapi_DsExecuteKCC(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSEXECUTEKCC,
                                &r);
 
@@ -2958,7 +2958,7 @@ struct tevent_req *rpccli_drsuapi_DsReplicaGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSREPLICAGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3045,7 +3045,7 @@ NTSTATUS rpccli_drsuapi_DsReplicaGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSREPLICAGETINFO,
                                &r);
 
@@ -3105,7 +3105,7 @@ struct tevent_req *rpccli_DRSUAPI_ADD_SID_HISTORY_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_ADD_SID_HISTORY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3182,7 +3182,7 @@ NTSTATUS rpccli_DRSUAPI_ADD_SID_HISTORY(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_ADD_SID_HISTORY,
                                &r);
 
@@ -3256,7 +3256,7 @@ struct tevent_req *rpccli_drsuapi_DsGetMemberships2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_DSGETMEMBERSHIPS2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3343,7 +3343,7 @@ NTSTATUS rpccli_drsuapi_DsGetMemberships2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_DSGETMEMBERSHIPS2,
                                &r);
 
@@ -3403,7 +3403,7 @@ struct tevent_req *rpccli_DRSUAPI_REPLICA_VERIFY_OBJECTS_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_REPLICA_VERIFY_OBJECTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3480,7 +3480,7 @@ NTSTATUS rpccli_DRSUAPI_REPLICA_VERIFY_OBJECTS(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_REPLICA_VERIFY_OBJECTS,
                                &r);
 
@@ -3538,7 +3538,7 @@ struct tevent_req *rpccli_DRSUAPI_GET_OBJECT_EXISTENCE_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_GET_OBJECT_EXISTENCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3615,7 +3615,7 @@ NTSTATUS rpccli_DRSUAPI_GET_OBJECT_EXISTENCE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_GET_OBJECT_EXISTENCE,
                                &r);
 
@@ -3689,7 +3689,7 @@ struct tevent_req *rpccli_drsuapi_QuerySitesByCost_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_drsuapi,
+                                   NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                    NDR_DRSUAPI_QUERYSITESBYCOST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3776,7 +3776,7 @@ NTSTATUS rpccli_drsuapi_QuerySitesByCost(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_drsuapi,
+                               NDR_DRSUAPI_UUID, NDR_DRSUAPI_VERSION,
                                NDR_DRSUAPI_QUERYSITESBYCOST,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_dssetup.c b/librpc/gen_ndr/cli_dssetup.c
index 22b39cb3ee56b1c3c535610184cc7a0a9072de77..dba74587e5dd2bce426dbd7882ab46c5f21d1fa3 100644 (file)
--- a/librpc/gen_ndr/cli_dssetup.c
+++ b/librpc/gen_ndr/cli_dssetup.c
@@ -52,7 +52,7 @@ struct tevent_req *rpccli_dssetup_DsRoleGetPrimaryDomainInformation_send(TALLOC_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -135,7 +135,7 @@ NTSTATUS rpccli_dssetup_DsRoleGetPrimaryDomainInformation(struct rpc_pipe_client
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEGETPRIMARYDOMAININFORMATION,
                                &r);
 
@@ -196,7 +196,7 @@ struct tevent_req *rpccli_dssetup_DsRoleDnsNameToFlatName_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -273,7 +273,7 @@ NTSTATUS rpccli_dssetup_DsRoleDnsNameToFlatName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEDNSNAMETOFLATNAME,
                                &r);
 
@@ -331,7 +331,7 @@ struct tevent_req *rpccli_dssetup_DsRoleDcAsDc_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEDCASDC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -408,7 +408,7 @@ NTSTATUS rpccli_dssetup_DsRoleDcAsDc(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEDCASDC,
                                &r);
 
@@ -466,7 +466,7 @@ struct tevent_req *rpccli_dssetup_DsRoleDcAsReplica_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEDCASREPLICA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -543,7 +543,7 @@ NTSTATUS rpccli_dssetup_DsRoleDcAsReplica(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEDCASREPLICA,
                                &r);
 
@@ -601,7 +601,7 @@ struct tevent_req *rpccli_dssetup_DsRoleDemoteDc_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEDEMOTEDC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -678,7 +678,7 @@ NTSTATUS rpccli_dssetup_DsRoleDemoteDc(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEDEMOTEDC,
                                &r);
 
@@ -736,7 +736,7 @@ struct tevent_req *rpccli_dssetup_DsRoleGetDcOperationProgress_send(TALLOC_CTX *
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -813,7 +813,7 @@ NTSTATUS rpccli_dssetup_DsRoleGetDcOperationProgress(struct rpc_pipe_client *cli
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEGETDCOPERATIONPROGRESS,
                                &r);
 
@@ -871,7 +871,7 @@ struct tevent_req *rpccli_dssetup_DsRoleGetDcOperationResults_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -948,7 +948,7 @@ NTSTATUS rpccli_dssetup_DsRoleGetDcOperationResults(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEGETDCOPERATIONRESULTS,
                                &r);
 
@@ -1006,7 +1006,7 @@ struct tevent_req *rpccli_dssetup_DsRoleCancel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLECANCEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1083,7 +1083,7 @@ NTSTATUS rpccli_dssetup_DsRoleCancel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLECANCEL,
                                &r);
 
@@ -1141,7 +1141,7 @@ struct tevent_req *rpccli_dssetup_DsRoleServerSaveStateForUpgrade_send(TALLOC_CT
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1218,7 +1218,7 @@ NTSTATUS rpccli_dssetup_DsRoleServerSaveStateForUpgrade(struct rpc_pipe_client *
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLESERVERSAVESTATEFORUPGRADE,
                                &r);
 
@@ -1276,7 +1276,7 @@ struct tevent_req *rpccli_dssetup_DsRoleUpgradeDownlevelServer_send(TALLOC_CTX *
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1353,7 +1353,7 @@ NTSTATUS rpccli_dssetup_DsRoleUpgradeDownlevelServer(struct rpc_pipe_client *cli
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEUPGRADEDOWNLEVELSERVER,
                                &r);
 
@@ -1411,7 +1411,7 @@ struct tevent_req *rpccli_dssetup_DsRoleAbortDownlevelServerUpgrade_send(TALLOC_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_dssetup,
+                                   NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                    NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1488,7 +1488,7 @@ NTSTATUS rpccli_dssetup_DsRoleAbortDownlevelServerUpgrade(struct rpc_pipe_client
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_dssetup,
+                               NDR_DSSETUP_UUID, NDR_DSSETUP_VERSION,
                                NDR_DSSETUP_DSROLEABORTDOWNLEVELSERVERUPGRADE,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index 52aa8c50bbe1fee6918ccd6a16a1ee415f5a1b21..0b723f1da61a43c98c7c5c6ffdebbb9f2ea0cfbd 100644 (file)
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -49,7 +49,7 @@ struct tevent_req *rpccli_echo_AddOne_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_ADDONE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -122,7 +122,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_ADDONE,
                                &r);
 
@@ -186,7 +186,7 @@ struct tevent_req *rpccli_echo_EchoData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_ECHODATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -261,7 +261,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_ECHODATA,
                                &r);
 
@@ -317,7 +317,7 @@ struct tevent_req *rpccli_echo_SinkData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_SINKDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -390,7 +390,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_SINKDATA,
                                &r);
 
@@ -451,7 +451,7 @@ struct tevent_req *rpccli_echo_SourceData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_SOURCEDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -524,7 +524,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_SOURCEDATA,
                                &r);
 
@@ -586,7 +586,7 @@ struct tevent_req *rpccli_echo_TestCall_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_TESTCALL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -659,7 +659,7 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_TESTCALL,
                                &r);
 
@@ -724,7 +724,7 @@ struct tevent_req *rpccli_echo_TestCall2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_TESTCALL2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -804,7 +804,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_TESTCALL2,
                                &r);
 
@@ -861,7 +861,7 @@ struct tevent_req *rpccli_echo_TestSleep_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_TESTSLEEP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -939,7 +939,7 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_TESTSLEEP,
                                &r);
 
@@ -1005,7 +1005,7 @@ struct tevent_req *rpccli_echo_TestEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_TESTENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1083,7 +1083,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_TESTENUM,
                                &r);
 
@@ -1146,7 +1146,7 @@ struct tevent_req *rpccli_echo_TestSurrounding_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_TESTSURROUNDING,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1218,7 +1218,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_TESTSURROUNDING,
                                &r);
 
@@ -1275,7 +1275,7 @@ struct tevent_req *rpccli_echo_TestDoublePointer_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_rpcecho,
+                                   NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                    NDR_ECHO_TESTDOUBLEPOINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1353,7 +1353,7 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_rpcecho,
+                               NDR_RPCECHO_UUID, NDR_RPCECHO_VERSION,
                                NDR_ECHO_TESTDOUBLEPOINTER,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 4e5d160883fbc74ac11a63efc6b552a3fc3b884d..4589c4e58868849f67fea5cdffd13591a1f132f7 100644 (file)
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -48,7 +48,7 @@ struct tevent_req *rpccli_epm_Insert_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_INSERT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -130,7 +130,7 @@ NTSTATUS rpccli_epm_Insert(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_INSERT,
                                &r);
 
@@ -188,7 +188,7 @@ struct tevent_req *rpccli_epm_Delete_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_DELETE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -268,7 +268,7 @@ NTSTATUS rpccli_epm_Delete(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_DELETE,
                                &r);
 
@@ -345,7 +345,7 @@ struct tevent_req *rpccli_epm_Lookup_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_LOOKUP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -438,7 +438,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_LOOKUP,
                                &r);
 
@@ -514,7 +514,7 @@ struct tevent_req *rpccli_epm_Map_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_MAP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -603,7 +603,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_MAP,
                                &r);
 
@@ -669,7 +669,7 @@ struct tevent_req *rpccli_epm_LookupHandleFree_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_LOOKUPHANDLEFREE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -748,7 +748,7 @@ NTSTATUS rpccli_epm_LookupHandleFree(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_LOOKUPHANDLEFREE,
                                &r);
 
@@ -805,7 +805,7 @@ struct tevent_req *rpccli_epm_InqObject_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_INQOBJECT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -883,7 +883,7 @@ NTSTATUS rpccli_epm_InqObject(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_INQOBJECT,
                                &r);
 
@@ -943,7 +943,7 @@ struct tevent_req *rpccli_epm_MgmtDelete_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_MGMTDELETE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1025,7 +1025,7 @@ NTSTATUS rpccli_epm_MgmtDelete(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_MGMTDELETE,
                                &r);
 
@@ -1079,7 +1079,7 @@ struct tevent_req *rpccli_epm_MapAuth_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_epmapper,
+                                   NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                    NDR_EPM_MAPAUTH,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1155,7 +1155,7 @@ NTSTATUS rpccli_epm_MapAuth(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_epmapper,
+                               NDR_EPMAPPER_UUID, NDR_EPMAPPER_VERSION,
                                NDR_EPM_MAPAUTH,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index 9e2c6bea66b8dc518d062ca930002788173c6ce1..26b630eb03924284b7e1f7f84cf414a173dd116c 100644 (file)
--- a/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
@@ -46,7 +46,7 @@ struct tevent_req *rpccli_eventlog_ClearEventLogW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_CLEAREVENTLOGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -126,7 +126,7 @@ NTSTATUS rpccli_eventlog_ClearEventLogW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_CLEAREVENTLOGW,
                                &r);
 
@@ -184,7 +184,7 @@ struct tevent_req *rpccli_eventlog_BackupEventLogW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_BACKUPEVENTLOGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -264,7 +264,7 @@ NTSTATUS rpccli_eventlog_BackupEventLogW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_BACKUPEVENTLOGW,
                                &r);
 
@@ -327,7 +327,7 @@ struct tevent_req *rpccli_eventlog_CloseEventLog_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_CLOSEEVENTLOG,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -406,7 +406,7 @@ NTSTATUS rpccli_eventlog_CloseEventLog(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_CLOSEEVENTLOG,
                                &r);
 
@@ -470,7 +470,7 @@ struct tevent_req *rpccli_eventlog_DeregisterEventSource_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_DEREGISTEREVENTSOURCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -549,7 +549,7 @@ NTSTATUS rpccli_eventlog_DeregisterEventSource(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_DEREGISTEREVENTSOURCE,
                                &r);
 
@@ -614,7 +614,7 @@ struct tevent_req *rpccli_eventlog_GetNumRecords_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_GETNUMRECORDS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -694,7 +694,7 @@ NTSTATUS rpccli_eventlog_GetNumRecords(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_GETNUMRECORDS,
                                &r);
 
@@ -759,7 +759,7 @@ struct tevent_req *rpccli_eventlog_GetOldestRecord_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_GETOLDESTRECORD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -839,7 +839,7 @@ NTSTATUS rpccli_eventlog_GetOldestRecord(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_GETOLDESTRECORD,
                                &r);
 
@@ -894,7 +894,7 @@ struct tevent_req *rpccli_eventlog_ChangeNotify_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_CHANGENOTIFY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -970,7 +970,7 @@ NTSTATUS rpccli_eventlog_ChangeNotify(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_CHANGENOTIFY,
                                &r);
 
@@ -1042,7 +1042,7 @@ struct tevent_req *rpccli_eventlog_OpenEventLogW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_OPENEVENTLOGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1130,7 +1130,7 @@ NTSTATUS rpccli_eventlog_OpenEventLogW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_OPENEVENTLOGW,
                                &r);
 
@@ -1203,7 +1203,7 @@ struct tevent_req *rpccli_eventlog_RegisterEventSourceW_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_REGISTEREVENTSOURCEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1291,7 +1291,7 @@ NTSTATUS rpccli_eventlog_RegisterEventSourceW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_REGISTEREVENTSOURCEW,
                                &r);
 
@@ -1362,7 +1362,7 @@ struct tevent_req *rpccli_eventlog_OpenBackupEventLogW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_OPENBACKUPEVENTLOGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1448,7 +1448,7 @@ NTSTATUS rpccli_eventlog_OpenBackupEventLogW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_OPENBACKUPEVENTLOGW,
                                &r);
 
@@ -1523,7 +1523,7 @@ struct tevent_req *rpccli_eventlog_ReadEventLogW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_READEVENTLOGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1613,7 +1613,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_READEVENTLOGW,
                                &r);
 
@@ -1706,7 +1706,7 @@ struct tevent_req *rpccli_eventlog_ReportEventW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_REPORTEVENTW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1816,7 +1816,7 @@ NTSTATUS rpccli_eventlog_ReportEventW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_REPORTEVENTW,
                                &r);
 
@@ -1876,7 +1876,7 @@ struct tevent_req *rpccli_eventlog_ClearEventLogA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_CLEAREVENTLOGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1952,7 +1952,7 @@ NTSTATUS rpccli_eventlog_ClearEventLogA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_CLEAREVENTLOGA,
                                &r);
 
@@ -2006,7 +2006,7 @@ struct tevent_req *rpccli_eventlog_BackupEventLogA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_BACKUPEVENTLOGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2082,7 +2082,7 @@ NTSTATUS rpccli_eventlog_BackupEventLogA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_BACKUPEVENTLOGA,
                                &r);
 
@@ -2136,7 +2136,7 @@ struct tevent_req *rpccli_eventlog_OpenEventLogA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_OPENEVENTLOGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2212,7 +2212,7 @@ NTSTATUS rpccli_eventlog_OpenEventLogA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_OPENEVENTLOGA,
                                &r);
 
@@ -2266,7 +2266,7 @@ struct tevent_req *rpccli_eventlog_RegisterEventSourceA_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_REGISTEREVENTSOURCEA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2342,7 +2342,7 @@ NTSTATUS rpccli_eventlog_RegisterEventSourceA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_REGISTEREVENTSOURCEA,
                                &r);
 
@@ -2396,7 +2396,7 @@ struct tevent_req *rpccli_eventlog_OpenBackupEventLogA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_OPENBACKUPEVENTLOGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2472,7 +2472,7 @@ NTSTATUS rpccli_eventlog_OpenBackupEventLogA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_OPENBACKUPEVENTLOGA,
                                &r);
 
@@ -2526,7 +2526,7 @@ struct tevent_req *rpccli_eventlog_ReadEventLogA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_READEVENTLOGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2602,7 +2602,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_READEVENTLOGA,
                                &r);
 
@@ -2656,7 +2656,7 @@ struct tevent_req *rpccli_eventlog_ReportEventA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_REPORTEVENTA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2732,7 +2732,7 @@ NTSTATUS rpccli_eventlog_ReportEventA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_REPORTEVENTA,
                                &r);
 
@@ -2786,7 +2786,7 @@ struct tevent_req *rpccli_eventlog_RegisterClusterSvc_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_REGISTERCLUSTERSVC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2862,7 +2862,7 @@ NTSTATUS rpccli_eventlog_RegisterClusterSvc(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_REGISTERCLUSTERSVC,
                                &r);
 
@@ -2916,7 +2916,7 @@ struct tevent_req *rpccli_eventlog_DeregisterClusterSvc_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_DEREGISTERCLUSTERSVC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2992,7 +2992,7 @@ NTSTATUS rpccli_eventlog_DeregisterClusterSvc(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_DEREGISTERCLUSTERSVC,
                                &r);
 
@@ -3046,7 +3046,7 @@ struct tevent_req *rpccli_eventlog_WriteClusterEvents_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_WRITECLUSTEREVENTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3122,7 +3122,7 @@ NTSTATUS rpccli_eventlog_WriteClusterEvents(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_WRITECLUSTEREVENTS,
                                &r);
 
@@ -3192,7 +3192,7 @@ struct tevent_req *rpccli_eventlog_GetLogInformation_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_GETLOGINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3278,7 +3278,7 @@ NTSTATUS rpccli_eventlog_GetLogInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_GETLOGINFORMATION,
                                &r);
 
@@ -3336,7 +3336,7 @@ struct tevent_req *rpccli_eventlog_FlushEventLog_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_FLUSHEVENTLOG,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3414,7 +3414,7 @@ NTSTATUS rpccli_eventlog_FlushEventLog(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_FLUSHEVENTLOG,
                                &r);
 
@@ -3506,7 +3506,7 @@ struct tevent_req *rpccli_eventlog_ReportEventAndSourceW_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_eventlog,
+                                   NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                    NDR_EVENTLOG_REPORTEVENTANDSOURCEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3618,7 +3618,7 @@ NTSTATUS rpccli_eventlog_ReportEventAndSourceW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_eventlog,
+                               NDR_EVENTLOG_UUID, NDR_EVENTLOG_VERSION,
                                NDR_EVENTLOG_REPORTEVENTANDSOURCEW,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_initshutdown.c b/librpc/gen_ndr/cli_initshutdown.c
index ebc0af5d2c676fc764e0540c6e27f9ca6f3db1bb..176506351bb2a0f9044d0df9809c369deb75ac85 100644 (file)
--- a/librpc/gen_ndr/cli_initshutdown.c
+++ b/librpc/gen_ndr/cli_initshutdown.c
@@ -52,7 +52,7 @@ struct tevent_req *rpccli_initshutdown_Init_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_initshutdown,
+                                   NDR_INITSHUTDOWN_UUID, NDR_INITSHUTDOWN_VERSION,
                                    NDR_INITSHUTDOWN_INIT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -139,7 +139,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_initshutdown,
+                               NDR_INITSHUTDOWN_UUID, NDR_INITSHUTDOWN_VERSION,
                                NDR_INITSHUTDOWN_INIT,
                                &r);
 
@@ -199,7 +199,7 @@ struct tevent_req *rpccli_initshutdown_Abort_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_initshutdown,
+                                   NDR_INITSHUTDOWN_UUID, NDR_INITSHUTDOWN_VERSION,
                                    NDR_INITSHUTDOWN_ABORT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -278,7 +278,7 @@ NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_initshutdown,
+                               NDR_INITSHUTDOWN_UUID, NDR_INITSHUTDOWN_VERSION,
                                NDR_INITSHUTDOWN_ABORT,
                                &r);
 
@@ -348,7 +348,7 @@ struct tevent_req *rpccli_initshutdown_InitEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_initshutdown,
+                                   NDR_INITSHUTDOWN_UUID, NDR_INITSHUTDOWN_VERSION,
                                    NDR_INITSHUTDOWN_INITEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -437,7 +437,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_initshutdown,
+                               NDR_INITSHUTDOWN_UUID, NDR_INITSHUTDOWN_VERSION,
                                NDR_INITSHUTDOWN_INITEX,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_lsa.c b/librpc/gen_ndr/cli_lsa.c
index aa329b14e59a7e9019e0f8c855258be6e03f6857..827e44ef3f96c606b8cde59c5b79fcd5095602c3 100644 (file)
--- a/librpc/gen_ndr/cli_lsa.c
+++ b/librpc/gen_ndr/cli_lsa.c
@@ -51,7 +51,7 @@ struct tevent_req *rpccli_lsa_Close_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CLOSE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -130,7 +130,7 @@ NTSTATUS rpccli_lsa_Close(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CLOSE,
                                &r);
 
@@ -187,7 +187,7 @@ struct tevent_req *rpccli_lsa_Delete_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_DELETE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -265,7 +265,7 @@ NTSTATUS rpccli_lsa_Delete(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_DELETE,
                                &r);
 
@@ -334,7 +334,7 @@ struct tevent_req *rpccli_lsa_EnumPrivs_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMPRIVS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -419,7 +419,7 @@ NTSTATUS rpccli_lsa_EnumPrivs(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMPRIVS,
                                &r);
 
@@ -487,7 +487,7 @@ struct tevent_req *rpccli_lsa_QuerySecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -569,7 +569,7 @@ NTSTATUS rpccli_lsa_QuerySecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYSECURITY,
                                &r);
 
@@ -630,7 +630,7 @@ struct tevent_req *rpccli_lsa_SetSecObj_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETSECOBJ,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -712,7 +712,7 @@ NTSTATUS rpccli_lsa_SetSecObj(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETSECOBJ,
                                &r);
 
@@ -766,7 +766,7 @@ struct tevent_req *rpccli_lsa_ChangePassword_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CHANGEPASSWORD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -842,7 +842,7 @@ NTSTATUS rpccli_lsa_ChangePassword(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CHANGEPASSWORD,
                                &r);
 
@@ -910,7 +910,7 @@ struct tevent_req *rpccli_lsa_OpenPolicy_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_OPENPOLICY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -994,7 +994,7 @@ NTSTATUS rpccli_lsa_OpenPolicy(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_OPENPOLICY,
                                &r);
 
@@ -1061,7 +1061,7 @@ struct tevent_req *rpccli_lsa_QueryInfoPolicy_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYINFOPOLICY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1143,7 +1143,7 @@ NTSTATUS rpccli_lsa_QueryInfoPolicy(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYINFOPOLICY,
                                &r);
 
@@ -1204,7 +1204,7 @@ struct tevent_req *rpccli_lsa_SetInfoPolicy_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETINFOPOLICY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1286,7 +1286,7 @@ NTSTATUS rpccli_lsa_SetInfoPolicy(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETINFOPOLICY,
                                &r);
 
@@ -1340,7 +1340,7 @@ struct tevent_req *rpccli_lsa_ClearAuditLog_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CLEARAUDITLOG,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1416,7 +1416,7 @@ NTSTATUS rpccli_lsa_ClearAuditLog(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CLEARAUDITLOG,
                                &r);
 
@@ -1484,7 +1484,7 @@ struct tevent_req *rpccli_lsa_CreateAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREATEACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1568,7 +1568,7 @@ NTSTATUS rpccli_lsa_CreateAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREATEACCOUNT,
                                &r);
 
@@ -1638,7 +1638,7 @@ struct tevent_req *rpccli_lsa_EnumAccounts_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMACCOUNTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1723,7 +1723,7 @@ NTSTATUS rpccli_lsa_EnumAccounts(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMACCOUNTS,
                                &r);
 
@@ -1793,7 +1793,7 @@ struct tevent_req *rpccli_lsa_CreateTrustedDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREATETRUSTEDDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1877,7 +1877,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREATETRUSTEDDOMAIN,
                                &r);
 
@@ -1947,7 +1947,7 @@ struct tevent_req *rpccli_lsa_EnumTrustDom_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMTRUSTDOM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2032,7 +2032,7 @@ NTSTATUS rpccli_lsa_EnumTrustDom(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMTRUSTDOM,
                                &r);
 
@@ -2110,7 +2110,7 @@ struct tevent_req *rpccli_lsa_LookupNames_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPNAMES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2202,7 +2202,7 @@ NTSTATUS rpccli_lsa_LookupNames(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPNAMES,
                                &r);
 
@@ -2279,7 +2279,7 @@ struct tevent_req *rpccli_lsa_LookupSids_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPSIDS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2369,7 +2369,7 @@ NTSTATUS rpccli_lsa_LookupSids(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPSIDS,
                                &r);
 
@@ -2440,7 +2440,7 @@ struct tevent_req *rpccli_lsa_CreateSecret_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREATESECRET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2524,7 +2524,7 @@ NTSTATUS rpccli_lsa_CreateSecret(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREATESECRET,
                                &r);
 
@@ -2593,7 +2593,7 @@ struct tevent_req *rpccli_lsa_OpenAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_OPENACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2677,7 +2677,7 @@ NTSTATUS rpccli_lsa_OpenAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_OPENACCOUNT,
                                &r);
 
@@ -2742,7 +2742,7 @@ struct tevent_req *rpccli_lsa_EnumPrivsAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMPRIVSACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2822,7 +2822,7 @@ NTSTATUS rpccli_lsa_EnumPrivsAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMPRIVSACCOUNT,
                                &r);
 
@@ -2881,7 +2881,7 @@ struct tevent_req *rpccli_lsa_AddPrivilegesToAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ADDPRIVILEGESTOACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2961,7 +2961,7 @@ NTSTATUS rpccli_lsa_AddPrivilegesToAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ADDPRIVILEGESTOACCOUNT,
                                &r);
 
@@ -3021,7 +3021,7 @@ struct tevent_req *rpccli_lsa_RemovePrivilegesFromAccount_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3103,7 +3103,7 @@ NTSTATUS rpccli_lsa_RemovePrivilegesFromAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_REMOVEPRIVILEGESFROMACCOUNT,
                                &r);
 
@@ -3157,7 +3157,7 @@ struct tevent_req *rpccli_lsa_GetQuotasForAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_GETQUOTASFORACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3233,7 +3233,7 @@ NTSTATUS rpccli_lsa_GetQuotasForAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_GETQUOTASFORACCOUNT,
                                &r);
 
@@ -3287,7 +3287,7 @@ struct tevent_req *rpccli_lsa_SetQuotasForAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETQUOTASFORACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3363,7 +3363,7 @@ NTSTATUS rpccli_lsa_SetQuotasForAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETQUOTASFORACCOUNT,
                                &r);
 
@@ -3427,7 +3427,7 @@ struct tevent_req *rpccli_lsa_GetSystemAccessAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_GETSYSTEMACCESSACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3507,7 +3507,7 @@ NTSTATUS rpccli_lsa_GetSystemAccessAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_GETSYSTEMACCESSACCOUNT,
                                &r);
 
@@ -3566,7 +3566,7 @@ struct tevent_req *rpccli_lsa_SetSystemAccessAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETSYSTEMACCESSACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3646,7 +3646,7 @@ NTSTATUS rpccli_lsa_SetSystemAccessAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETSYSTEMACCESSACCOUNT,
                                &r);
 
@@ -3714,7 +3714,7 @@ struct tevent_req *rpccli_lsa_OpenTrustedDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_OPENTRUSTEDDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3798,7 +3798,7 @@ NTSTATUS rpccli_lsa_OpenTrustedDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_OPENTRUSTEDDOMAIN,
                                &r);
 
@@ -3865,7 +3865,7 @@ struct tevent_req *rpccli_lsa_QueryTrustedDomainInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYTRUSTEDDOMAININFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3947,7 +3947,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYTRUSTEDDOMAININFO,
                                &r);
 
@@ -4008,7 +4008,7 @@ struct tevent_req *rpccli_lsa_SetInformationTrustedDomain_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4090,7 +4090,7 @@ NTSTATUS rpccli_lsa_SetInformationTrustedDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETINFORMATIONTRUSTEDDOMAIN,
                                &r);
 
@@ -4158,7 +4158,7 @@ struct tevent_req *rpccli_lsa_OpenSecret_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_OPENSECRET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4242,7 +4242,7 @@ NTSTATUS rpccli_lsa_OpenSecret(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_OPENSECRET,
                                &r);
 
@@ -4303,7 +4303,7 @@ struct tevent_req *rpccli_lsa_SetSecret_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETSECRET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4385,7 +4385,7 @@ NTSTATUS rpccli_lsa_SetSecret(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETSECRET,
                                &r);
 
@@ -4459,7 +4459,7 @@ struct tevent_req *rpccli_lsa_QuerySecret_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYSECRET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4557,7 +4557,7 @@ NTSTATUS rpccli_lsa_QuerySecret(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYSECRET,
                                &r);
 
@@ -4635,7 +4635,7 @@ struct tevent_req *rpccli_lsa_LookupPrivValue_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPPRIVVALUE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4717,7 +4717,7 @@ NTSTATUS rpccli_lsa_LookupPrivValue(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPPRIVVALUE,
                                &r);
 
@@ -4784,7 +4784,7 @@ struct tevent_req *rpccli_lsa_LookupPrivName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPPRIVNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4866,7 +4866,7 @@ NTSTATUS rpccli_lsa_LookupPrivName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPPRIVNAME,
                                &r);
 
@@ -4939,7 +4939,7 @@ struct tevent_req *rpccli_lsa_LookupPrivDisplayName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPPRIVDISPLAYNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5027,7 +5027,7 @@ NTSTATUS rpccli_lsa_LookupPrivDisplayName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPPRIVDISPLAYNAME,
                                &r);
 
@@ -5092,7 +5092,7 @@ struct tevent_req *rpccli_lsa_DeleteObject_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_DELETEOBJECT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5171,7 +5171,7 @@ NTSTATUS rpccli_lsa_DeleteObject(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_DELETEOBJECT,
                                &r);
 
@@ -5238,7 +5238,7 @@ struct tevent_req *rpccli_lsa_EnumAccountsWithUserRight_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5320,7 +5320,7 @@ NTSTATUS rpccli_lsa_EnumAccountsWithUserRight(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMACCOUNTSWITHUSERRIGHT,
                                &r);
 
@@ -5387,7 +5387,7 @@ struct tevent_req *rpccli_lsa_EnumAccountRights_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMACCOUNTRIGHTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5469,7 +5469,7 @@ NTSTATUS rpccli_lsa_EnumAccountRights(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMACCOUNTRIGHTS,
                                &r);
 
@@ -5530,7 +5530,7 @@ struct tevent_req *rpccli_lsa_AddAccountRights_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ADDACCOUNTRIGHTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5612,7 +5612,7 @@ NTSTATUS rpccli_lsa_AddAccountRights(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ADDACCOUNTRIGHTS,
                                &r);
 
@@ -5674,7 +5674,7 @@ struct tevent_req *rpccli_lsa_RemoveAccountRights_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_REMOVEACCOUNTRIGHTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5758,7 +5758,7 @@ NTSTATUS rpccli_lsa_RemoveAccountRights(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_REMOVEACCOUNTRIGHTS,
                                &r);
 
@@ -5826,7 +5826,7 @@ struct tevent_req *rpccli_lsa_QueryTrustedDomainInfoBySid_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5910,7 +5910,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoBySid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYTRUSTEDDOMAININFOBYSID,
                                &r);
 
@@ -5973,7 +5973,7 @@ struct tevent_req *rpccli_lsa_SetTrustedDomainInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETTRUSTEDDOMAININFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6057,7 +6057,7 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETTRUSTEDDOMAININFO,
                                &r);
 
@@ -6115,7 +6115,7 @@ struct tevent_req *rpccli_lsa_DeleteTrustedDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_DELETETRUSTEDDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6195,7 +6195,7 @@ NTSTATUS rpccli_lsa_DeleteTrustedDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_DELETETRUSTEDDOMAIN,
                                &r);
 
@@ -6255,7 +6255,7 @@ struct tevent_req *rpccli_lsa_StorePrivateData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_STOREPRIVATEDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6337,7 +6337,7 @@ NTSTATUS rpccli_lsa_StorePrivateData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_STOREPRIVATEDATA,
                                &r);
 
@@ -6404,7 +6404,7 @@ struct tevent_req *rpccli_lsa_RetrievePrivateData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_RETRIEVEPRIVATEDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6487,7 +6487,7 @@ NTSTATUS rpccli_lsa_RetrievePrivateData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_RETRIEVEPRIVATEDATA,
                                &r);
 
@@ -6556,7 +6556,7 @@ struct tevent_req *rpccli_lsa_OpenPolicy2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_OPENPOLICY2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6640,7 +6640,7 @@ NTSTATUS rpccli_lsa_OpenPolicy2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_OPENPOLICY2,
                                &r);
 
@@ -6709,7 +6709,7 @@ struct tevent_req *rpccli_lsa_GetUserName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_GETUSERNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6795,7 +6795,7 @@ NTSTATUS rpccli_lsa_GetUserName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_GETUSERNAME,
                                &r);
 
@@ -6865,7 +6865,7 @@ struct tevent_req *rpccli_lsa_QueryInfoPolicy2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYINFOPOLICY2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6947,7 +6947,7 @@ NTSTATUS rpccli_lsa_QueryInfoPolicy2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYINFOPOLICY2,
                                &r);
 
@@ -7008,7 +7008,7 @@ struct tevent_req *rpccli_lsa_SetInfoPolicy2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETINFOPOLICY2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7090,7 +7090,7 @@ NTSTATUS rpccli_lsa_SetInfoPolicy2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETINFOPOLICY2,
                                &r);
 
@@ -7158,7 +7158,7 @@ struct tevent_req *rpccli_lsa_QueryTrustedDomainInfoByName_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7242,7 +7242,7 @@ NTSTATUS rpccli_lsa_QueryTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYTRUSTEDDOMAININFOBYNAME,
                                &r);
 
@@ -7305,7 +7305,7 @@ struct tevent_req *rpccli_lsa_SetTrustedDomainInfoByName_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETTRUSTEDDOMAININFOBYNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7389,7 +7389,7 @@ NTSTATUS rpccli_lsa_SetTrustedDomainInfoByName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETTRUSTEDDOMAININFOBYNAME,
                                &r);
 
@@ -7458,7 +7458,7 @@ struct tevent_req *rpccli_lsa_EnumTrustedDomainsEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_ENUMTRUSTEDDOMAINSEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7543,7 +7543,7 @@ NTSTATUS rpccli_lsa_EnumTrustedDomainsEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_ENUMTRUSTEDDOMAINSEX,
                                &r);
 
@@ -7615,7 +7615,7 @@ struct tevent_req *rpccli_lsa_CreateTrustedDomainEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREATETRUSTEDDOMAINEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7701,7 +7701,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomainEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREATETRUSTEDDOMAINEX,
                                &r);
 
@@ -7765,7 +7765,7 @@ struct tevent_req *rpccli_lsa_CloseTrustedDomainEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CLOSETRUSTEDDOMAINEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7844,7 +7844,7 @@ NTSTATUS rpccli_lsa_CloseTrustedDomainEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CLOSETRUSTEDDOMAINEX,
                                &r);
 
@@ -7911,7 +7911,7 @@ struct tevent_req *rpccli_lsa_QueryDomainInformationPolicy_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_QUERYDOMAININFORMATIONPOLICY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7993,7 +7993,7 @@ NTSTATUS rpccli_lsa_QueryDomainInformationPolicy(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_QUERYDOMAININFORMATIONPOLICY,
                                &r);
 
@@ -8054,7 +8054,7 @@ struct tevent_req *rpccli_lsa_SetDomainInformationPolicy_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_SETDOMAININFORMATIONPOLICY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8136,7 +8136,7 @@ NTSTATUS rpccli_lsa_SetDomainInformationPolicy(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_SETDOMAININFORMATIONPOLICY,
                                &r);
 
@@ -8204,7 +8204,7 @@ struct tevent_req *rpccli_lsa_OpenTrustedDomainByName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_OPENTRUSTEDDOMAINBYNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8288,7 +8288,7 @@ NTSTATUS rpccli_lsa_OpenTrustedDomainByName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_OPENTRUSTEDDOMAINBYNAME,
                                &r);
 
@@ -8343,7 +8343,7 @@ struct tevent_req *rpccli_lsa_TestCall_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_TESTCALL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8419,7 +8419,7 @@ NTSTATUS rpccli_lsa_TestCall(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_TESTCALL,
                                &r);
 
@@ -8497,7 +8497,7 @@ struct tevent_req *rpccli_lsa_LookupSids2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPSIDS2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8591,7 +8591,7 @@ NTSTATUS rpccli_lsa_LookupSids2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPSIDS2,
                                &r);
 
@@ -8674,7 +8674,7 @@ struct tevent_req *rpccli_lsa_LookupNames2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPNAMES2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8770,7 +8770,7 @@ NTSTATUS rpccli_lsa_LookupNames2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPNAMES2,
                                &r);
 
@@ -8843,7 +8843,7 @@ struct tevent_req *rpccli_lsa_CreateTrustedDomainEx2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREATETRUSTEDDOMAINEX2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8929,7 +8929,7 @@ NTSTATUS rpccli_lsa_CreateTrustedDomainEx2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREATETRUSTEDDOMAINEX2,
                                &r);
 
@@ -8984,7 +8984,7 @@ struct tevent_req *rpccli_lsa_CREDRWRITE_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRWRITE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9060,7 +9060,7 @@ NTSTATUS rpccli_lsa_CREDRWRITE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRWRITE,
                                &r);
 
@@ -9114,7 +9114,7 @@ struct tevent_req *rpccli_lsa_CREDRREAD_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRREAD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9190,7 +9190,7 @@ NTSTATUS rpccli_lsa_CREDRREAD(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRREAD,
                                &r);
 
@@ -9244,7 +9244,7 @@ struct tevent_req *rpccli_lsa_CREDRENUMERATE_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRENUMERATE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9320,7 +9320,7 @@ NTSTATUS rpccli_lsa_CREDRENUMERATE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRENUMERATE,
                                &r);
 
@@ -9374,7 +9374,7 @@ struct tevent_req *rpccli_lsa_CREDRWRITEDOMAINCREDENTIALS_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRWRITEDOMAINCREDENTIALS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9450,7 +9450,7 @@ NTSTATUS rpccli_lsa_CREDRWRITEDOMAINCREDENTIALS(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRWRITEDOMAINCREDENTIALS,
                                &r);
 
@@ -9504,7 +9504,7 @@ struct tevent_req *rpccli_lsa_CREDRREADDOMAINCREDENTIALS_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRREADDOMAINCREDENTIALS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9580,7 +9580,7 @@ NTSTATUS rpccli_lsa_CREDRREADDOMAINCREDENTIALS(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRREADDOMAINCREDENTIALS,
                                &r);
 
@@ -9634,7 +9634,7 @@ struct tevent_req *rpccli_lsa_CREDRDELETE_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRDELETE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9710,7 +9710,7 @@ NTSTATUS rpccli_lsa_CREDRDELETE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRDELETE,
                                &r);
 
@@ -9764,7 +9764,7 @@ struct tevent_req *rpccli_lsa_CREDRGETTARGETINFO_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRGETTARGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9840,7 +9840,7 @@ NTSTATUS rpccli_lsa_CREDRGETTARGETINFO(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRGETTARGETINFO,
                                &r);
 
@@ -9894,7 +9894,7 @@ struct tevent_req *rpccli_lsa_CREDRPROFILELOADED_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRPROFILELOADED,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9970,7 +9970,7 @@ NTSTATUS rpccli_lsa_CREDRPROFILELOADED(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRPROFILELOADED,
                                &r);
 
@@ -10050,7 +10050,7 @@ struct tevent_req *rpccli_lsa_LookupNames3_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPNAMES3,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10146,7 +10146,7 @@ NTSTATUS rpccli_lsa_LookupNames3(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPNAMES3,
                                &r);
 
@@ -10203,7 +10203,7 @@ struct tevent_req *rpccli_lsa_CREDRGETSESSIONTYPES_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRGETSESSIONTYPES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10279,7 +10279,7 @@ NTSTATUS rpccli_lsa_CREDRGETSESSIONTYPES(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRGETSESSIONTYPES,
                                &r);
 
@@ -10333,7 +10333,7 @@ struct tevent_req *rpccli_lsa_LSARREGISTERAUDITEVENT_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARREGISTERAUDITEVENT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10409,7 +10409,7 @@ NTSTATUS rpccli_lsa_LSARREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARREGISTERAUDITEVENT,
                                &r);
 
@@ -10463,7 +10463,7 @@ struct tevent_req *rpccli_lsa_LSARGENAUDITEVENT_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARGENAUDITEVENT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10539,7 +10539,7 @@ NTSTATUS rpccli_lsa_LSARGENAUDITEVENT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARGENAUDITEVENT,
                                &r);
 
@@ -10593,7 +10593,7 @@ struct tevent_req *rpccli_lsa_LSARUNREGISTERAUDITEVENT_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARUNREGISTERAUDITEVENT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10669,7 +10669,7 @@ NTSTATUS rpccli_lsa_LSARUNREGISTERAUDITEVENT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARUNREGISTERAUDITEVENT,
                                &r);
 
@@ -10737,7 +10737,7 @@ struct tevent_req *rpccli_lsa_lsaRQueryForestTrustInformation_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10821,7 +10821,7 @@ NTSTATUS rpccli_lsa_lsaRQueryForestTrustInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARQUERYFORESTTRUSTINFORMATION,
                                &r);
 
@@ -10876,7 +10876,7 @@ struct tevent_req *rpccli_lsa_LSARSETFORESTTRUSTINFORMATION_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARSETFORESTTRUSTINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10952,7 +10952,7 @@ NTSTATUS rpccli_lsa_LSARSETFORESTTRUSTINFORMATION(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARSETFORESTTRUSTINFORMATION,
                                &r);
 
@@ -11006,7 +11006,7 @@ struct tevent_req *rpccli_lsa_CREDRRENAME_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_CREDRRENAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11082,7 +11082,7 @@ NTSTATUS rpccli_lsa_CREDRRENAME(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_CREDRRENAME,
                                &r);
 
@@ -11158,7 +11158,7 @@ struct tevent_req *rpccli_lsa_LookupSids3_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPSIDS3,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11250,7 +11250,7 @@ NTSTATUS rpccli_lsa_LookupSids3(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPSIDS3,
                                &r);
 
@@ -11331,7 +11331,7 @@ struct tevent_req *rpccli_lsa_LookupNames4_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LOOKUPNAMES4,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11425,7 +11425,7 @@ NTSTATUS rpccli_lsa_LookupNames4(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LOOKUPNAMES4,
                                &r);
 
@@ -11482,7 +11482,7 @@ struct tevent_req *rpccli_lsa_LSAROPENPOLICYSCE_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSAROPENPOLICYSCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11558,7 +11558,7 @@ NTSTATUS rpccli_lsa_LSAROPENPOLICYSCE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSAROPENPOLICYSCE,
                                &r);
 
@@ -11612,7 +11612,7 @@ struct tevent_req *rpccli_lsa_LSARADTREGISTERSECURITYEVENTSOURCE_send(TALLOC_CTX
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11688,7 +11688,7 @@ NTSTATUS rpccli_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(struct rpc_pipe_client *c
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARADTREGISTERSECURITYEVENTSOURCE,
                                &r);
 
@@ -11742,7 +11742,7 @@ struct tevent_req *rpccli_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE_send(TALLOC_C
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11818,7 +11818,7 @@ NTSTATUS rpccli_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(struct rpc_pipe_client
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARADTUNREGISTERSECURITYEVENTSOURCE,
                                &r);
 
@@ -11872,7 +11872,7 @@ struct tevent_req *rpccli_lsa_LSARADTREPORTSECURITYEVENT_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_lsarpc,
+                                   NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                    NDR_LSA_LSARADTREPORTSECURITYEVENT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11948,7 +11948,7 @@ NTSTATUS rpccli_lsa_LSARADTREPORTSECURITYEVENT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_lsarpc,
+                               NDR_LSARPC_UUID, NDR_LSARPC_VERSION,
                                NDR_LSA_LSARADTREPORTSECURITYEVENT,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_netlogon.c b/librpc/gen_ndr/cli_netlogon.c
index 53f29b925f76a760f3d1328e42f3dfc85f7917ed..3770f2a8b204895cb830e869f57a0a5f18b68325 100644 (file)
--- a/librpc/gen_ndr/cli_netlogon.c
+++ b/librpc/gen_ndr/cli_netlogon.c
@@ -56,7 +56,7 @@ struct tevent_req *rpccli_netr_LogonUasLogon_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONUASLOGON,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -141,7 +141,7 @@ NTSTATUS rpccli_netr_LogonUasLogon(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONUASLOGON,
                                &r);
 
@@ -214,7 +214,7 @@ struct tevent_req *rpccli_netr_LogonUasLogoff_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONUASLOGOFF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -299,7 +299,7 @@ NTSTATUS rpccli_netr_LogonUasLogoff(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONUASLOGOFF,
                                &r);
 
@@ -383,7 +383,7 @@ struct tevent_req *rpccli_netr_LogonSamLogon_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONSAMLOGON,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -480,7 +480,7 @@ NTSTATUS rpccli_netr_LogonSamLogon(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONSAMLOGON,
                                &r);
 
@@ -558,7 +558,7 @@ struct tevent_req *rpccli_netr_LogonSamLogoff_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONSAMLOGOFF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -649,7 +649,7 @@ NTSTATUS rpccli_netr_LogonSamLogoff(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONSAMLOGOFF,
                                &r);
 
@@ -720,7 +720,7 @@ struct tevent_req *rpccli_netr_ServerReqChallenge_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERREQCHALLENGE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -804,7 +804,7 @@ NTSTATUS rpccli_netr_ServerReqChallenge(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERREQCHALLENGE,
                                &r);
 
@@ -877,7 +877,7 @@ struct tevent_req *rpccli_netr_ServerAuthenticate_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERAUTHENTICATE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -965,7 +965,7 @@ NTSTATUS rpccli_netr_ServerAuthenticate(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERAUTHENTICATE,
                                &r);
 
@@ -1040,7 +1040,7 @@ struct tevent_req *rpccli_netr_ServerPasswordSet_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERPASSWORDSET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1130,7 +1130,7 @@ NTSTATUS rpccli_netr_ServerPasswordSet(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERPASSWORDSET,
                                &r);
 
@@ -1209,7 +1209,7 @@ struct tevent_req *rpccli_netr_DatabaseDeltas_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DATABASEDELTAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1303,7 +1303,7 @@ NTSTATUS rpccli_netr_DatabaseDeltas(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DATABASEDELTAS,
                                &r);
 
@@ -1384,7 +1384,7 @@ struct tevent_req *rpccli_netr_DatabaseSync_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DATABASESYNC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1478,7 +1478,7 @@ NTSTATUS rpccli_netr_DatabaseSync(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DATABASESYNC,
                                &r);
 
@@ -1566,7 +1566,7 @@ struct tevent_req *rpccli_netr_AccountDeltas_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_ACCOUNTDELTAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1667,7 +1667,7 @@ NTSTATUS rpccli_netr_AccountDeltas(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_ACCOUNTDELTAS,
                                &r);
 
@@ -1758,7 +1758,7 @@ struct tevent_req *rpccli_netr_AccountSync_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_ACCOUNTSYNC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1860,7 +1860,7 @@ NTSTATUS rpccli_netr_AccountSync(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_ACCOUNTSYNC,
                                &r);
 
@@ -1932,7 +1932,7 @@ struct tevent_req *rpccli_netr_GetDcName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_GETDCNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2015,7 +2015,7 @@ NTSTATUS rpccli_netr_GetDcName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_GETDCNAME,
                                &r);
 
@@ -2088,7 +2088,7 @@ struct tevent_req *rpccli_netr_LogonControl_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONCONTROL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2173,7 +2173,7 @@ NTSTATUS rpccli_netr_LogonControl(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONCONTROL,
                                &r);
 
@@ -2244,7 +2244,7 @@ struct tevent_req *rpccli_netr_GetAnyDCName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_GETANYDCNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2327,7 +2327,7 @@ NTSTATUS rpccli_netr_GetAnyDCName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_GETANYDCNAME,
                                &r);
 
@@ -2402,7 +2402,7 @@ struct tevent_req *rpccli_netr_LogonControl2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONCONTROL2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2489,7 +2489,7 @@ NTSTATUS rpccli_netr_LogonControl2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONCONTROL2,
                                &r);
 
@@ -2569,7 +2569,7 @@ struct tevent_req *rpccli_netr_ServerAuthenticate2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERAUTHENTICATE2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2660,7 +2660,7 @@ NTSTATUS rpccli_netr_ServerAuthenticate2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERAUTHENTICATE2,
                                &r);
 
@@ -2742,7 +2742,7 @@ struct tevent_req *rpccli_netr_DatabaseSync2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DATABASESYNC2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2838,7 +2838,7 @@ NTSTATUS rpccli_netr_DatabaseSync2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DATABASESYNC2,
                                &r);
 
@@ -2916,7 +2916,7 @@ struct tevent_req *rpccli_netr_DatabaseRedo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DATABASEREDO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3007,7 +3007,7 @@ NTSTATUS rpccli_netr_DatabaseRedo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DATABASEREDO,
                                &r);
 
@@ -3079,7 +3079,7 @@ struct tevent_req *rpccli_netr_LogonControl2Ex_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONCONTROL2EX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3166,7 +3166,7 @@ NTSTATUS rpccli_netr_LogonControl2Ex(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONCONTROL2EX,
                                &r);
 
@@ -3235,7 +3235,7 @@ struct tevent_req *rpccli_netr_NetrEnumerateTrustedDomains_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRENUMERATETRUSTEDDOMAINS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3316,7 +3316,7 @@ NTSTATUS rpccli_netr_NetrEnumerateTrustedDomains(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRENUMERATETRUSTEDDOMAINS,
                                &r);
 
@@ -3393,7 +3393,7 @@ struct tevent_req *rpccli_netr_DsRGetDCName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRGETDCNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3482,7 +3482,7 @@ NTSTATUS rpccli_netr_DsRGetDCName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRGETDCNAME,
                                &r);
 
@@ -3560,7 +3560,7 @@ struct tevent_req *rpccli_netr_LogonGetCapabilities_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONGETCAPABILITIES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3649,7 +3649,7 @@ NTSTATUS rpccli_netr_LogonGetCapabilities(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONGETCAPABILITIES,
                                &r);
 
@@ -3705,7 +3705,7 @@ struct tevent_req *rpccli_netr_NETRLOGONSETSERVICEBITS_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRLOGONSETSERVICEBITS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3782,7 +3782,7 @@ NTSTATUS rpccli_netr_NETRLOGONSETSERVICEBITS(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRLOGONSETSERVICEBITS,
                                &r);
 
@@ -3852,7 +3852,7 @@ struct tevent_req *rpccli_netr_LogonGetTrustRid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONGETTRUSTRID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3935,7 +3935,7 @@ NTSTATUS rpccli_netr_LogonGetTrustRid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONGETTRUSTRID,
                                &r);
 
@@ -3994,7 +3994,7 @@ struct tevent_req *rpccli_netr_NETRLOGONCOMPUTESERVERDIGEST_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4071,7 +4071,7 @@ NTSTATUS rpccli_netr_NETRLOGONCOMPUTESERVERDIGEST(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRLOGONCOMPUTESERVERDIGEST,
                                &r);
 
@@ -4129,7 +4129,7 @@ struct tevent_req *rpccli_netr_NETRLOGONCOMPUTECLIENTDIGEST_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4206,7 +4206,7 @@ NTSTATUS rpccli_netr_NETRLOGONCOMPUTECLIENTDIGEST(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRLOGONCOMPUTECLIENTDIGEST,
                                &r);
 
@@ -4287,7 +4287,7 @@ struct tevent_req *rpccli_netr_ServerAuthenticate3_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERAUTHENTICATE3,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4380,7 +4380,7 @@ NTSTATUS rpccli_netr_ServerAuthenticate3(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERAUTHENTICATE3,
                                &r);
 
@@ -4455,7 +4455,7 @@ struct tevent_req *rpccli_netr_DsRGetDCNameEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRGETDCNAMEEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4544,7 +4544,7 @@ NTSTATUS rpccli_netr_DsRGetDCNameEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRGETDCNAMEEX,
                                &r);
 
@@ -4613,7 +4613,7 @@ struct tevent_req *rpccli_netr_DsRGetSiteName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRGETSITENAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4694,7 +4694,7 @@ NTSTATUS rpccli_netr_DsRGetSiteName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRGETSITENAME,
                                &r);
 
@@ -4774,7 +4774,7 @@ struct tevent_req *rpccli_netr_LogonGetDomainInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONGETDOMAININFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4865,7 +4865,7 @@ NTSTATUS rpccli_netr_LogonGetDomainInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONGETDOMAININFO,
                                &r);
 
@@ -4941,7 +4941,7 @@ struct tevent_req *rpccli_netr_ServerPasswordSet2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERPASSWORDSET2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5031,7 +5031,7 @@ NTSTATUS rpccli_netr_ServerPasswordSet2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERPASSWORDSET2,
                                &r);
 
@@ -5106,7 +5106,7 @@ struct tevent_req *rpccli_netr_ServerPasswordGet_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERPASSWORDGET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5197,7 +5197,7 @@ NTSTATUS rpccli_netr_ServerPasswordGet(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERPASSWORDGET,
                                &r);
 
@@ -5257,7 +5257,7 @@ struct tevent_req *rpccli_netr_NETRLOGONSENDTOSAM_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRLOGONSENDTOSAM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5334,7 +5334,7 @@ NTSTATUS rpccli_netr_NETRLOGONSENDTOSAM(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRLOGONSENDTOSAM,
                                &r);
 
@@ -5406,7 +5406,7 @@ struct tevent_req *rpccli_netr_DsRAddressToSitenamesW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRADDRESSTOSITENAMESW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5491,7 +5491,7 @@ NTSTATUS rpccli_netr_DsRAddressToSitenamesW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRADDRESSTOSITENAMESW,
                                &r);
 
@@ -5572,7 +5572,7 @@ struct tevent_req *rpccli_netr_DsRGetDCNameEx2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRGETDCNAMEEX2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5665,7 +5665,7 @@ NTSTATUS rpccli_netr_DsRGetDCNameEx2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRGETDCNAMEEX2,
                                &r);
 
@@ -5724,7 +5724,7 @@ struct tevent_req *rpccli_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN_send(TALLOC_C
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5801,7 +5801,7 @@ NTSTATUS rpccli_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(struct rpc_pipe_client
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRLOGONGETTIMESERVICEPARENTDOMAIN,
                                &r);
 
@@ -5869,7 +5869,7 @@ struct tevent_req *rpccli_netr_NetrEnumerateTrustedDomainsEx_send(TALLOC_CTX *me
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5950,7 +5950,7 @@ NTSTATUS rpccli_netr_NetrEnumerateTrustedDomainsEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_NETRENUMERATETRUSTEDDOMAINSEX,
                                &r);
 
@@ -6023,7 +6023,7 @@ struct tevent_req *rpccli_netr_DsRAddressToSitenamesExW_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRADDRESSTOSITENAMESEXW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6108,7 +6108,7 @@ NTSTATUS rpccli_netr_DsRAddressToSitenamesExW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRADDRESSTOSITENAMESEXW,
                                &r);
 
@@ -6177,7 +6177,7 @@ struct tevent_req *rpccli_netr_DsrGetDcSiteCoverageW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRGETDCSITECOVERAGEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6258,7 +6258,7 @@ NTSTATUS rpccli_netr_DsrGetDcSiteCoverageW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRGETDCSITECOVERAGEW,
                                &r);
 
@@ -6340,7 +6340,7 @@ struct tevent_req *rpccli_netr_LogonSamLogonEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONSAMLOGONEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6433,7 +6433,7 @@ NTSTATUS rpccli_netr_LogonSamLogonEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONSAMLOGONEX,
                                &r);
 
@@ -6502,7 +6502,7 @@ struct tevent_req *rpccli_netr_DsrEnumerateDomainTrusts_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRENUMERATEDOMAINTRUSTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6585,7 +6585,7 @@ NTSTATUS rpccli_netr_DsrEnumerateDomainTrusts(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRENUMERATEDOMAINTRUSTS,
                                &r);
 
@@ -6654,7 +6654,7 @@ struct tevent_req *rpccli_netr_DsrDeregisterDNSHostRecords_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6741,7 +6741,7 @@ NTSTATUS rpccli_netr_DsrDeregisterDNSHostRecords(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRDEREGISTERDNSHOSTRECORDS,
                                &r);
 
@@ -6821,7 +6821,7 @@ struct tevent_req *rpccli_netr_ServerTrustPasswordsGet_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERTRUSTPASSWORDSGET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6913,7 +6913,7 @@ NTSTATUS rpccli_netr_ServerTrustPasswordsGet(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERTRUSTPASSWORDSGET,
                                &r);
 
@@ -6984,7 +6984,7 @@ struct tevent_req *rpccli_netr_DsRGetForestTrustInformation_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_DSRGETFORESTTRUSTINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7069,7 +7069,7 @@ NTSTATUS rpccli_netr_DsRGetForestTrustInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_DSRGETFORESTTRUSTINFORMATION,
                                &r);
 
@@ -7146,7 +7146,7 @@ struct tevent_req *rpccli_netr_GetForestTrustInformation_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_GETFORESTTRUSTINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7235,7 +7235,7 @@ NTSTATUS rpccli_netr_GetForestTrustInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_GETFORESTTRUSTINFORMATION,
                                &r);
 
@@ -7323,7 +7323,7 @@ struct tevent_req *rpccli_netr_LogonSamLogonWithFlags_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_LOGONSAMLOGONWITHFLAGS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7423,7 +7423,7 @@ NTSTATUS rpccli_netr_LogonSamLogonWithFlags(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_LOGONSAMLOGONWITHFLAGS,
                                &r);
 
@@ -7507,7 +7507,7 @@ struct tevent_req *rpccli_netr_ServerGetTrustInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_netlogon,
+                                   NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                    NDR_NETR_SERVERGETTRUSTINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7601,7 +7601,7 @@ NTSTATUS rpccli_netr_ServerGetTrustInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_netlogon,
+                               NDR_NETLOGON_UUID, NDR_NETLOGON_VERSION,
                                NDR_NETR_SERVERGETTRUSTINFO,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c
index 8f32944ee018439629bda5dad9b2949781fff65e..82a6c20093c03a11985dbe52ba24b7a84c85062f 100644 (file)
--- a/librpc/gen_ndr/cli_ntsvcs.c
+++ b/librpc/gen_ndr/cli_ntsvcs.c
@@ -42,7 +42,7 @@ struct tevent_req *rpccli_PNP_Disconnect_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_DISCONNECT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -119,7 +119,7 @@ NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_DISCONNECT,
                                &r);
 
@@ -177,7 +177,7 @@ struct tevent_req *rpccli_PNP_Connect_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_CONNECT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -254,7 +254,7 @@ NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_CONNECT,
                                &r);
 
@@ -320,7 +320,7 @@ struct tevent_req *rpccli_PNP_GetVersion_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETVERSION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -399,7 +399,7 @@ NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETVERSION,
                                &r);
 
@@ -458,7 +458,7 @@ struct tevent_req *rpccli_PNP_GetGlobalState_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETGLOBALSTATE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -535,7 +535,7 @@ NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETGLOBALSTATE,
                                &r);
 
@@ -593,7 +593,7 @@ struct tevent_req *rpccli_PNP_InitDetection_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_INITDETECTION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -670,7 +670,7 @@ NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_INITDETECTION,
                                &r);
 
@@ -728,7 +728,7 @@ struct tevent_req *rpccli_PNP_ReportLogOn_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_REPORTLOGON,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -805,7 +805,7 @@ NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_REPORTLOGON,
                                &r);
 
@@ -867,7 +867,7 @@ struct tevent_req *rpccli_PNP_ValidateDeviceInstance_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_VALIDATEDEVICEINSTANCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -948,7 +948,7 @@ NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_VALIDATEDEVICEINSTANCE,
                                &r);
 
@@ -1006,7 +1006,7 @@ struct tevent_req *rpccli_PNP_GetRootDeviceInstance_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETROOTDEVICEINSTANCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1083,7 +1083,7 @@ NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETROOTDEVICEINSTANCE,
                                &r);
 
@@ -1141,7 +1141,7 @@ struct tevent_req *rpccli_PNP_GetRelatedDeviceInstance_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETRELATEDDEVICEINSTANCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1218,7 +1218,7 @@ NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETRELATEDDEVICEINSTANCE,
                                &r);
 
@@ -1276,7 +1276,7 @@ struct tevent_req *rpccli_PNP_EnumerateSubKeys_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_ENUMERATESUBKEYS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1353,7 +1353,7 @@ NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_ENUMERATESUBKEYS,
                                &r);
 
@@ -1426,7 +1426,7 @@ struct tevent_req *rpccli_PNP_GetDeviceList_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETDEVICELIST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1512,7 +1512,7 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETDEVICELIST,
                                &r);
 
@@ -1584,7 +1584,7 @@ struct tevent_req *rpccli_PNP_GetDeviceListSize_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETDEVICELISTSIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1667,7 +1667,7 @@ NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETDEVICELISTSIZE,
                                &r);
 
@@ -1726,7 +1726,7 @@ struct tevent_req *rpccli_PNP_GetDepth_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETDEPTH,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1803,7 +1803,7 @@ NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETDEPTH,
                                &r);
 
@@ -1884,7 +1884,7 @@ struct tevent_req *rpccli_PNP_GetDeviceRegProp_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETDEVICEREGPROP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1978,7 +1978,7 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETDEVICEREGPROP,
                                &r);
 
@@ -2040,7 +2040,7 @@ struct tevent_req *rpccli_PNP_SetDeviceRegProp_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_SETDEVICEREGPROP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2117,7 +2117,7 @@ NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_SETDEVICEREGPROP,
                                &r);
 
@@ -2175,7 +2175,7 @@ struct tevent_req *rpccli_PNP_GetClassInstance_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETCLASSINSTANCE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2252,7 +2252,7 @@ NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETCLASSINSTANCE,
                                &r);
 
@@ -2310,7 +2310,7 @@ struct tevent_req *rpccli_PNP_CreateKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_CREATEKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2387,7 +2387,7 @@ NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_CREATEKEY,
                                &r);
 
@@ -2445,7 +2445,7 @@ struct tevent_req *rpccli_PNP_DeleteRegistryKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_DELETEREGISTRYKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2522,7 +2522,7 @@ NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_DELETEREGISTRYKEY,
                                &r);
 
@@ -2580,7 +2580,7 @@ struct tevent_req *rpccli_PNP_GetClassCount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETCLASSCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2657,7 +2657,7 @@ NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETCLASSCOUNT,
                                &r);
 
@@ -2715,7 +2715,7 @@ struct tevent_req *rpccli_PNP_GetClassName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETCLASSNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2792,7 +2792,7 @@ NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETCLASSNAME,
                                &r);
 
@@ -2850,7 +2850,7 @@ struct tevent_req *rpccli_PNP_DeleteClassKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_DELETECLASSKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2927,7 +2927,7 @@ NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_DELETECLASSKEY,
                                &r);
 
@@ -2985,7 +2985,7 @@ struct tevent_req *rpccli_PNP_GetInterfaceDeviceAlias_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETINTERFACEDEVICEALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3062,7 +3062,7 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETINTERFACEDEVICEALIAS,
                                &r);
 
@@ -3120,7 +3120,7 @@ struct tevent_req *rpccli_PNP_GetInterfaceDeviceList_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETINTERFACEDEVICELIST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3197,7 +3197,7 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETINTERFACEDEVICELIST,
                                &r);
 
@@ -3255,7 +3255,7 @@ struct tevent_req *rpccli_PNP_GetInterfaceDeviceListSize_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETINTERFACEDEVICELISTSIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3332,7 +3332,7 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceListSize(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETINTERFACEDEVICELISTSIZE,
                                &r);
 
@@ -3390,7 +3390,7 @@ struct tevent_req *rpccli_PNP_RegisterDeviceClassAssociation_send(TALLOC_CTX *me
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_REGISTERDEVICECLASSASSOCIATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3467,7 +3467,7 @@ NTSTATUS rpccli_PNP_RegisterDeviceClassAssociation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_REGISTERDEVICECLASSASSOCIATION,
                                &r);
 
@@ -3525,7 +3525,7 @@ struct tevent_req *rpccli_PNP_UnregisterDeviceClassAssociation_send(TALLOC_CTX *
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_UNREGISTERDEVICECLASSASSOCIATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3602,7 +3602,7 @@ NTSTATUS rpccli_PNP_UnregisterDeviceClassAssociation(struct rpc_pipe_client *cli
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_UNREGISTERDEVICECLASSASSOCIATION,
                                &r);
 
@@ -3660,7 +3660,7 @@ struct tevent_req *rpccli_PNP_GetClassRegProp_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETCLASSREGPROP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3737,7 +3737,7 @@ NTSTATUS rpccli_PNP_GetClassRegProp(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETCLASSREGPROP,
                                &r);
 
@@ -3795,7 +3795,7 @@ struct tevent_req *rpccli_PNP_SetClassRegProp_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_SETCLASSREGPROP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3872,7 +3872,7 @@ NTSTATUS rpccli_PNP_SetClassRegProp(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_SETCLASSREGPROP,
                                &r);
 
@@ -3930,7 +3930,7 @@ struct tevent_req *rpccli_PNP_CreateDevInst_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_CREATEDEVINST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4007,7 +4007,7 @@ NTSTATUS rpccli_PNP_CreateDevInst(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_CREATEDEVINST,
                                &r);
 
@@ -4065,7 +4065,7 @@ struct tevent_req *rpccli_PNP_DeviceInstanceAction_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_DEVICEINSTANCEACTION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4142,7 +4142,7 @@ NTSTATUS rpccli_PNP_DeviceInstanceAction(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_DEVICEINSTANCEACTION,
                                &r);
 
@@ -4200,7 +4200,7 @@ struct tevent_req *rpccli_PNP_GetDeviceStatus_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETDEVICESTATUS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4277,7 +4277,7 @@ NTSTATUS rpccli_PNP_GetDeviceStatus(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETDEVICESTATUS,
                                &r);
 
@@ -4335,7 +4335,7 @@ struct tevent_req *rpccli_PNP_SetDeviceProblem_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_SETDEVICEPROBLEM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4412,7 +4412,7 @@ NTSTATUS rpccli_PNP_SetDeviceProblem(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_SETDEVICEPROBLEM,
                                &r);
 
@@ -4470,7 +4470,7 @@ struct tevent_req *rpccli_PNP_DisableDevInst_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_DISABLEDEVINST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4547,7 +4547,7 @@ NTSTATUS rpccli_PNP_DisableDevInst(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_DISABLEDEVINST,
                                &r);
 
@@ -4605,7 +4605,7 @@ struct tevent_req *rpccli_PNP_UninstallDevInst_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_UNINSTALLDEVINST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4682,7 +4682,7 @@ NTSTATUS rpccli_PNP_UninstallDevInst(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_UNINSTALLDEVINST,
                                &r);
 
@@ -4740,7 +4740,7 @@ struct tevent_req *rpccli_PNP_AddID_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_ADDID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4817,7 +4817,7 @@ NTSTATUS rpccli_PNP_AddID(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_ADDID,
                                &r);
 
@@ -4875,7 +4875,7 @@ struct tevent_req *rpccli_PNP_RegisterDriver_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_REGISTERDRIVER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4952,7 +4952,7 @@ NTSTATUS rpccli_PNP_RegisterDriver(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_REGISTERDRIVER,
                                &r);
 
@@ -5010,7 +5010,7 @@ struct tevent_req *rpccli_PNP_QueryRemove_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_QUERYREMOVE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5087,7 +5087,7 @@ NTSTATUS rpccli_PNP_QueryRemove(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_QUERYREMOVE,
                                &r);
 
@@ -5145,7 +5145,7 @@ struct tevent_req *rpccli_PNP_RequestDeviceEject_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_REQUESTDEVICEEJECT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5222,7 +5222,7 @@ NTSTATUS rpccli_PNP_RequestDeviceEject(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_REQUESTDEVICEEJECT,
                                &r);
 
@@ -5280,7 +5280,7 @@ struct tevent_req *rpccli_PNP_IsDockStationPresent_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_ISDOCKSTATIONPRESENT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5357,7 +5357,7 @@ NTSTATUS rpccli_PNP_IsDockStationPresent(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_ISDOCKSTATIONPRESENT,
                                &r);
 
@@ -5415,7 +5415,7 @@ struct tevent_req *rpccli_PNP_RequestEjectPC_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_REQUESTEJECTPC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5492,7 +5492,7 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_REQUESTEJECTPC,
                                &r);
 
@@ -5576,7 +5576,7 @@ struct tevent_req *rpccli_PNP_HwProfFlags_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_HWPROFFLAGS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5677,7 +5677,7 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_HWPROFFLAGS,
                                &r);
 
@@ -5757,7 +5757,7 @@ struct tevent_req *rpccli_PNP_GetHwProfInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETHWPROFINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5843,7 +5843,7 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETHWPROFINFO,
                                &r);
 
@@ -5902,7 +5902,7 @@ struct tevent_req *rpccli_PNP_AddEmptyLogConf_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_ADDEMPTYLOGCONF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5979,7 +5979,7 @@ NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_ADDEMPTYLOGCONF,
                                &r);
 
@@ -6037,7 +6037,7 @@ struct tevent_req *rpccli_PNP_FreeLogConf_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_FREELOGCONF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6114,7 +6114,7 @@ NTSTATUS rpccli_PNP_FreeLogConf(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_FREELOGCONF,
                                &r);
 
@@ -6172,7 +6172,7 @@ struct tevent_req *rpccli_PNP_GetFirstLogConf_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETFIRSTLOGCONF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6249,7 +6249,7 @@ NTSTATUS rpccli_PNP_GetFirstLogConf(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETFIRSTLOGCONF,
                                &r);
 
@@ -6307,7 +6307,7 @@ struct tevent_req *rpccli_PNP_GetNextLogConf_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETNEXTLOGCONF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6384,7 +6384,7 @@ NTSTATUS rpccli_PNP_GetNextLogConf(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETNEXTLOGCONF,
                                &r);
 
@@ -6442,7 +6442,7 @@ struct tevent_req *rpccli_PNP_GetLogConfPriority_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETLOGCONFPRIORITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6519,7 +6519,7 @@ NTSTATUS rpccli_PNP_GetLogConfPriority(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETLOGCONFPRIORITY,
                                &r);
 
@@ -6577,7 +6577,7 @@ struct tevent_req *rpccli_PNP_AddResDes_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_ADDRESDES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6654,7 +6654,7 @@ NTSTATUS rpccli_PNP_AddResDes(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_ADDRESDES,
                                &r);
 
@@ -6712,7 +6712,7 @@ struct tevent_req *rpccli_PNP_FreeResDes_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_FREERESDES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6789,7 +6789,7 @@ NTSTATUS rpccli_PNP_FreeResDes(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_FREERESDES,
                                &r);
 
@@ -6847,7 +6847,7 @@ struct tevent_req *rpccli_PNP_GetNextResDes_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETNEXTRESDES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6924,7 +6924,7 @@ NTSTATUS rpccli_PNP_GetNextResDes(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETNEXTRESDES,
                                &r);
 
@@ -6982,7 +6982,7 @@ struct tevent_req *rpccli_PNP_GetResDesData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETRESDESDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7059,7 +7059,7 @@ NTSTATUS rpccli_PNP_GetResDesData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETRESDESDATA,
                                &r);
 
@@ -7117,7 +7117,7 @@ struct tevent_req *rpccli_PNP_GetResDesDataSize_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETRESDESDATASIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7194,7 +7194,7 @@ NTSTATUS rpccli_PNP_GetResDesDataSize(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETRESDESDATASIZE,
                                &r);
 
@@ -7252,7 +7252,7 @@ struct tevent_req *rpccli_PNP_ModifyResDes_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_MODIFYRESDES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7329,7 +7329,7 @@ NTSTATUS rpccli_PNP_ModifyResDes(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_MODIFYRESDES,
                                &r);
 
@@ -7387,7 +7387,7 @@ struct tevent_req *rpccli_PNP_DetectResourceLimit_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_DETECTRESOURCELIMIT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7464,7 +7464,7 @@ NTSTATUS rpccli_PNP_DetectResourceLimit(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_DETECTRESOURCELIMIT,
                                &r);
 
@@ -7522,7 +7522,7 @@ struct tevent_req *rpccli_PNP_QueryResConfList_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_QUERYRESCONFLIST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7599,7 +7599,7 @@ NTSTATUS rpccli_PNP_QueryResConfList(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_QUERYRESCONFLIST,
                                &r);
 
@@ -7657,7 +7657,7 @@ struct tevent_req *rpccli_PNP_SetHwProf_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_SETHWPROF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7734,7 +7734,7 @@ NTSTATUS rpccli_PNP_SetHwProf(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_SETHWPROF,
                                &r);
 
@@ -7792,7 +7792,7 @@ struct tevent_req *rpccli_PNP_QueryArbitratorFreeData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_QUERYARBITRATORFREEDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7869,7 +7869,7 @@ NTSTATUS rpccli_PNP_QueryArbitratorFreeData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_QUERYARBITRATORFREEDATA,
                                &r);
 
@@ -7927,7 +7927,7 @@ struct tevent_req *rpccli_PNP_QueryArbitratorFreeSize_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_QUERYARBITRATORFREESIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8004,7 +8004,7 @@ NTSTATUS rpccli_PNP_QueryArbitratorFreeSize(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_QUERYARBITRATORFREESIZE,
                                &r);
 
@@ -8062,7 +8062,7 @@ struct tevent_req *rpccli_PNP_RunDetection_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_RUNDETECTION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8139,7 +8139,7 @@ NTSTATUS rpccli_PNP_RunDetection(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_RUNDETECTION,
                                &r);
 
@@ -8197,7 +8197,7 @@ struct tevent_req *rpccli_PNP_RegisterNotification_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_REGISTERNOTIFICATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8274,7 +8274,7 @@ NTSTATUS rpccli_PNP_RegisterNotification(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_REGISTERNOTIFICATION,
                                &r);
 
@@ -8332,7 +8332,7 @@ struct tevent_req *rpccli_PNP_UnregisterNotification_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_UNREGISTERNOTIFICATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8409,7 +8409,7 @@ NTSTATUS rpccli_PNP_UnregisterNotification(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_UNREGISTERNOTIFICATION,
                                &r);
 
@@ -8467,7 +8467,7 @@ struct tevent_req *rpccli_PNP_GetCustomDevProp_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETCUSTOMDEVPROP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8544,7 +8544,7 @@ NTSTATUS rpccli_PNP_GetCustomDevProp(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETCUSTOMDEVPROP,
                                &r);
 
@@ -8602,7 +8602,7 @@ struct tevent_req *rpccli_PNP_GetVersionInternal_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETVERSIONINTERNAL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8679,7 +8679,7 @@ NTSTATUS rpccli_PNP_GetVersionInternal(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETVERSIONINTERNAL,
                                &r);
 
@@ -8737,7 +8737,7 @@ struct tevent_req *rpccli_PNP_GetBlockedDriverInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETBLOCKEDDRIVERINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8814,7 +8814,7 @@ NTSTATUS rpccli_PNP_GetBlockedDriverInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETBLOCKEDDRIVERINFO,
                                &r);
 
@@ -8872,7 +8872,7 @@ struct tevent_req *rpccli_PNP_GetServerSideDeviceInstallFlags_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_ntsvcs,
+                                   NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                    NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8949,7 +8949,7 @@ NTSTATUS rpccli_PNP_GetServerSideDeviceInstallFlags(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_ntsvcs,
+                               NDR_NTSVCS_UUID, NDR_NTSVCS_VERSION,
                                NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_samr.c b/librpc/gen_ndr/cli_samr.c
index df266e85089c1dc2b9be3a03bb3d32a4d2fb7685..4ce9cf69e577f76352ba3aa0a0d05f7f14032319 100644 (file)
--- a/librpc/gen_ndr/cli_samr.c
+++ b/librpc/gen_ndr/cli_samr.c
@@ -54,7 +54,7 @@ struct tevent_req *rpccli_samr_Connect_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CONNECT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -136,7 +136,7 @@ NTSTATUS rpccli_samr_Connect(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CONNECT,
                                &r);
 
@@ -200,7 +200,7 @@ struct tevent_req *rpccli_samr_Close_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CLOSE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -279,7 +279,7 @@ NTSTATUS rpccli_samr_Close(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CLOSE,
                                &r);
 
@@ -340,7 +340,7 @@ struct tevent_req *rpccli_samr_SetSecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -422,7 +422,7 @@ NTSTATUS rpccli_samr_SetSecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETSECURITY,
                                &r);
 
@@ -488,7 +488,7 @@ struct tevent_req *rpccli_samr_QuerySecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -570,7 +570,7 @@ NTSTATUS rpccli_samr_QuerySecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYSECURITY,
                                &r);
 
@@ -627,7 +627,7 @@ struct tevent_req *rpccli_samr_Shutdown_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SHUTDOWN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -705,7 +705,7 @@ NTSTATUS rpccli_samr_Shutdown(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SHUTDOWN,
                                &r);
 
@@ -771,7 +771,7 @@ struct tevent_req *rpccli_samr_LookupDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_LOOKUPDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -853,7 +853,7 @@ NTSTATUS rpccli_samr_LookupDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_LOOKUPDOMAIN,
                                &r);
 
@@ -925,7 +925,7 @@ struct tevent_req *rpccli_samr_EnumDomains_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ENUMDOMAINS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1012,7 +1012,7 @@ NTSTATUS rpccli_samr_EnumDomains(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ENUMDOMAINS,
                                &r);
 
@@ -1083,7 +1083,7 @@ struct tevent_req *rpccli_samr_OpenDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_OPENDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1167,7 +1167,7 @@ NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_OPENDOMAIN,
                                &r);
 
@@ -1234,7 +1234,7 @@ struct tevent_req *rpccli_samr_QueryDomainInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYDOMAININFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1316,7 +1316,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYDOMAININFO,
                                &r);
 
@@ -1377,7 +1377,7 @@ struct tevent_req *rpccli_samr_SetDomainInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETDOMAININFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1459,7 +1459,7 @@ NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETDOMAININFO,
                                &r);
 
@@ -1529,7 +1529,7 @@ struct tevent_req *rpccli_samr_CreateDomainGroup_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CREATEDOMAINGROUP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1615,7 +1615,7 @@ NTSTATUS rpccli_samr_CreateDomainGroup(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CREATEDOMAINGROUP,
                                &r);
 
@@ -1688,7 +1688,7 @@ struct tevent_req *rpccli_samr_EnumDomainGroups_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ENUMDOMAINGROUPS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1775,7 +1775,7 @@ NTSTATUS rpccli_samr_EnumDomainGroups(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ENUMDOMAINGROUPS,
                                &r);
 
@@ -1848,7 +1848,7 @@ struct tevent_req *rpccli_samr_CreateUser_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CREATEUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1934,7 +1934,7 @@ NTSTATUS rpccli_samr_CreateUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CREATEUSER,
                                &r);
 
@@ -2009,7 +2009,7 @@ struct tevent_req *rpccli_samr_EnumDomainUsers_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ENUMDOMAINUSERS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2098,7 +2098,7 @@ NTSTATUS rpccli_samr_EnumDomainUsers(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ENUMDOMAINUSERS,
                                &r);
 
@@ -2171,7 +2171,7 @@ struct tevent_req *rpccli_samr_CreateDomAlias_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CREATEDOMALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2257,7 +2257,7 @@ NTSTATUS rpccli_samr_CreateDomAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CREATEDOMALIAS,
                                &r);
 
@@ -2330,7 +2330,7 @@ struct tevent_req *rpccli_samr_EnumDomainAliases_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ENUMDOMAINALIASES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2417,7 +2417,7 @@ NTSTATUS rpccli_samr_EnumDomainAliases(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ENUMDOMAINALIASES,
                                &r);
 
@@ -2486,7 +2486,7 @@ struct tevent_req *rpccli_samr_GetAliasMembership_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETALIASMEMBERSHIP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2568,7 +2568,7 @@ NTSTATUS rpccli_samr_GetAliasMembership(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETALIASMEMBERSHIP,
                                &r);
 
@@ -2639,7 +2639,7 @@ struct tevent_req *rpccli_samr_LookupNames_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_LOOKUPNAMES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2725,7 +2725,7 @@ NTSTATUS rpccli_samr_LookupNames(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_LOOKUPNAMES,
                                &r);
 
@@ -2797,7 +2797,7 @@ struct tevent_req *rpccli_samr_LookupRids_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_LOOKUPRIDS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2883,7 +2883,7 @@ NTSTATUS rpccli_samr_LookupRids(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_LOOKUPRIDS,
                                &r);
 
@@ -2953,7 +2953,7 @@ struct tevent_req *rpccli_samr_OpenGroup_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_OPENGROUP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3037,7 +3037,7 @@ NTSTATUS rpccli_samr_OpenGroup(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_OPENGROUP,
                                &r);
 
@@ -3104,7 +3104,7 @@ struct tevent_req *rpccli_samr_QueryGroupInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYGROUPINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3186,7 +3186,7 @@ NTSTATUS rpccli_samr_QueryGroupInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYGROUPINFO,
                                &r);
 
@@ -3247,7 +3247,7 @@ struct tevent_req *rpccli_samr_SetGroupInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETGROUPINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3329,7 +3329,7 @@ NTSTATUS rpccli_samr_SetGroupInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETGROUPINFO,
                                &r);
 
@@ -3389,7 +3389,7 @@ struct tevent_req *rpccli_samr_AddGroupMember_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ADDGROUPMEMBER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3471,7 +3471,7 @@ NTSTATUS rpccli_samr_AddGroupMember(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ADDGROUPMEMBER,
                                &r);
 
@@ -3534,7 +3534,7 @@ struct tevent_req *rpccli_samr_DeleteDomainGroup_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_DELETEDOMAINGROUP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3613,7 +3613,7 @@ NTSTATUS rpccli_samr_DeleteDomainGroup(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_DELETEDOMAINGROUP,
                                &r);
 
@@ -3672,7 +3672,7 @@ struct tevent_req *rpccli_samr_DeleteGroupMember_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_DELETEGROUPMEMBER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3752,7 +3752,7 @@ NTSTATUS rpccli_samr_DeleteGroupMember(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_DELETEGROUPMEMBER,
                                &r);
 
@@ -3816,7 +3816,7 @@ struct tevent_req *rpccli_samr_QueryGroupMember_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYGROUPMEMBER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3896,7 +3896,7 @@ NTSTATUS rpccli_samr_QueryGroupMember(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYGROUPMEMBER,
                                &r);
 
@@ -3957,7 +3957,7 @@ struct tevent_req *rpccli_samr_SetMemberAttributesOfGroup_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4039,7 +4039,7 @@ NTSTATUS rpccli_samr_SetMemberAttributesOfGroup(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETMEMBERATTRIBUTESOFGROUP,
                                &r);
 
@@ -4107,7 +4107,7 @@ struct tevent_req *rpccli_samr_OpenAlias_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_OPENALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4191,7 +4191,7 @@ NTSTATUS rpccli_samr_OpenAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_OPENALIAS,
                                &r);
 
@@ -4258,7 +4258,7 @@ struct tevent_req *rpccli_samr_QueryAliasInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYALIASINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4340,7 +4340,7 @@ NTSTATUS rpccli_samr_QueryAliasInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYALIASINFO,
                                &r);
 
@@ -4401,7 +4401,7 @@ struct tevent_req *rpccli_samr_SetAliasInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETALIASINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4483,7 +4483,7 @@ NTSTATUS rpccli_samr_SetAliasInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETALIASINFO,
                                &r);
 
@@ -4546,7 +4546,7 @@ struct tevent_req *rpccli_samr_DeleteDomAlias_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_DELETEDOMALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4625,7 +4625,7 @@ NTSTATUS rpccli_samr_DeleteDomAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_DELETEDOMALIAS,
                                &r);
 
@@ -4684,7 +4684,7 @@ struct tevent_req *rpccli_samr_AddAliasMember_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ADDALIASMEMBER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4764,7 +4764,7 @@ NTSTATUS rpccli_samr_AddAliasMember(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ADDALIASMEMBER,
                                &r);
 
@@ -4822,7 +4822,7 @@ struct tevent_req *rpccli_samr_DeleteAliasMember_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_DELETEALIASMEMBER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4902,7 +4902,7 @@ NTSTATUS rpccli_samr_DeleteAliasMember(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_DELETEALIASMEMBER,
                                &r);
 
@@ -4966,7 +4966,7 @@ struct tevent_req *rpccli_samr_GetMembersInAlias_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETMEMBERSINALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5046,7 +5046,7 @@ NTSTATUS rpccli_samr_GetMembersInAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETMEMBERSINALIAS,
                                &r);
 
@@ -5115,7 +5115,7 @@ struct tevent_req *rpccli_samr_OpenUser_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_OPENUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5199,7 +5199,7 @@ NTSTATUS rpccli_samr_OpenUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_OPENUSER,
                                &r);
 
@@ -5263,7 +5263,7 @@ struct tevent_req *rpccli_samr_DeleteUser_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_DELETEUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5342,7 +5342,7 @@ NTSTATUS rpccli_samr_DeleteUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_DELETEUSER,
                                &r);
 
@@ -5409,7 +5409,7 @@ struct tevent_req *rpccli_samr_QueryUserInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYUSERINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5491,7 +5491,7 @@ NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYUSERINFO,
                                &r);
 
@@ -5552,7 +5552,7 @@ struct tevent_req *rpccli_samr_SetUserInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETUSERINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5634,7 +5634,7 @@ NTSTATUS rpccli_samr_SetUserInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETUSERINFO,
                                &r);
 
@@ -5710,7 +5710,7 @@ struct tevent_req *rpccli_samr_ChangePasswordUser_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CHANGEPASSWORDUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5808,7 +5808,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CHANGEPASSWORDUSER,
                                &r);
 
@@ -5872,7 +5872,7 @@ struct tevent_req *rpccli_samr_GetGroupsForUser_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETGROUPSFORUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5952,7 +5952,7 @@ NTSTATUS rpccli_samr_GetGroupsForUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETGROUPSFORUSER,
                                &r);
 
@@ -6029,7 +6029,7 @@ struct tevent_req *rpccli_samr_QueryDisplayInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYDISPLAYINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6121,7 +6121,7 @@ NTSTATUS rpccli_samr_QueryDisplayInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYDISPLAYINFO,
                                &r);
 
@@ -6192,7 +6192,7 @@ struct tevent_req *rpccli_samr_GetDisplayEnumerationIndex_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETDISPLAYENUMERATIONINDEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6276,7 +6276,7 @@ NTSTATUS rpccli_samr_GetDisplayEnumerationIndex(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETDISPLAYENUMERATIONINDEX,
                                &r);
 
@@ -6333,7 +6333,7 @@ struct tevent_req *rpccli_samr_TestPrivateFunctionsDomain_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6411,7 +6411,7 @@ NTSTATUS rpccli_samr_TestPrivateFunctionsDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_TESTPRIVATEFUNCTIONSDOMAIN,
                                &r);
 
@@ -6467,7 +6467,7 @@ struct tevent_req *rpccli_samr_TestPrivateFunctionsUser_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_TESTPRIVATEFUNCTIONSUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6545,7 +6545,7 @@ NTSTATUS rpccli_samr_TestPrivateFunctionsUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_TESTPRIVATEFUNCTIONSUSER,
                                &r);
 
@@ -6609,7 +6609,7 @@ struct tevent_req *rpccli_samr_GetUserPwInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETUSERPWINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6689,7 +6689,7 @@ NTSTATUS rpccli_samr_GetUserPwInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETUSERPWINFO,
                                &r);
 
@@ -6748,7 +6748,7 @@ struct tevent_req *rpccli_samr_RemoveMemberFromForeignDomain_send(TALLOC_CTX *me
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6828,7 +6828,7 @@ NTSTATUS rpccli_samr_RemoveMemberFromForeignDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_REMOVEMEMBERFROMFOREIGNDOMAIN,
                                &r);
 
@@ -6894,7 +6894,7 @@ struct tevent_req *rpccli_samr_QueryDomainInfo2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYDOMAININFO2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6976,7 +6976,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYDOMAININFO2,
                                &r);
 
@@ -7043,7 +7043,7 @@ struct tevent_req *rpccli_samr_QueryUserInfo2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYUSERINFO2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7125,7 +7125,7 @@ NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYUSERINFO2,
                                &r);
 
@@ -7202,7 +7202,7 @@ struct tevent_req *rpccli_samr_QueryDisplayInfo2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYDISPLAYINFO2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7294,7 +7294,7 @@ NTSTATUS rpccli_samr_QueryDisplayInfo2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYDISPLAYINFO2,
                                &r);
 
@@ -7365,7 +7365,7 @@ struct tevent_req *rpccli_samr_GetDisplayEnumerationIndex2_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETDISPLAYENUMERATIONINDEX2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7449,7 +7449,7 @@ NTSTATUS rpccli_samr_GetDisplayEnumerationIndex2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETDISPLAYENUMERATIONINDEX2,
                                &r);
 
@@ -7524,7 +7524,7 @@ struct tevent_req *rpccli_samr_CreateUser2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CREATEUSER2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7614,7 +7614,7 @@ NTSTATUS rpccli_samr_CreateUser2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CREATEUSER2,
                                &r);
 
@@ -7693,7 +7693,7 @@ struct tevent_req *rpccli_samr_QueryDisplayInfo3_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_QUERYDISPLAYINFO3,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7785,7 +7785,7 @@ NTSTATUS rpccli_samr_QueryDisplayInfo3(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_QUERYDISPLAYINFO3,
                                &r);
 
@@ -7846,7 +7846,7 @@ struct tevent_req *rpccli_samr_AddMultipleMembersToAlias_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7926,7 +7926,7 @@ NTSTATUS rpccli_samr_AddMultipleMembersToAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_ADDMULTIPLEMEMBERSTOALIAS,
                                &r);
 
@@ -7984,7 +7984,7 @@ struct tevent_req *rpccli_samr_RemoveMultipleMembersFromAlias_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8064,7 +8064,7 @@ NTSTATUS rpccli_samr_RemoveMultipleMembersFromAlias(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_REMOVEMULTIPLEMEMBERSFROMALIAS,
                                &r);
 
@@ -8126,7 +8126,7 @@ struct tevent_req *rpccli_samr_OemChangePasswordUser2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_OEMCHANGEPASSWORDUSER2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8210,7 +8210,7 @@ NTSTATUS rpccli_samr_OemChangePasswordUser2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_OEMCHANGEPASSWORDUSER2,
                                &r);
 
@@ -8278,7 +8278,7 @@ struct tevent_req *rpccli_samr_ChangePasswordUser2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CHANGEPASSWORDUSER2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8368,7 +8368,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CHANGEPASSWORDUSER2,
                                &r);
 
@@ -8432,7 +8432,7 @@ struct tevent_req *rpccli_samr_GetDomPwInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETDOMPWINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8512,7 +8512,7 @@ NTSTATUS rpccli_samr_GetDomPwInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETDOMPWINFO,
                                &r);
 
@@ -8579,7 +8579,7 @@ struct tevent_req *rpccli_samr_Connect2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CONNECT2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8661,7 +8661,7 @@ NTSTATUS rpccli_samr_Connect2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CONNECT2,
                                &r);
 
@@ -8722,7 +8722,7 @@ struct tevent_req *rpccli_samr_SetUserInfo2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETUSERINFO2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8804,7 +8804,7 @@ NTSTATUS rpccli_samr_SetUserInfo2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETUSERINFO2,
                                &r);
 
@@ -8866,7 +8866,7 @@ struct tevent_req *rpccli_samr_SetBootKeyInformation_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETBOOTKEYINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8950,7 +8950,7 @@ NTSTATUS rpccli_samr_SetBootKeyInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETBOOTKEYINFORMATION,
                                &r);
 
@@ -9014,7 +9014,7 @@ struct tevent_req *rpccli_samr_GetBootKeyInformation_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_GETBOOTKEYINFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9094,7 +9094,7 @@ NTSTATUS rpccli_samr_GetBootKeyInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_GETBOOTKEYINFORMATION,
                                &r);
 
@@ -9163,7 +9163,7 @@ struct tevent_req *rpccli_samr_Connect3_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CONNECT3,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9247,7 +9247,7 @@ NTSTATUS rpccli_samr_Connect3(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CONNECT3,
                                &r);
 
@@ -9316,7 +9316,7 @@ struct tevent_req *rpccli_samr_Connect4_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CONNECT4,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9400,7 +9400,7 @@ NTSTATUS rpccli_samr_Connect4(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CONNECT4,
                                &r);
 
@@ -9481,7 +9481,7 @@ struct tevent_req *rpccli_samr_ChangePasswordUser3_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CHANGEPASSWORDUSER3,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9577,7 +9577,7 @@ NTSTATUS rpccli_samr_ChangePasswordUser3(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CHANGEPASSWORDUSER3,
                                &r);
 
@@ -9653,7 +9653,7 @@ struct tevent_req *rpccli_samr_Connect5_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_CONNECT5,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9743,7 +9743,7 @@ NTSTATUS rpccli_samr_Connect5(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_CONNECT5,
                                &r);
 
@@ -9812,7 +9812,7 @@ struct tevent_req *rpccli_samr_RidToSid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_RIDTOSID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9894,7 +9894,7 @@ NTSTATUS rpccli_samr_RidToSid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_RIDTOSID,
                                &r);
 
@@ -9955,7 +9955,7 @@ struct tevent_req *rpccli_samr_SetDsrmPassword_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_SETDSRMPASSWORD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10037,7 +10037,7 @@ NTSTATUS rpccli_samr_SetDsrmPassword(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_SETDSRMPASSWORD,
                                &r);
 
@@ -10103,7 +10103,7 @@ struct tevent_req *rpccli_samr_ValidatePassword_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_samr,
+                                   NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                    NDR_SAMR_VALIDATEPASSWORD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10185,7 +10185,7 @@ NTSTATUS rpccli_samr_ValidatePassword(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_samr,
+                               NDR_SAMR_UUID, NDR_SAMR_VERSION,
                                NDR_SAMR_VALIDATEPASSWORD,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index fc2b8f0861fc6693746754d72e47f05cee65b5b9..a21a33cdfbf69c1f9e94311d66736fb50db5db9d 100644 (file)
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -64,7 +64,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinters_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTERS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -157,7 +157,7 @@ NTSTATUS rpccli_spoolss_EnumPrinters(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTERS,
                                &r);
 
@@ -234,7 +234,7 @@ struct tevent_req *rpccli_spoolss_OpenPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_OPENPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -321,7 +321,7 @@ NTSTATUS rpccli_spoolss_OpenPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_OPENPRINTER,
                                &r);
 
@@ -388,7 +388,7 @@ struct tevent_req *rpccli_spoolss_SetJob_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SETJOB,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -473,7 +473,7 @@ NTSTATUS rpccli_spoolss_SetJob(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SETJOB,
                                &r);
 
@@ -551,7 +551,7 @@ struct tevent_req *rpccli_spoolss_GetJob_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETJOB,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -644,7 +644,7 @@ NTSTATUS rpccli_spoolss_GetJob(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETJOB,
                                &r);
 
@@ -730,7 +730,7 @@ struct tevent_req *rpccli_spoolss_EnumJobs_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMJOBS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -825,7 +825,7 @@ NTSTATUS rpccli_spoolss_EnumJobs(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMJOBS,
                                &r);
 
@@ -902,7 +902,7 @@ struct tevent_req *rpccli_spoolss_AddPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -989,7 +989,7 @@ NTSTATUS rpccli_spoolss_AddPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTER,
                                &r);
 
@@ -1050,7 +1050,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1129,7 +1129,7 @@ NTSTATUS rpccli_spoolss_DeletePrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTER,
                                &r);
 
@@ -1197,7 +1197,7 @@ struct tevent_req *rpccli_spoolss_SetPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SETPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1284,7 +1284,7 @@ NTSTATUS rpccli_spoolss_SetPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SETPRINTER,
                                &r);
 
@@ -1360,7 +1360,7 @@ struct tevent_req *rpccli_spoolss_GetPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1451,7 +1451,7 @@ NTSTATUS rpccli_spoolss_GetPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTER,
                                &r);
 
@@ -1517,7 +1517,7 @@ struct tevent_req *rpccli_spoolss_AddPrinterDriver_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTERDRIVER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1598,7 +1598,7 @@ NTSTATUS rpccli_spoolss_AddPrinterDriver(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTERDRIVER,
                                &r);
 
@@ -1678,7 +1678,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinterDrivers_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTERDRIVERS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1771,7 +1771,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterDrivers(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTERDRIVERS,
                                &r);
 
@@ -1852,7 +1852,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterDriver_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTERDRIVER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1945,7 +1945,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDriver(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTERDRIVER,
                                &r);
 
@@ -2027,7 +2027,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterDriverDirectory_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTERDRIVERDIRECTORY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2120,7 +2120,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDriverDirectory(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTERDRIVERDIRECTORY,
                                &r);
 
@@ -2188,7 +2188,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterDriver_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERDRIVER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2271,7 +2271,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterDriver(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERDRIVER,
                                &r);
 
@@ -2337,7 +2337,7 @@ struct tevent_req *rpccli_spoolss_AddPrintProcessor_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTPROCESSOR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2422,7 +2422,7 @@ NTSTATUS rpccli_spoolss_AddPrintProcessor(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTPROCESSOR,
                                &r);
 
@@ -2502,7 +2502,7 @@ struct tevent_req *rpccli_spoolss_EnumPrintProcessors_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTPROCESSORS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2595,7 +2595,7 @@ NTSTATUS rpccli_spoolss_EnumPrintProcessors(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTPROCESSORS,
                                &r);
 
@@ -2676,7 +2676,7 @@ struct tevent_req *rpccli_spoolss_GetPrintProcessorDirectory_send(TALLOC_CTX *me
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTPROCESSORDIRECTORY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2769,7 +2769,7 @@ NTSTATUS rpccli_spoolss_GetPrintProcessorDirectory(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTPROCESSORDIRECTORY,
                                &r);
 
@@ -2845,7 +2845,7 @@ struct tevent_req *rpccli_spoolss_StartDocPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_STARTDOCPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2930,7 +2930,7 @@ NTSTATUS rpccli_spoolss_StartDocPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_STARTDOCPRINTER,
                                &r);
 
@@ -2991,7 +2991,7 @@ struct tevent_req *rpccli_spoolss_StartPagePrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_STARTPAGEPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3070,7 +3070,7 @@ NTSTATUS rpccli_spoolss_StartPagePrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_STARTPAGEPRINTER,
                                &r);
 
@@ -3142,7 +3142,7 @@ struct tevent_req *rpccli_spoolss_WritePrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_WRITEPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3227,7 +3227,7 @@ NTSTATUS rpccli_spoolss_WritePrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_WRITEPRINTER,
                                &r);
 
@@ -3288,7 +3288,7 @@ struct tevent_req *rpccli_spoolss_EndPagePrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENDPAGEPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3367,7 +3367,7 @@ NTSTATUS rpccli_spoolss_EndPagePrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENDPAGEPRINTER,
                                &r);
 
@@ -3427,7 +3427,7 @@ struct tevent_req *rpccli_spoolss_AbortPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ABORTPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3506,7 +3506,7 @@ NTSTATUS rpccli_spoolss_AbortPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ABORTPRINTER,
                                &r);
 
@@ -3578,7 +3578,7 @@ struct tevent_req *rpccli_spoolss_ReadPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_READPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3663,7 +3663,7 @@ NTSTATUS rpccli_spoolss_ReadPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_READPRINTER,
                                &r);
 
@@ -3725,7 +3725,7 @@ struct tevent_req *rpccli_spoolss_EndDocPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENDDOCPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3804,7 +3804,7 @@ NTSTATUS rpccli_spoolss_EndDocPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENDDOCPRINTER,
                                &r);
 
@@ -3879,7 +3879,7 @@ struct tevent_req *rpccli_spoolss_AddJob_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDJOB,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3969,7 +3969,7 @@ NTSTATUS rpccli_spoolss_AddJob(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDJOB,
                                &r);
 
@@ -4035,7 +4035,7 @@ struct tevent_req *rpccli_spoolss_ScheduleJob_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SCHEDULEJOB,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4116,7 +4116,7 @@ NTSTATUS rpccli_spoolss_ScheduleJob(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SCHEDULEJOB,
                                &r);
 
@@ -4192,7 +4192,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTERDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4281,7 +4281,7 @@ NTSTATUS rpccli_spoolss_GetPrinterData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTERDATA,
                                &r);
 
@@ -4352,7 +4352,7 @@ struct tevent_req *rpccli_spoolss_SetPrinterData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SETPRINTERDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4439,7 +4439,7 @@ NTSTATUS rpccli_spoolss_SetPrinterData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SETPRINTERDATA,
                                &r);
 
@@ -4497,7 +4497,7 @@ struct tevent_req *rpccli_spoolss_WaitForPrinterChange_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_WAITFORPRINTERCHANGE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4574,7 +4574,7 @@ NTSTATUS rpccli_spoolss_WaitForPrinterChange(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_WAITFORPRINTERCHANGE,
                                &r);
 
@@ -4641,7 +4641,7 @@ struct tevent_req *rpccli_spoolss_ClosePrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_CLOSEPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4721,7 +4721,7 @@ NTSTATUS rpccli_spoolss_ClosePrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_CLOSEPRINTER,
                                &r);
 
@@ -4786,7 +4786,7 @@ struct tevent_req *rpccli_spoolss_AddForm_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDFORM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4869,7 +4869,7 @@ NTSTATUS rpccli_spoolss_AddForm(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDFORM,
                                &r);
 
@@ -4931,7 +4931,7 @@ struct tevent_req *rpccli_spoolss_DeleteForm_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEFORM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5012,7 +5012,7 @@ NTSTATUS rpccli_spoolss_DeleteForm(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEFORM,
                                &r);
 
@@ -5090,7 +5090,7 @@ struct tevent_req *rpccli_spoolss_GetForm_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETFORM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5183,7 +5183,7 @@ NTSTATUS rpccli_spoolss_GetForm(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETFORM,
                                &r);
 
@@ -5253,7 +5253,7 @@ struct tevent_req *rpccli_spoolss_SetForm_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SETFORM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5338,7 +5338,7 @@ NTSTATUS rpccli_spoolss_SetForm(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SETFORM,
                                &r);
 
@@ -5416,7 +5416,7 @@ struct tevent_req *rpccli_spoolss_EnumForms_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMFORMS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5507,7 +5507,7 @@ NTSTATUS rpccli_spoolss_EnumForms(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMFORMS,
                                &r);
 
@@ -5588,7 +5588,7 @@ struct tevent_req *rpccli_spoolss_EnumPorts_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPORTS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5679,7 +5679,7 @@ NTSTATUS rpccli_spoolss_EnumPorts(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPORTS,
                                &r);
 
@@ -5760,7 +5760,7 @@ struct tevent_req *rpccli_spoolss_EnumMonitors_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMMONITORS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5851,7 +5851,7 @@ NTSTATUS rpccli_spoolss_EnumMonitors(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMMONITORS,
                                &r);
 
@@ -5918,7 +5918,7 @@ struct tevent_req *rpccli_spoolss_AddPort_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPORT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6001,7 +6001,7 @@ NTSTATUS rpccli_spoolss_AddPort(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPORT,
                                &r);
 
@@ -6059,7 +6059,7 @@ struct tevent_req *rpccli_spoolss_ConfigurePort_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_CONFIGUREPORT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6136,7 +6136,7 @@ NTSTATUS rpccli_spoolss_ConfigurePort(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_CONFIGUREPORT,
                                &r);
 
@@ -6194,7 +6194,7 @@ struct tevent_req *rpccli_spoolss_DeletePort_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPORT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6271,7 +6271,7 @@ NTSTATUS rpccli_spoolss_DeletePort(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPORT,
                                &r);
 
@@ -6341,7 +6341,7 @@ struct tevent_req *rpccli_spoolss_CreatePrinterIC_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_CREATEPRINTERIC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6424,7 +6424,7 @@ NTSTATUS rpccli_spoolss_CreatePrinterIC(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_CREATEPRINTERIC,
                                &r);
 
@@ -6483,7 +6483,7 @@ struct tevent_req *rpccli_spoolss_PlayGDIScriptOnPrinterIC_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_PLAYGDISCRIPTONPRINTERIC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6560,7 +6560,7 @@ NTSTATUS rpccli_spoolss_PlayGDIScriptOnPrinterIC(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_PLAYGDISCRIPTONPRINTERIC,
                                &r);
 
@@ -6627,7 +6627,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterIC_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERIC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6707,7 +6707,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterIC(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERIC,
                                &r);
 
@@ -6766,7 +6766,7 @@ struct tevent_req *rpccli_spoolss_AddPrinterConnection_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTERCONNECTION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6843,7 +6843,7 @@ NTSTATUS rpccli_spoolss_AddPrinterConnection(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTERCONNECTION,
                                &r);
 
@@ -6901,7 +6901,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterConnection_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERCONNECTION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6978,7 +6978,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterConnection(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERCONNECTION,
                                &r);
 
@@ -7036,7 +7036,7 @@ struct tevent_req *rpccli_spoolss_PrinterMessageBox_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_PRINTERMESSAGEBOX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7113,7 +7113,7 @@ NTSTATUS rpccli_spoolss_PrinterMessageBox(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_PRINTERMESSAGEBOX,
                                &r);
 
@@ -7171,7 +7171,7 @@ struct tevent_req *rpccli_spoolss_AddMonitor_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDMONITOR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7248,7 +7248,7 @@ NTSTATUS rpccli_spoolss_AddMonitor(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDMONITOR,
                                &r);
 
@@ -7306,7 +7306,7 @@ struct tevent_req *rpccli_spoolss_DeleteMonitor_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEMONITOR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7383,7 +7383,7 @@ NTSTATUS rpccli_spoolss_DeleteMonitor(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEMONITOR,
                                &r);
 
@@ -7441,7 +7441,7 @@ struct tevent_req *rpccli_spoolss_DeletePrintProcessor_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTPROCESSOR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7518,7 +7518,7 @@ NTSTATUS rpccli_spoolss_DeletePrintProcessor(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTPROCESSOR,
                                &r);
 
@@ -7576,7 +7576,7 @@ struct tevent_req *rpccli_spoolss_AddPrintProvidor_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTPROVIDOR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7653,7 +7653,7 @@ NTSTATUS rpccli_spoolss_AddPrintProvidor(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTPROVIDOR,
                                &r);
 
@@ -7711,7 +7711,7 @@ struct tevent_req *rpccli_spoolss_DeletePrintProvidor_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTPROVIDOR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7788,7 +7788,7 @@ NTSTATUS rpccli_spoolss_DeletePrintProvidor(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTPROVIDOR,
                                &r);
 
@@ -7868,7 +7868,7 @@ struct tevent_req *rpccli_spoolss_EnumPrintProcDataTypes_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTPROCDATATYPES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7961,7 +7961,7 @@ NTSTATUS rpccli_spoolss_EnumPrintProcDataTypes(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTPROCDATATYPES,
                                &r);
 
@@ -8028,7 +8028,7 @@ struct tevent_req *rpccli_spoolss_ResetPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_RESETPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8111,7 +8111,7 @@ NTSTATUS rpccli_spoolss_ResetPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_RESETPRINTER,
                                &r);
 
@@ -8197,7 +8197,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterDriver2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTERDRIVER2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8298,7 +8298,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDriver2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTERDRIVER2,
                                &r);
 
@@ -8362,7 +8362,7 @@ struct tevent_req *rpccli_spoolss_FindFirstPrinterChangeNotification_send(TALLOC
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8439,7 +8439,7 @@ NTSTATUS rpccli_spoolss_FindFirstPrinterChangeNotification(struct rpc_pipe_clien
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION,
                                &r);
 
@@ -8497,7 +8497,7 @@ struct tevent_req *rpccli_spoolss_FindNextPrinterChangeNotification_send(TALLOC_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8574,7 +8574,7 @@ NTSTATUS rpccli_spoolss_FindNextPrinterChangeNotification(struct rpc_pipe_client
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION,
                                &r);
 
@@ -8634,7 +8634,7 @@ struct tevent_req *rpccli_spoolss_FindClosePrinterNotify_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_FINDCLOSEPRINTERNOTIFY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8713,7 +8713,7 @@ NTSTATUS rpccli_spoolss_FindClosePrinterNotify(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_FINDCLOSEPRINTERNOTIFY,
                                &r);
 
@@ -8771,7 +8771,7 @@ struct tevent_req *rpccli_spoolss_RouterFindFirstPrinterChangeNotificationOld_se
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATIONOLD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8848,7 +8848,7 @@ NTSTATUS rpccli_spoolss_RouterFindFirstPrinterChangeNotificationOld(struct rpc_p
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATIONOLD,
                                &r);
 
@@ -8924,7 +8924,7 @@ struct tevent_req *rpccli_spoolss_ReplyOpenPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_REPLYOPENPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9013,7 +9013,7 @@ NTSTATUS rpccli_spoolss_ReplyOpenPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_REPLYOPENPRINTER,
                                &r);
 
@@ -9080,7 +9080,7 @@ struct tevent_req *rpccli_spoolss_RouterReplyPrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ROUTERREPLYPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9165,7 +9165,7 @@ NTSTATUS rpccli_spoolss_RouterReplyPrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ROUTERREPLYPRINTER,
                                &r);
 
@@ -9232,7 +9232,7 @@ struct tevent_req *rpccli_spoolss_ReplyClosePrinter_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_REPLYCLOSEPRINTER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9312,7 +9312,7 @@ NTSTATUS rpccli_spoolss_ReplyClosePrinter(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_REPLYCLOSEPRINTER,
                                &r);
 
@@ -9371,7 +9371,7 @@ struct tevent_req *rpccli_spoolss_AddPortEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPORTEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9448,7 +9448,7 @@ NTSTATUS rpccli_spoolss_AddPortEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPORTEX,
                                &r);
 
@@ -9506,7 +9506,7 @@ struct tevent_req *rpccli_spoolss_RouterFindFirstPrinterChangeNotification_send(
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9583,7 +9583,7 @@ NTSTATUS rpccli_spoolss_RouterFindFirstPrinterChangeNotification(struct rpc_pipe
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ROUTERFINDFIRSTPRINTERCHANGENOTIFICATION,
                                &r);
 
@@ -9641,7 +9641,7 @@ struct tevent_req *rpccli_spoolss_SpoolerInit_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SPOOLERINIT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9718,7 +9718,7 @@ NTSTATUS rpccli_spoolss_SpoolerInit(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SPOOLERINIT,
                                &r);
 
@@ -9776,7 +9776,7 @@ struct tevent_req *rpccli_spoolss_ResetPrinterEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_RESETPRINTEREX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -9853,7 +9853,7 @@ NTSTATUS rpccli_spoolss_ResetPrinterEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_RESETPRINTEREX,
                                &r);
 
@@ -9923,7 +9923,7 @@ struct tevent_req *rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx_send(TALL
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10012,7 +10012,7 @@ NTSTATUS rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct rpc_pipe_cli
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX,
                                &r);
 
@@ -10088,7 +10088,7 @@ struct tevent_req *rpccli_spoolss_RouterReplyPrinterEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ROUTERREPLYPRINTEREX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10177,7 +10177,7 @@ NTSTATUS rpccli_spoolss_RouterReplyPrinterEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ROUTERREPLYPRINTEREX,
                                &r);
 
@@ -10250,7 +10250,7 @@ struct tevent_req *rpccli_spoolss_RouterRefreshPrinterChangeNotify_send(TALLOC_C
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10335,7 +10335,7 @@ NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotify(struct rpc_pipe_client
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY,
                                &r);
 
@@ -10394,7 +10394,7 @@ struct tevent_req *rpccli_spoolss_44_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_44,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10471,7 +10471,7 @@ NTSTATUS rpccli_spoolss_44(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_44,
                                &r);
 
@@ -10549,7 +10549,7 @@ struct tevent_req *rpccli_spoolss_OpenPrinterEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_OPENPRINTEREX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10640,7 +10640,7 @@ NTSTATUS rpccli_spoolss_OpenPrinterEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_OPENPRINTEREX,
                                &r);
 
@@ -10717,7 +10717,7 @@ struct tevent_req *rpccli_spoolss_AddPrinterEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTEREX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10806,7 +10806,7 @@ NTSTATUS rpccli_spoolss_AddPrinterEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTEREX,
                                &r);
 
@@ -10865,7 +10865,7 @@ struct tevent_req *rpccli_spoolss_47_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_47,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -10942,7 +10942,7 @@ NTSTATUS rpccli_spoolss_47(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_47,
                                &r);
 
@@ -11024,7 +11024,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinterData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTERDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11119,7 +11119,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTERDATA,
                                &r);
 
@@ -11186,7 +11186,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11267,7 +11267,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERDATA,
                                &r);
 
@@ -11325,7 +11325,7 @@ struct tevent_req *rpccli_spoolss_4a_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_4A,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11402,7 +11402,7 @@ NTSTATUS rpccli_spoolss_4a(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_4A,
                                &r);
 
@@ -11460,7 +11460,7 @@ struct tevent_req *rpccli_spoolss_4b_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_4B,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11537,7 +11537,7 @@ NTSTATUS rpccli_spoolss_4b(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_4B,
                                &r);
 
@@ -11595,7 +11595,7 @@ struct tevent_req *rpccli_spoolss_4c_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_4C,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11672,7 +11672,7 @@ NTSTATUS rpccli_spoolss_4c(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_4C,
                                &r);
 
@@ -11742,7 +11742,7 @@ struct tevent_req *rpccli_spoolss_SetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_SETPRINTERDATAEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -11831,7 +11831,7 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_SETPRINTERDATAEX,
                                &r);
 
@@ -11909,7 +11909,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTERDATAEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12000,7 +12000,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTERDATAEX,
                                &r);
 
@@ -12079,7 +12079,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinterDataEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTERDATAEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12168,7 +12168,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterDataEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTERDATAEX,
                                &r);
 
@@ -12245,7 +12245,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ENUMPRINTERKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12332,7 +12332,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ENUMPRINTERKEY,
                                &r);
 
@@ -12398,7 +12398,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterDataEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERDATAEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12481,7 +12481,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterDataEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERDATAEX,
                                &r);
 
@@ -12543,7 +12543,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12624,7 +12624,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERKEY,
                                &r);
 
@@ -12682,7 +12682,7 @@ struct tevent_req *rpccli_spoolss_53_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_53,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12759,7 +12759,7 @@ NTSTATUS rpccli_spoolss_53(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_53,
                                &r);
 
@@ -12827,7 +12827,7 @@ struct tevent_req *rpccli_spoolss_DeletePrinterDriverEx_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_DELETEPRINTERDRIVEREX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -12914,7 +12914,7 @@ NTSTATUS rpccli_spoolss_DeletePrinterDriverEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_DELETEPRINTERDRIVEREX,
                                &r);
 
@@ -12972,7 +12972,7 @@ struct tevent_req *rpccli_spoolss_55_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_55,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13049,7 +13049,7 @@ NTSTATUS rpccli_spoolss_55(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_55,
                                &r);
 
@@ -13107,7 +13107,7 @@ struct tevent_req *rpccli_spoolss_56_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_56,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13184,7 +13184,7 @@ NTSTATUS rpccli_spoolss_56(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_56,
                                &r);
 
@@ -13242,7 +13242,7 @@ struct tevent_req *rpccli_spoolss_57_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_57,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13319,7 +13319,7 @@ NTSTATUS rpccli_spoolss_57(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_57,
                                &r);
 
@@ -13400,7 +13400,7 @@ struct tevent_req *rpccli_spoolss_XcvData_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_XCVDATA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13494,7 +13494,7 @@ NTSTATUS rpccli_spoolss_XcvData(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_XCVDATA,
                                &r);
 
@@ -13561,7 +13561,7 @@ struct tevent_req *rpccli_spoolss_AddPrinterDriverEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_ADDPRINTERDRIVEREX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13644,7 +13644,7 @@ NTSTATUS rpccli_spoolss_AddPrinterDriverEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_ADDPRINTERDRIVEREX,
                                &r);
 
@@ -13702,7 +13702,7 @@ struct tevent_req *rpccli_spoolss_5a_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_5A,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13779,7 +13779,7 @@ NTSTATUS rpccli_spoolss_5a(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_5A,
                                &r);
 
@@ -13837,7 +13837,7 @@ struct tevent_req *rpccli_spoolss_5b_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_5B,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -13914,7 +13914,7 @@ NTSTATUS rpccli_spoolss_5b(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_5B,
                                &r);
 
@@ -13972,7 +13972,7 @@ struct tevent_req *rpccli_spoolss_5c_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_5C,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14049,7 +14049,7 @@ NTSTATUS rpccli_spoolss_5c(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_5C,
                                &r);
 
@@ -14107,7 +14107,7 @@ struct tevent_req *rpccli_spoolss_5d_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_5D,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14184,7 +14184,7 @@ NTSTATUS rpccli_spoolss_5d(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_5D,
                                &r);
 
@@ -14242,7 +14242,7 @@ struct tevent_req *rpccli_spoolss_5e_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_5E,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14319,7 +14319,7 @@ NTSTATUS rpccli_spoolss_5e(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_5E,
                                &r);
 
@@ -14377,7 +14377,7 @@ struct tevent_req *rpccli_spoolss_5f_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_5F,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14454,7 +14454,7 @@ NTSTATUS rpccli_spoolss_5f(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_5F,
                                &r);
 
@@ -14512,7 +14512,7 @@ struct tevent_req *rpccli_spoolss_60_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_60,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14589,7 +14589,7 @@ NTSTATUS rpccli_spoolss_60(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_60,
                                &r);
 
@@ -14647,7 +14647,7 @@ struct tevent_req *rpccli_spoolss_61_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_61,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14724,7 +14724,7 @@ NTSTATUS rpccli_spoolss_61(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_61,
                                &r);
 
@@ -14782,7 +14782,7 @@ struct tevent_req *rpccli_spoolss_62_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_62,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14859,7 +14859,7 @@ NTSTATUS rpccli_spoolss_62(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_62,
                                &r);
 
@@ -14917,7 +14917,7 @@ struct tevent_req *rpccli_spoolss_63_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_63,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -14994,7 +14994,7 @@ NTSTATUS rpccli_spoolss_63(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_63,
                                &r);
 
@@ -15052,7 +15052,7 @@ struct tevent_req *rpccli_spoolss_64_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_64,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -15129,7 +15129,7 @@ NTSTATUS rpccli_spoolss_64(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_64,
                                &r);
 
@@ -15187,7 +15187,7 @@ struct tevent_req *rpccli_spoolss_65_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_65,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -15264,7 +15264,7 @@ NTSTATUS rpccli_spoolss_65(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_65,
                                &r);
 
@@ -15340,7 +15340,7 @@ struct tevent_req *rpccli_spoolss_GetCorePrinterDrivers_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETCOREPRINTERDRIVERS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -15429,7 +15429,7 @@ NTSTATUS rpccli_spoolss_GetCorePrinterDrivers(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETCOREPRINTERDRIVERS,
                                &r);
 
@@ -15488,7 +15488,7 @@ struct tevent_req *rpccli_spoolss_67_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_67,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -15565,7 +15565,7 @@ NTSTATUS rpccli_spoolss_67(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_67,
                                &r);
 
@@ -15644,7 +15644,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterDriverPackagePath_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_GETPRINTERDRIVERPACKAGEPATH,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -15738,7 +15738,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDriverPackagePath(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_GETPRINTERDRIVERPACKAGEPATH,
                                &r);
 
@@ -15800,7 +15800,7 @@ struct tevent_req *rpccli_spoolss_69_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_69,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -15877,7 +15877,7 @@ NTSTATUS rpccli_spoolss_69(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_69,
                                &r);
 
@@ -15935,7 +15935,7 @@ struct tevent_req *rpccli_spoolss_6a_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_6A,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -16012,7 +16012,7 @@ NTSTATUS rpccli_spoolss_6a(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_6A,
                                &r);
 
@@ -16070,7 +16070,7 @@ struct tevent_req *rpccli_spoolss_6b_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_6B,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -16147,7 +16147,7 @@ NTSTATUS rpccli_spoolss_6b(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_6B,
                                &r);
 
@@ -16205,7 +16205,7 @@ struct tevent_req *rpccli_spoolss_6c_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_6C,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -16282,7 +16282,7 @@ NTSTATUS rpccli_spoolss_6c(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_6C,
                                &r);
 
@@ -16340,7 +16340,7 @@ struct tevent_req *rpccli_spoolss_6d_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_spoolss,
+                                   NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                    NDR_SPOOLSS_6D,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -16417,7 +16417,7 @@ NTSTATUS rpccli_spoolss_6d(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_spoolss,
+                               NDR_SPOOLSS_UUID, NDR_SPOOLSS_VERSION,
                                NDR_SPOOLSS_6D,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_srvsvc.c b/librpc/gen_ndr/cli_srvsvc.c
index 9b2a507c955c4c54a3d5724f27fc8c1871a12170..d27340ada246fdb62a215497711a72ce1b6205d8 100644 (file)
--- a/librpc/gen_ndr/cli_srvsvc.c
+++ b/librpc/gen_ndr/cli_srvsvc.c
@@ -60,7 +60,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -151,7 +151,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVENUM,
                                &r);
 
@@ -228,7 +228,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -313,7 +313,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVGETINFO,
                                &r);
 
@@ -378,7 +378,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevControl_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVCONTROL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -461,7 +461,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevControl(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVCONTROL,
                                &r);
 
@@ -539,7 +539,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevQEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVQENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -632,7 +632,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVQENUM,
                                &r);
 
@@ -711,7 +711,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevQGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVQGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -798,7 +798,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVQGETINFO,
                                &r);
 
@@ -874,7 +874,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevQSetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVQSETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -964,7 +964,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQSetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVQSETINFO,
                                &r);
 
@@ -1029,7 +1029,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevQPurge_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVQPURGE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1110,7 +1110,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQPurge(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVQPURGE,
                                &r);
 
@@ -1174,7 +1174,7 @@ struct tevent_req *rpccli_srvsvc_NetCharDevQPurgeSelf_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCHARDEVQPURGESELF,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1257,7 +1257,7 @@ NTSTATUS rpccli_srvsvc_NetCharDevQPurgeSelf(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCHARDEVQPURGESELF,
                                &r);
 
@@ -1335,7 +1335,7 @@ struct tevent_req *rpccli_srvsvc_NetConnEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETCONNENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1428,7 +1428,7 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETCONNENUM,
                                &r);
 
@@ -1513,7 +1513,7 @@ struct tevent_req *rpccli_srvsvc_NetFileEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETFILEENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1608,7 +1608,7 @@ NTSTATUS rpccli_srvsvc_NetFileEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETFILEENUM,
                                &r);
 
@@ -1685,7 +1685,7 @@ struct tevent_req *rpccli_srvsvc_NetFileGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETFILEGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1770,7 +1770,7 @@ NTSTATUS rpccli_srvsvc_NetFileGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETFILEGETINFO,
                                &r);
 
@@ -1833,7 +1833,7 @@ struct tevent_req *rpccli_srvsvc_NetFileClose_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETFILECLOSE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1914,7 +1914,7 @@ NTSTATUS rpccli_srvsvc_NetFileClose(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETFILECLOSE,
                                &r);
 
@@ -1994,7 +1994,7 @@ struct tevent_req *rpccli_srvsvc_NetSessEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSESSENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2089,7 +2089,7 @@ NTSTATUS rpccli_srvsvc_NetSessEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSESSENUM,
                                &r);
 
@@ -2158,7 +2158,7 @@ struct tevent_req *rpccli_srvsvc_NetSessDel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSESSDEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2241,7 +2241,7 @@ NTSTATUS rpccli_srvsvc_NetSessDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSESSDEL,
                                &r);
 
@@ -2314,7 +2314,7 @@ struct tevent_req *rpccli_srvsvc_NetShareAdd_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2402,7 +2402,7 @@ NTSTATUS rpccli_srvsvc_NetShareAdd(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREADD,
                                &r);
 
@@ -2481,7 +2481,7 @@ struct tevent_req *rpccli_srvsvc_NetShareEnumAll_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREENUMALL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2572,7 +2572,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnumAll(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREENUMALL,
                                &r);
 
@@ -2649,7 +2649,7 @@ struct tevent_req *rpccli_srvsvc_NetShareGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2734,7 +2734,7 @@ NTSTATUS rpccli_srvsvc_NetShareGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREGETINFO,
                                &r);
 
@@ -2810,7 +2810,7 @@ struct tevent_req *rpccli_srvsvc_NetShareSetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHARESETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2900,7 +2900,7 @@ NTSTATUS rpccli_srvsvc_NetShareSetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHARESETINFO,
                                &r);
 
@@ -2967,7 +2967,7 @@ struct tevent_req *rpccli_srvsvc_NetShareDel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREDEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3050,7 +3050,7 @@ NTSTATUS rpccli_srvsvc_NetShareDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREDEL,
                                &r);
 
@@ -3114,7 +3114,7 @@ struct tevent_req *rpccli_srvsvc_NetShareDelSticky_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREDELSTICKY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3197,7 +3197,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelSticky(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREDELSTICKY,
                                &r);
 
@@ -3267,7 +3267,7 @@ struct tevent_req *rpccli_srvsvc_NetShareCheck_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHARECHECK,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3350,7 +3350,7 @@ NTSTATUS rpccli_srvsvc_NetShareCheck(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHARECHECK,
                                &r);
 
@@ -3421,7 +3421,7 @@ struct tevent_req *rpccli_srvsvc_NetSrvGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSRVGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3504,7 +3504,7 @@ NTSTATUS rpccli_srvsvc_NetSrvGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSRVGETINFO,
                                &r);
 
@@ -3578,7 +3578,7 @@ struct tevent_req *rpccli_srvsvc_NetSrvSetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSRVSETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3666,7 +3666,7 @@ NTSTATUS rpccli_srvsvc_NetSrvSetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSRVSETINFO,
                                &r);
 
@@ -3747,7 +3747,7 @@ struct tevent_req *rpccli_srvsvc_NetDiskEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETDISKENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3840,7 +3840,7 @@ NTSTATUS rpccli_srvsvc_NetDiskEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETDISKENUM,
                                &r);
 
@@ -3919,7 +3919,7 @@ struct tevent_req *rpccli_srvsvc_NetServerStatisticsGet_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSERVERSTATISTICSGET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4006,7 +4006,7 @@ NTSTATUS rpccli_srvsvc_NetServerStatisticsGet(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSERVERSTATISTICSGET,
                                &r);
 
@@ -4071,7 +4071,7 @@ struct tevent_req *rpccli_srvsvc_NetTransportAdd_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETTRANSPORTADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4154,7 +4154,7 @@ NTSTATUS rpccli_srvsvc_NetTransportAdd(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETTRANSPORTADD,
                                &r);
 
@@ -4230,7 +4230,7 @@ struct tevent_req *rpccli_srvsvc_NetTransportEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETTRANSPORTENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4321,7 +4321,7 @@ NTSTATUS rpccli_srvsvc_NetTransportEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETTRANSPORTENUM,
                                &r);
 
@@ -4390,7 +4390,7 @@ struct tevent_req *rpccli_srvsvc_NetTransportDel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETTRANSPORTDEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4473,7 +4473,7 @@ NTSTATUS rpccli_srvsvc_NetTransportDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETTRANSPORTDEL,
                                &r);
 
@@ -4541,7 +4541,7 @@ struct tevent_req *rpccli_srvsvc_NetRemoteTOD_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETREMOTETOD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4622,7 +4622,7 @@ NTSTATUS rpccli_srvsvc_NetRemoteTOD(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETREMOTETOD,
                                &r);
 
@@ -4689,7 +4689,7 @@ struct tevent_req *rpccli_srvsvc_NetSetServiceBits_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSETSERVICEBITS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4774,7 +4774,7 @@ NTSTATUS rpccli_srvsvc_NetSetServiceBits(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSETSERVICEBITS,
                                &r);
 
@@ -4846,7 +4846,7 @@ struct tevent_req *rpccli_srvsvc_NetPathType_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETPATHTYPE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4931,7 +4931,7 @@ NTSTATUS rpccli_srvsvc_NetPathType(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETPATHTYPE,
                                &r);
 
@@ -5011,7 +5011,7 @@ struct tevent_req *rpccli_srvsvc_NetPathCanonicalize_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETPATHCANONICALIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5103,7 +5103,7 @@ NTSTATUS rpccli_srvsvc_NetPathCanonicalize(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETPATHCANONICALIZE,
                                &r);
 
@@ -5173,7 +5173,7 @@ struct tevent_req *rpccli_srvsvc_NetPathCompare_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETPATHCOMPARE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5260,7 +5260,7 @@ NTSTATUS rpccli_srvsvc_NetPathCompare(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETPATHCOMPARE,
                                &r);
 
@@ -5326,7 +5326,7 @@ struct tevent_req *rpccli_srvsvc_NetNameValidate_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETNAMEVALIDATE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5411,7 +5411,7 @@ NTSTATUS rpccli_srvsvc_NetNameValidate(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETNAMEVALIDATE,
                                &r);
 
@@ -5469,7 +5469,7 @@ struct tevent_req *rpccli_srvsvc_NETRPRNAMECANONICALIZE_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRPRNAMECANONICALIZE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5546,7 +5546,7 @@ NTSTATUS rpccli_srvsvc_NETRPRNAMECANONICALIZE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRPRNAMECANONICALIZE,
                                &r);
 
@@ -5614,7 +5614,7 @@ struct tevent_req *rpccli_srvsvc_NetPRNameCompare_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETPRNAMECOMPARE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5701,7 +5701,7 @@ NTSTATUS rpccli_srvsvc_NetPRNameCompare(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETPRNAMECOMPARE,
                                &r);
 
@@ -5777,7 +5777,7 @@ struct tevent_req *rpccli_srvsvc_NetShareEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5868,7 +5868,7 @@ NTSTATUS rpccli_srvsvc_NetShareEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREENUM,
                                &r);
 
@@ -5945,7 +5945,7 @@ struct tevent_req *rpccli_srvsvc_NetShareDelStart_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREDELSTART,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6032,7 +6032,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelStart(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREDELSTART,
                                &r);
 
@@ -6102,7 +6102,7 @@ struct tevent_req *rpccli_srvsvc_NetShareDelCommit_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSHAREDELCOMMIT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6184,7 +6184,7 @@ NTSTATUS rpccli_srvsvc_NetShareDelCommit(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSHAREDELCOMMIT,
                                &r);
 
@@ -6261,7 +6261,7 @@ struct tevent_req *rpccli_srvsvc_NetGetFileSecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETGETFILESECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6348,7 +6348,7 @@ NTSTATUS rpccli_srvsvc_NetGetFileSecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETGETFILESECURITY,
                                &r);
 
@@ -6417,7 +6417,7 @@ struct tevent_req *rpccli_srvsvc_NetSetFileSecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSETFILESECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6504,7 +6504,7 @@ NTSTATUS rpccli_srvsvc_NetSetFileSecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSETFILESECURITY,
                                &r);
 
@@ -6568,7 +6568,7 @@ struct tevent_req *rpccli_srvsvc_NetServerTransportAddEx_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSERVERTRANSPORTADDEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6651,7 +6651,7 @@ NTSTATUS rpccli_srvsvc_NetServerTransportAddEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSERVERTRANSPORTADDEX,
                                &r);
 
@@ -6721,7 +6721,7 @@ struct tevent_req *rpccli_srvsvc_NetServerSetServiceBitsEx_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETSERVERSETSERVICEBITSEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6810,7 +6810,7 @@ NTSTATUS rpccli_srvsvc_NetServerSetServiceBitsEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETSERVERSETSERVICEBITSEX,
                                &r);
 
@@ -6868,7 +6868,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSGETVERSION_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSGETVERSION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6945,7 +6945,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSGETVERSION(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSGETVERSION,
                                &r);
 
@@ -7003,7 +7003,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSCREATELOCALPARTITION_send(TALLOC_CTX *me
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSCREATELOCALPARTITION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7080,7 +7080,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSCREATELOCALPARTITION(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSCREATELOCALPARTITION,
                                &r);
 
@@ -7138,7 +7138,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSDELETELOCALPARTITION_send(TALLOC_CTX *me
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSDELETELOCALPARTITION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7215,7 +7215,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSDELETELOCALPARTITION(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSDELETELOCALPARTITION,
                                &r);
 
@@ -7273,7 +7273,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSSETLOCALVOLUMESTATE_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7350,7 +7350,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSSETLOCALVOLUMESTATE,
                                &r);
 
@@ -7408,7 +7408,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSSETSERVERINFO_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSSETSERVERINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7485,7 +7485,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSSETSERVERINFO(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSSETSERVERINFO,
                                &r);
 
@@ -7543,7 +7543,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSCREATEEXITPOINT_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSCREATEEXITPOINT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7620,7 +7620,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSCREATEEXITPOINT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSCREATEEXITPOINT,
                                &r);
 
@@ -7678,7 +7678,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSDELETEEXITPOINT_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSDELETEEXITPOINT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7755,7 +7755,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSDELETEEXITPOINT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSDELETEEXITPOINT,
                                &r);
 
@@ -7813,7 +7813,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSMODIFYPREFIX_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSMODIFYPREFIX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7890,7 +7890,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSMODIFYPREFIX(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSMODIFYPREFIX,
                                &r);
 
@@ -7948,7 +7948,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSFIXLOCALVOLUME_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSFIXLOCALVOLUME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8025,7 +8025,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSFIXLOCALVOLUME(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSFIXLOCALVOLUME,
                                &r);
 
@@ -8083,7 +8083,7 @@ struct tevent_req *rpccli_srvsvc_NETRDFSMANAGERREPORTSITEINFO_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8160,7 +8160,7 @@ NTSTATUS rpccli_srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRDFSMANAGERREPORTSITEINFO,
                                &r);
 
@@ -8218,7 +8218,7 @@ struct tevent_req *rpccli_srvsvc_NETRSERVERTRANSPORTDELEX_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_srvsvc,
+                                   NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                    NDR_SRVSVC_NETRSERVERTRANSPORTDELEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -8295,7 +8295,7 @@ NTSTATUS rpccli_srvsvc_NETRSERVERTRANSPORTDELEX(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_srvsvc,
+                               NDR_SRVSVC_UUID, NDR_SRVSVC_VERSION,
                                NDR_SRVSVC_NETRSERVERTRANSPORTDELEX,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_svcctl.c b/librpc/gen_ndr/cli_svcctl.c
index 59fabac4b37b1bc2e969160d0c23b6a2f17e3dee..8fbfd3588c43c82bb093a131dc8779c95e88f67a 100644 (file)
--- a/librpc/gen_ndr/cli_svcctl.c
+++ b/librpc/gen_ndr/cli_svcctl.c
@@ -51,7 +51,7 @@ struct tevent_req *rpccli_svcctl_CloseServiceHandle_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CLOSESERVICEHANDLE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -131,7 +131,7 @@ NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CLOSESERVICEHANDLE,
                                &r);
 
@@ -202,7 +202,7 @@ struct tevent_req *rpccli_svcctl_ControlService_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CONTROLSERVICE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -285,7 +285,7 @@ NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CONTROLSERVICE,
                                &r);
 
@@ -346,7 +346,7 @@ struct tevent_req *rpccli_svcctl_DeleteService_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_DELETESERVICE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -425,7 +425,7 @@ NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_DELETESERVICE,
                                &r);
 
@@ -493,7 +493,7 @@ struct tevent_req *rpccli_svcctl_LockServiceDatabase_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_LOCKSERVICEDATABASE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -574,7 +574,7 @@ NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_LOCKSERVICEDATABASE,
                                &r);
 
@@ -649,7 +649,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceObjectSecurity_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -736,7 +736,7 @@ NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY,
                                &r);
 
@@ -804,7 +804,7 @@ struct tevent_req *rpccli_svcctl_SetServiceObjectSecurity_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_SETSERVICEOBJECTSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -889,7 +889,7 @@ NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_SETSERVICEOBJECTSECURITY,
                                &r);
 
@@ -957,7 +957,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceStatus_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICESTATUS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1038,7 +1038,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICESTATUS,
                                &r);
 
@@ -1097,7 +1097,7 @@ struct tevent_req *rpccli_svcctl_SetServiceStatus_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_SETSERVICESTATUS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1174,7 +1174,7 @@ NTSTATUS rpccli_svcctl_SetServiceStatus(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_SETSERVICESTATUS,
                                &r);
 
@@ -1241,7 +1241,7 @@ struct tevent_req *rpccli_svcctl_UnlockServiceDatabase_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_UNLOCKSERVICEDATABASE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1321,7 +1321,7 @@ NTSTATUS rpccli_svcctl_UnlockServiceDatabase(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_UNLOCKSERVICEDATABASE,
                                &r);
 
@@ -1380,7 +1380,7 @@ struct tevent_req *rpccli_svcctl_NotifyBootConfigStatus_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1457,7 +1457,7 @@ NTSTATUS rpccli_svcctl_NotifyBootConfigStatus(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS,
                                &r);
 
@@ -1523,7 +1523,7 @@ struct tevent_req *rpccli_svcctl_SCSetServiceBitsW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_SCSETSERVICEBITSW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1608,7 +1608,7 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_SCSETSERVICEBITSW,
                                &r);
 
@@ -1694,7 +1694,7 @@ struct tevent_req *rpccli_svcctl_ChangeServiceConfigW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CHANGESERVICECONFIGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1793,7 +1793,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CHANGESERVICECONFIGW,
                                &r);
 
@@ -1891,7 +1891,7 @@ struct tevent_req *rpccli_svcctl_CreateServiceW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CREATESERVICEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2003,7 +2003,7 @@ NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CREATESERVICEW,
                                &r);
 
@@ -2083,7 +2083,7 @@ struct tevent_req *rpccli_svcctl_EnumDependentServicesW_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_ENUMDEPENDENTSERVICESW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2172,7 +2172,7 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_ENUMDEPENDENTSERVICESW,
                                &r);
 
@@ -2256,7 +2256,7 @@ struct tevent_req *rpccli_svcctl_EnumServicesStatusW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_ENUMSERVICESSTATUSW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2352,7 +2352,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_ENUMSERVICESSTATUSW,
                                &r);
 
@@ -2430,7 +2430,7 @@ struct tevent_req *rpccli_svcctl_OpenSCManagerW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_OPENSCMANAGERW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2515,7 +2515,7 @@ NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_OPENSCMANAGERW,
                                &r);
 
@@ -2588,7 +2588,7 @@ struct tevent_req *rpccli_svcctl_OpenServiceW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_OPENSERVICEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2673,7 +2673,7 @@ NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_OPENSERVICEW,
                                &r);
 
@@ -2746,7 +2746,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceConfigW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICECONFIGW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2831,7 +2831,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICECONFIGW,
                                &r);
 
@@ -2905,7 +2905,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceLockStatusW_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICELOCKSTATUSW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2990,7 +2990,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICELOCKSTATUSW,
                                &r);
 
@@ -3056,7 +3056,7 @@ struct tevent_req *rpccli_svcctl_StartServiceW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_STARTSERVICEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3139,7 +3139,7 @@ NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_STARTSERVICEW,
                                &r);
 
@@ -3212,7 +3212,7 @@ struct tevent_req *rpccli_svcctl_GetServiceDisplayNameW_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_GETSERVICEDISPLAYNAMEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3300,7 +3300,7 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_GETSERVICEDISPLAYNAMEW,
                                &r);
 
@@ -3377,7 +3377,7 @@ struct tevent_req *rpccli_svcctl_GetServiceKeyNameW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_GETSERVICEKEYNAMEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3465,7 +3465,7 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_GETSERVICEKEYNAMEW,
                                &r);
 
@@ -3535,7 +3535,7 @@ struct tevent_req *rpccli_svcctl_SCSetServiceBitsA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_SCSETSERVICEBITSA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3620,7 +3620,7 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_SCSETSERVICEBITSA,
                                &r);
 
@@ -3706,7 +3706,7 @@ struct tevent_req *rpccli_svcctl_ChangeServiceConfigA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CHANGESERVICECONFIGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3805,7 +3805,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CHANGESERVICECONFIGA,
                                &r);
 
@@ -3896,7 +3896,7 @@ struct tevent_req *rpccli_svcctl_CreateServiceA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CREATESERVICEA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4001,7 +4001,7 @@ NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CREATESERVICEA,
                                &r);
 
@@ -4080,7 +4080,7 @@ struct tevent_req *rpccli_svcctl_EnumDependentServicesA_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_ENUMDEPENDENTSERVICESA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4171,7 +4171,7 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_ENUMDEPENDENTSERVICESA,
                                &r);
 
@@ -4257,7 +4257,7 @@ struct tevent_req *rpccli_svcctl_EnumServicesStatusA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_ENUMSERVICESSTATUSA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4353,7 +4353,7 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_ENUMSERVICESSTATUSA,
                                &r);
 
@@ -4431,7 +4431,7 @@ struct tevent_req *rpccli_svcctl_OpenSCManagerA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_OPENSCMANAGERA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4516,7 +4516,7 @@ NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_OPENSCMANAGERA,
                                &r);
 
@@ -4581,7 +4581,7 @@ struct tevent_req *rpccli_svcctl_OpenServiceA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_OPENSERVICEA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4664,7 +4664,7 @@ NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_OPENSERVICEA,
                                &r);
 
@@ -4736,7 +4736,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceConfigA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICECONFIGA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4821,7 +4821,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICECONFIGA,
                                &r);
 
@@ -4895,7 +4895,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceLockStatusA_send(TALLOC_CTX *mem_ct
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICELOCKSTATUSA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4980,7 +4980,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICELOCKSTATUSA,
                                &r);
 
@@ -5046,7 +5046,7 @@ struct tevent_req *rpccli_svcctl_StartServiceA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_STARTSERVICEA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5129,7 +5129,7 @@ NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_STARTSERVICEA,
                                &r);
 
@@ -5202,7 +5202,7 @@ struct tevent_req *rpccli_svcctl_GetServiceDisplayNameA_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_GETSERVICEDISPLAYNAMEA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5290,7 +5290,7 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_GETSERVICEDISPLAYNAMEA,
                                &r);
 
@@ -5367,7 +5367,7 @@ struct tevent_req *rpccli_svcctl_GetServiceKeyNameA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_GETSERVICEKEYNAMEA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5455,7 +5455,7 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_GETSERVICEKEYNAMEA,
                                &r);
 
@@ -5517,7 +5517,7 @@ struct tevent_req *rpccli_svcctl_GetCurrentGroupeStateW_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_GETCURRENTGROUPESTATEW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5594,7 +5594,7 @@ NTSTATUS rpccli_svcctl_GetCurrentGroupeStateW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_GETCURRENTGROUPESTATEW,
                                &r);
 
@@ -5652,7 +5652,7 @@ struct tevent_req *rpccli_svcctl_EnumServiceGroupW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_ENUMSERVICEGROUPW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5729,7 +5729,7 @@ NTSTATUS rpccli_svcctl_EnumServiceGroupW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_ENUMSERVICEGROUPW,
                                &r);
 
@@ -5793,7 +5793,7 @@ struct tevent_req *rpccli_svcctl_ChangeServiceConfig2A_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CHANGESERVICECONFIG2A,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5876,7 +5876,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2A(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CHANGESERVICECONFIG2A,
                                &r);
 
@@ -5940,7 +5940,7 @@ struct tevent_req *rpccli_svcctl_ChangeServiceConfig2W_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_CHANGESERVICECONFIG2W,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6023,7 +6023,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_CHANGESERVICECONFIG2W,
                                &r);
 
@@ -6097,7 +6097,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceConfig2A_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICECONFIG2A,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6184,7 +6184,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICECONFIG2A,
                                &r);
 
@@ -6260,7 +6260,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceConfig2W_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICECONFIG2W,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6347,7 +6347,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICECONFIG2W,
                                &r);
 
@@ -6423,7 +6423,7 @@ struct tevent_req *rpccli_svcctl_QueryServiceStatusEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_QUERYSERVICESTATUSEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6510,7 +6510,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_QUERYSERVICESTATUSEX,
                                &r);
 
@@ -6597,7 +6597,7 @@ struct tevent_req *rpccli_EnumServicesStatusExA_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_ENUMSERVICESSTATUSEXA,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6697,7 +6697,7 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_ENUMSERVICESSTATUSEXA,
                                &r);
 
@@ -6789,7 +6789,7 @@ struct tevent_req *rpccli_EnumServicesStatusExW_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_ENUMSERVICESSTATUSEXW,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -6889,7 +6889,7 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_ENUMSERVICESSTATUSEXW,
                                &r);
 
@@ -6953,7 +6953,7 @@ struct tevent_req *rpccli_svcctl_SCSendTSMessage_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_svcctl,
+                                   NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                    NDR_SVCCTL_SCSENDTSMESSAGE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -7030,7 +7030,7 @@ NTSTATUS rpccli_svcctl_SCSendTSMessage(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_svcctl,
+                               NDR_SVCCTL_UUID, NDR_SVCCTL_VERSION,
                                NDR_SVCCTL_SCSENDTSMESSAGE,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c
index a476a127ebfd7a885aabf4fb61dc2f99f362144d..772e29d4bbfe796bcc283e23208331c93578cd20 100644 (file)
--- a/librpc/gen_ndr/cli_winreg.c
+++ b/librpc/gen_ndr/cli_winreg.c
@@ -54,7 +54,7 @@ struct tevent_req *rpccli_winreg_OpenHKCR_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKCR,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -137,7 +137,7 @@ NTSTATUS rpccli_winreg_OpenHKCR(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKCR,
                                &r);
 
@@ -208,7 +208,7 @@ struct tevent_req *rpccli_winreg_OpenHKCU_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKCU,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -291,7 +291,7 @@ NTSTATUS rpccli_winreg_OpenHKCU(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKCU,
                                &r);
 
@@ -362,7 +362,7 @@ struct tevent_req *rpccli_winreg_OpenHKLM_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKLM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -445,7 +445,7 @@ NTSTATUS rpccli_winreg_OpenHKLM(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKLM,
                                &r);
 
@@ -516,7 +516,7 @@ struct tevent_req *rpccli_winreg_OpenHKPD_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKPD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -599,7 +599,7 @@ NTSTATUS rpccli_winreg_OpenHKPD(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKPD,
                                &r);
 
@@ -670,7 +670,7 @@ struct tevent_req *rpccli_winreg_OpenHKU_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKU,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -753,7 +753,7 @@ NTSTATUS rpccli_winreg_OpenHKU(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKU,
                                &r);
 
@@ -821,7 +821,7 @@ struct tevent_req *rpccli_winreg_CloseKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_CLOSEKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -901,7 +901,7 @@ NTSTATUS rpccli_winreg_CloseKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_CLOSEKEY,
                                &r);
 
@@ -983,7 +983,7 @@ struct tevent_req *rpccli_winreg_CreateKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_CREATEKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1079,7 +1079,7 @@ NTSTATUS rpccli_winreg_CreateKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_CREATEKEY,
                                &r);
 
@@ -1145,7 +1145,7 @@ struct tevent_req *rpccli_winreg_DeleteKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_DELETEKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1226,7 +1226,7 @@ NTSTATUS rpccli_winreg_DeleteKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_DELETEKEY,
                                &r);
 
@@ -1288,7 +1288,7 @@ struct tevent_req *rpccli_winreg_DeleteValue_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_DELETEVALUE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1369,7 +1369,7 @@ NTSTATUS rpccli_winreg_DeleteValue(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_DELETEVALUE,
                                &r);
 
@@ -1446,7 +1446,7 @@ struct tevent_req *rpccli_winreg_EnumKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_ENUMKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1540,7 +1540,7 @@ NTSTATUS rpccli_winreg_EnumKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_ENUMKEY,
                                &r);
 
@@ -1630,7 +1630,7 @@ struct tevent_req *rpccli_winreg_EnumValue_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_ENUMVALUE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1734,7 +1734,7 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_ENUMVALUE,
                                &r);
 
@@ -1807,7 +1807,7 @@ struct tevent_req *rpccli_winreg_FlushKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_FLUSHKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1886,7 +1886,7 @@ NTSTATUS rpccli_winreg_FlushKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_FLUSHKEY,
                                &r);
 
@@ -1957,7 +1957,7 @@ struct tevent_req *rpccli_winreg_GetKeySecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_GETKEYSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2041,7 +2041,7 @@ NTSTATUS rpccli_winreg_GetKeySecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_GETKEYSECURITY,
                                &r);
 
@@ -2106,7 +2106,7 @@ struct tevent_req *rpccli_winreg_LoadKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_LOADKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2189,7 +2189,7 @@ NTSTATUS rpccli_winreg_LoadKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_LOADKEY,
                                &r);
 
@@ -2261,7 +2261,7 @@ struct tevent_req *rpccli_winreg_NotifyChangeKeyValue_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_NOTIFYCHANGEKEYVALUE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2352,7 +2352,7 @@ NTSTATUS rpccli_winreg_NotifyChangeKeyValue(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_NOTIFYCHANGEKEYVALUE,
                                &r);
 
@@ -2426,7 +2426,7 @@ struct tevent_req *rpccli_winreg_OpenKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2513,7 +2513,7 @@ NTSTATUS rpccli_winreg_OpenKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENKEY,
                                &r);
 
@@ -2599,7 +2599,7 @@ struct tevent_req *rpccli_winreg_QueryInfoKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_QUERYINFOKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2697,7 +2697,7 @@ NTSTATUS rpccli_winreg_QueryInfoKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_QUERYINFOKEY,
                                &r);
 
@@ -2786,7 +2786,7 @@ struct tevent_req *rpccli_winreg_QueryValue_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_QUERYVALUE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2887,7 +2887,7 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_QUERYVALUE,
                                &r);
 
@@ -2957,7 +2957,7 @@ struct tevent_req *rpccli_winreg_ReplaceKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_REPLACEKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3034,7 +3034,7 @@ NTSTATUS rpccli_winreg_ReplaceKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_REPLACEKEY,
                                &r);
 
@@ -3098,7 +3098,7 @@ struct tevent_req *rpccli_winreg_RestoreKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_RESTOREKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3181,7 +3181,7 @@ NTSTATUS rpccli_winreg_RestoreKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_RESTOREKEY,
                                &r);
 
@@ -3245,7 +3245,7 @@ struct tevent_req *rpccli_winreg_SaveKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_SAVEKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3328,7 +3328,7 @@ NTSTATUS rpccli_winreg_SaveKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_SAVEKEY,
                                &r);
 
@@ -3392,7 +3392,7 @@ struct tevent_req *rpccli_winreg_SetKeySecurity_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_SETKEYSECURITY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3475,7 +3475,7 @@ NTSTATUS rpccli_winreg_SetKeySecurity(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_SETKEYSECURITY,
                                &r);
 
@@ -3543,7 +3543,7 @@ struct tevent_req *rpccli_winreg_SetValue_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_SETVALUE,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3630,7 +3630,7 @@ NTSTATUS rpccli_winreg_SetValue(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_SETVALUE,
                                &r);
 
@@ -3688,7 +3688,7 @@ struct tevent_req *rpccli_winreg_UnLoadKey_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_UNLOADKEY,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3765,7 +3765,7 @@ NTSTATUS rpccli_winreg_UnLoadKey(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_UNLOADKEY,
                                &r);
 
@@ -3833,7 +3833,7 @@ struct tevent_req *rpccli_winreg_InitiateSystemShutdown_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_INITIATESYSTEMSHUTDOWN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3920,7 +3920,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_INITIATESYSTEMSHUTDOWN,
                                &r);
 
@@ -3980,7 +3980,7 @@ struct tevent_req *rpccli_winreg_AbortSystemShutdown_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_ABORTSYSTEMSHUTDOWN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4059,7 +4059,7 @@ NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_ABORTSYSTEMSHUTDOWN,
                                &r);
 
@@ -4127,7 +4127,7 @@ struct tevent_req *rpccli_winreg_GetVersion_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_GETVERSION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4208,7 +4208,7 @@ NTSTATUS rpccli_winreg_GetVersion(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_GETVERSION,
                                &r);
 
@@ -4279,7 +4279,7 @@ struct tevent_req *rpccli_winreg_OpenHKCC_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKCC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4362,7 +4362,7 @@ NTSTATUS rpccli_winreg_OpenHKCC(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKCC,
                                &r);
 
@@ -4433,7 +4433,7 @@ struct tevent_req *rpccli_winreg_OpenHKDD_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKDD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4516,7 +4516,7 @@ NTSTATUS rpccli_winreg_OpenHKDD(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKDD,
                                &r);
 
@@ -4594,7 +4594,7 @@ struct tevent_req *rpccli_winreg_QueryMultipleValues_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_QUERYMULTIPLEVALUES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4686,7 +4686,7 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_QUERYMULTIPLEVALUES,
                                &r);
 
@@ -4761,7 +4761,7 @@ struct tevent_req *rpccli_winreg_InitiateSystemShutdownEx_send(TALLOC_CTX *mem_c
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_INITIATESYSTEMSHUTDOWNEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4850,7 +4850,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_INITIATESYSTEMSHUTDOWNEX,
                                &r);
 
@@ -4908,7 +4908,7 @@ struct tevent_req *rpccli_winreg_SaveKeyEx_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_SAVEKEYEX,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4985,7 +4985,7 @@ NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_SAVEKEYEX,
                                &r);
 
@@ -5055,7 +5055,7 @@ struct tevent_req *rpccli_winreg_OpenHKPT_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKPT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5138,7 +5138,7 @@ NTSTATUS rpccli_winreg_OpenHKPT(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKPT,
                                &r);
 
@@ -5209,7 +5209,7 @@ struct tevent_req *rpccli_winreg_OpenHKPN_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_OPENHKPN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5292,7 +5292,7 @@ NTSTATUS rpccli_winreg_OpenHKPN(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_OPENHKPN,
                                &r);
 
@@ -5351,7 +5351,7 @@ struct tevent_req *rpccli_winreg_QueryMultipleValues2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_winreg,
+                                   NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                    NDR_WINREG_QUERYMULTIPLEVALUES2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -5428,7 +5428,7 @@ NTSTATUS rpccli_winreg_QueryMultipleValues2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_winreg,
+                               NDR_WINREG_UUID, NDR_WINREG_VERSION,
                                NDR_WINREG_QUERYMULTIPLEVALUES2,
                                &r);
 

diff --git a/librpc/gen_ndr/cli_wkssvc.c b/librpc/gen_ndr/cli_wkssvc.c
index b8465d9bef5813b644e2a925fcfcabd10389a92e..ea4d223630fa21e3bfc68e36e995d3b6f4bae09a 100644 (file)
--- a/librpc/gen_ndr/cli_wkssvc.c
+++ b/librpc/gen_ndr/cli_wkssvc.c
@@ -54,7 +54,7 @@ struct tevent_req *rpccli_wkssvc_NetWkstaGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETWKSTAGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -137,7 +137,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETWKSTAGETINFO,
                                &r);
 
@@ -211,7 +211,7 @@ struct tevent_req *rpccli_wkssvc_NetWkstaSetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETWKSTASETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -297,7 +297,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETWKSTASETINFO,
                                &r);
 
@@ -374,7 +374,7 @@ struct tevent_req *rpccli_wkssvc_NetWkstaEnumUsers_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETWKSTAENUMUSERS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -465,7 +465,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETWKSTAENUMUSERS,
                                &r);
 
@@ -540,7 +540,7 @@ struct tevent_req *rpccli_wkssvc_NetrWkstaUserGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRWKSTAUSERGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -623,7 +623,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaUserGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRWKSTAUSERGETINFO,
                                &r);
 
@@ -697,7 +697,7 @@ struct tevent_req *rpccli_wkssvc_NetrWkstaUserSetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRWKSTAUSERSETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -785,7 +785,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaUserSetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRWKSTAUSERSETINFO,
                                &r);
 
@@ -864,7 +864,7 @@ struct tevent_req *rpccli_wkssvc_NetWkstaTransportEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETWKSTATRANSPORTENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -955,7 +955,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETWKSTATRANSPORTENUM,
                                &r);
 
@@ -1033,7 +1033,7 @@ struct tevent_req *rpccli_wkssvc_NetrWkstaTransportAdd_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRWKSTATRANSPORTADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1121,7 +1121,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaTransportAdd(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRWKSTATRANSPORTADD,
                                &r);
 
@@ -1188,7 +1188,7 @@ struct tevent_req *rpccli_wkssvc_NetrWkstaTransportDel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRWKSTATRANSPORTDEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1271,7 +1271,7 @@ NTSTATUS rpccli_wkssvc_NetrWkstaTransportDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRWKSTATRANSPORTDEL,
                                &r);
 
@@ -1344,7 +1344,7 @@ struct tevent_req *rpccli_wkssvc_NetrUseAdd_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRUSEADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1432,7 +1432,7 @@ NTSTATUS rpccli_wkssvc_NetrUseAdd(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRUSEADD,
                                &r);
 
@@ -1507,7 +1507,7 @@ struct tevent_req *rpccli_wkssvc_NetrUseGetInfo_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRUSEGETINFO,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1592,7 +1592,7 @@ NTSTATUS rpccli_wkssvc_NetrUseGetInfo(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRUSEGETINFO,
                                &r);
 
@@ -1657,7 +1657,7 @@ struct tevent_req *rpccli_wkssvc_NetrUseDel_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRUSEDEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1740,7 +1740,7 @@ NTSTATUS rpccli_wkssvc_NetrUseDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRUSEDEL,
                                &r);
 
@@ -1816,7 +1816,7 @@ struct tevent_req *rpccli_wkssvc_NetrUseEnum_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRUSEENUM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1907,7 +1907,7 @@ NTSTATUS rpccli_wkssvc_NetrUseEnum(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRUSEENUM,
                                &r);
 
@@ -1980,7 +1980,7 @@ struct tevent_req *rpccli_wkssvc_NetrMessageBufferSend_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRMESSAGEBUFFERSEND,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2067,7 +2067,7 @@ NTSTATUS rpccli_wkssvc_NetrMessageBufferSend(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRMESSAGEBUFFERSEND,
                                &r);
 
@@ -2141,7 +2141,7 @@ struct tevent_req *rpccli_wkssvc_NetrWorkstationStatisticsGet_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2228,7 +2228,7 @@ NTSTATUS rpccli_wkssvc_NetrWorkstationStatisticsGet(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRWORKSTATIONSTATISTICSGET,
                                &r);
 
@@ -2289,7 +2289,7 @@ struct tevent_req *rpccli_wkssvc_NetrLogonDomainNameAdd_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRLOGONDOMAINNAMEADD,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2368,7 +2368,7 @@ NTSTATUS rpccli_wkssvc_NetrLogonDomainNameAdd(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRLOGONDOMAINNAMEADD,
                                &r);
 
@@ -2428,7 +2428,7 @@ struct tevent_req *rpccli_wkssvc_NetrLogonDomainNameDel_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2507,7 +2507,7 @@ NTSTATUS rpccli_wkssvc_NetrLogonDomainNameDel(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRLOGONDOMAINNAMEDEL,
                                &r);
 
@@ -2577,7 +2577,7 @@ struct tevent_req *rpccli_wkssvc_NetrJoinDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRJOINDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2666,7 +2666,7 @@ NTSTATUS rpccli_wkssvc_NetrJoinDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRJOINDOMAIN,
                                &r);
 
@@ -2732,7 +2732,7 @@ struct tevent_req *rpccli_wkssvc_NetrUnjoinDomain_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRUNJOINDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2817,7 +2817,7 @@ NTSTATUS rpccli_wkssvc_NetrUnjoinDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRUNJOINDOMAIN,
                                &r);
 
@@ -2885,7 +2885,7 @@ struct tevent_req *rpccli_wkssvc_NetrRenameMachineInDomain_send(TALLOC_CTX *mem_
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2972,7 +2972,7 @@ NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN,
                                &r);
 
@@ -3040,7 +3040,7 @@ struct tevent_req *rpccli_wkssvc_NetrValidateName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRVALIDATENAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3127,7 +3127,7 @@ NTSTATUS rpccli_wkssvc_NetrValidateName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRVALIDATENAME,
                                &r);
 
@@ -3198,7 +3198,7 @@ struct tevent_req *rpccli_wkssvc_NetrGetJoinInformation_send(TALLOC_CTX *mem_ctx
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRGETJOININFORMATION,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3282,7 +3282,7 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinInformation(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRGETJOININFORMATION,
                                &r);
 
@@ -3361,7 +3361,7 @@ struct tevent_req *rpccli_wkssvc_NetrGetJoinableOus_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRGETJOINABLEOUS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3451,7 +3451,7 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinableOus(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRGETJOINABLEOUS,
                                &r);
 
@@ -3523,7 +3523,7 @@ struct tevent_req *rpccli_wkssvc_NetrJoinDomain2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRJOINDOMAIN2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3612,7 +3612,7 @@ NTSTATUS rpccli_wkssvc_NetrJoinDomain2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRJOINDOMAIN2,
                                &r);
 
@@ -3678,7 +3678,7 @@ struct tevent_req *rpccli_wkssvc_NetrUnjoinDomain2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRUNJOINDOMAIN2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3763,7 +3763,7 @@ NTSTATUS rpccli_wkssvc_NetrUnjoinDomain2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRUNJOINDOMAIN2,
                                &r);
 
@@ -3831,7 +3831,7 @@ struct tevent_req *rpccli_wkssvc_NetrRenameMachineInDomain2_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3918,7 +3918,7 @@ NTSTATUS rpccli_wkssvc_NetrRenameMachineInDomain2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRRENAMEMACHINEINDOMAIN2,
                                &r);
 
@@ -3986,7 +3986,7 @@ struct tevent_req *rpccli_wkssvc_NetrValidateName2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRVALIDATENAME2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4073,7 +4073,7 @@ NTSTATUS rpccli_wkssvc_NetrValidateName2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRVALIDATENAME2,
                                &r);
 
@@ -4150,7 +4150,7 @@ struct tevent_req *rpccli_wkssvc_NetrGetJoinableOus2_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRGETJOINABLEOUS2,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4240,7 +4240,7 @@ NTSTATUS rpccli_wkssvc_NetrGetJoinableOus2(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRGETJOINABLEOUS2,
                                &r);
 
@@ -4310,7 +4310,7 @@ struct tevent_req *rpccli_wkssvc_NetrAddAlternateComputerName_send(TALLOC_CTX *m
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4397,7 +4397,7 @@ NTSTATUS rpccli_wkssvc_NetrAddAlternateComputerName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRADDALTERNATECOMPUTERNAME,
                                &r);
 
@@ -4465,7 +4465,7 @@ struct tevent_req *rpccli_wkssvc_NetrRemoveAlternateComputerName_send(TALLOC_CTX
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4552,7 +4552,7 @@ NTSTATUS rpccli_wkssvc_NetrRemoveAlternateComputerName(struct rpc_pipe_client *c
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME,
                                &r);
 
@@ -4620,7 +4620,7 @@ struct tevent_req *rpccli_wkssvc_NetrSetPrimaryComputername_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4707,7 +4707,7 @@ NTSTATUS rpccli_wkssvc_NetrSetPrimaryComputername(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRSETPRIMARYCOMPUTERNAME,
                                &r);
 
@@ -4779,7 +4779,7 @@ struct tevent_req *rpccli_wkssvc_NetrEnumerateComputerNames_send(TALLOC_CTX *mem
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wkssvc,
+                                   NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                    NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -4864,7 +4864,7 @@ NTSTATUS rpccli_wkssvc_NetrEnumerateComputerNames(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wkssvc,
+                               NDR_WKSSVC_UUID, NDR_WKSSVC_VERSION,
                                NDR_WKSSVC_NETRENUMERATECOMPUTERNAMES,
                                &r);
 

diff --git a/librpc/gen_ndr/srv_dfs.c b/librpc/gen_ndr/srv_dfs.c
index 623df13cccc39a5c28393f253c818821b8729e23..9fd295432d68092bd018527f79498aaf6ac8d3bc 100644 (file)
--- a/librpc/gen_ndr/srv_dfs.c
+++ b/librpc/gen_ndr/srv_dfs.c
@@ -1748,7 +1748,7 @@ void netdfs_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_netdfs_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_dfs.h b/librpc/gen_ndr/srv_dfs.h
index 89f3ed1a1851ed91d44c0cf0f15c90b33b3470a1..d66a8626859c81abea5ff41f886dc07d5d50b7e0 100644 (file)
--- a/librpc/gen_ndr/srv_dfs.h
+++ b/librpc/gen_ndr/srv_dfs.h
@@ -25,7 +25,7 @@ WERROR _dfs_Remove2(pipes_struct *p, struct dfs_Remove2 *r);
 WERROR _dfs_EnumEx(pipes_struct *p, struct dfs_EnumEx *r);
 WERROR _dfs_SetInfo2(pipes_struct *p, struct dfs_SetInfo2 *r);
 void netdfs_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_netdfs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 void _dfs_GetManagerVersion(pipes_struct *p, struct dfs_GetManagerVersion *r);
 WERROR _dfs_Add(pipes_struct *p, struct dfs_Add *r);
 WERROR _dfs_Remove(pipes_struct *p, struct dfs_Remove *r);

diff --git a/librpc/gen_ndr/srv_dssetup.c b/librpc/gen_ndr/srv_dssetup.c
index 813eaf629fa4a4b6101725e34accc605605c4aa4..effe8c183c459453ec59207c745819d2a9def404 100644 (file)
--- a/librpc/gen_ndr/srv_dssetup.c
+++ b/librpc/gen_ndr/srv_dssetup.c
@@ -839,7 +839,7 @@ void dssetup_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_dssetup_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_dssetup_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_dssetup_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_dssetup.h b/librpc/gen_ndr/srv_dssetup.h
index 33ec07de864929186b25f9e668f75b0a763ab3b5..ad2e57402dddbeadee1d99aff3ed55b460089392 100644 (file)
--- a/librpc/gen_ndr/srv_dssetup.h
+++ b/librpc/gen_ndr/srv_dssetup.h
@@ -13,7 +13,7 @@ WERROR _dssetup_DsRoleServerSaveStateForUpgrade(pipes_struct *p, struct dssetup_
 WERROR _dssetup_DsRoleUpgradeDownlevelServer(pipes_struct *p, struct dssetup_DsRoleUpgradeDownlevelServer *r);
 WERROR _dssetup_DsRoleAbortDownlevelServerUpgrade(pipes_struct *p, struct dssetup_DsRoleAbortDownlevelServerUpgrade *r);
 void dssetup_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_dssetup_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_dssetup_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _dssetup_DsRoleGetPrimaryDomainInformation(pipes_struct *p, struct dssetup_DsRoleGetPrimaryDomainInformation *r);
 WERROR _dssetup_DsRoleDnsNameToFlatName(pipes_struct *p, struct dssetup_DsRoleDnsNameToFlatName *r);
 WERROR _dssetup_DsRoleDcAsDc(pipes_struct *p, struct dssetup_DsRoleDcAsDc *r);

diff --git a/librpc/gen_ndr/srv_echo.c b/librpc/gen_ndr/srv_echo.c
index 715f21e085f4b4557c024cf5ccb21f96ae57519f..83005ff297f1aea700d56f414180af5e1074b0f4 100644 (file)
--- a/librpc/gen_ndr/srv_echo.c
+++ b/librpc/gen_ndr/srv_echo.c
@@ -799,7 +799,7 @@ void rpcecho_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_rpcecho_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_echo.h b/librpc/gen_ndr/srv_echo.h
index 3e1cbd5059dedf6c92071f0dacb08cea990f546c..7d348d26e62d9c5d4275596fcb65ab6812aded99 100644 (file)
--- a/librpc/gen_ndr/srv_echo.h
+++ b/librpc/gen_ndr/srv_echo.h
@@ -12,7 +12,7 @@ void _echo_TestEnum(pipes_struct *p, struct echo_TestEnum *r);
 void _echo_TestSurrounding(pipes_struct *p, struct echo_TestSurrounding *r);
 uint16 _echo_TestDoublePointer(pipes_struct *p, struct echo_TestDoublePointer *r);
 void rpcecho_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_rpcecho_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 void _echo_AddOne(pipes_struct *p, struct echo_AddOne *r);
 void _echo_EchoData(pipes_struct *p, struct echo_EchoData *r);
 void _echo_SinkData(pipes_struct *p, struct echo_SinkData *r);

diff --git a/librpc/gen_ndr/srv_epmapper.c b/librpc/gen_ndr/srv_epmapper.c
index 7050b26ad17e4b2ae03081afc00b84ca1f5bc9df..d0c617aea6aeaba9af3d4e4eb038827ea9e12916 100644 (file)
--- a/librpc/gen_ndr/srv_epmapper.c
+++ b/librpc/gen_ndr/srv_epmapper.c
@@ -640,7 +640,7 @@ void epmapper_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_epmapper_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_epmapper.h b/librpc/gen_ndr/srv_epmapper.h
index 4cf074778f4eb27be71cfe8c5a43ed5002c33dc3..23342f27f07355482bb73f18a646b75a561f6d5b 100644 (file)
--- a/librpc/gen_ndr/srv_epmapper.h
+++ b/librpc/gen_ndr/srv_epmapper.h
@@ -10,7 +10,7 @@ uint32 _epm_InqObject(pipes_struct *p, struct epm_InqObject *r);
 uint32 _epm_MgmtDelete(pipes_struct *p, struct epm_MgmtDelete *r);
 uint32 _epm_MapAuth(pipes_struct *p, struct epm_MapAuth *r);
 void epmapper_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_epmapper_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 uint32 _epm_Insert(pipes_struct *p, struct epm_Insert *r);
 uint32 _epm_Delete(pipes_struct *p, struct epm_Delete *r);
 uint32 _epm_Lookup(pipes_struct *p, struct epm_Lookup *r);

diff --git a/librpc/gen_ndr/srv_eventlog.c b/librpc/gen_ndr/srv_eventlog.c
index 2cab792adf9b146f935d0792be71f986ca626be7..7404ba2a3ac860dcbd7d740876518a6bd93f2dde 100644 (file)
--- a/librpc/gen_ndr/srv_eventlog.c
+++ b/librpc/gen_ndr/srv_eventlog.c
@@ -1945,7 +1945,7 @@ void eventlog_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_eventlog_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_eventlog.h b/librpc/gen_ndr/srv_eventlog.h
index 7da7cddbd23214993c55fe1d0c2914bf916cdffd..55559eb166824945dade0d0ce09c77104ce3878b 100644 (file)
--- a/librpc/gen_ndr/srv_eventlog.h
+++ b/librpc/gen_ndr/srv_eventlog.h
@@ -27,7 +27,7 @@ NTSTATUS _eventlog_GetLogInformation(pipes_struct *p, struct eventlog_GetLogInfo
 NTSTATUS _eventlog_FlushEventLog(pipes_struct *p, struct eventlog_FlushEventLog *r);
 NTSTATUS _eventlog_ReportEventAndSourceW(pipes_struct *p, struct eventlog_ReportEventAndSourceW *r);
 void eventlog_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 NTSTATUS _eventlog_ClearEventLogW(pipes_struct *p, struct eventlog_ClearEventLogW *r);
 NTSTATUS _eventlog_BackupEventLogW(pipes_struct *p, struct eventlog_BackupEventLogW *r);
 NTSTATUS _eventlog_CloseEventLog(pipes_struct *p, struct eventlog_CloseEventLog *r);

diff --git a/librpc/gen_ndr/srv_initshutdown.c b/librpc/gen_ndr/srv_initshutdown.c
index c3d0a2f2edff9823e54cf01f5c97b5c75f1cbe8b..bf85fc25d9878d0c8f671c160422112d25a3b56d 100644 (file)
--- a/librpc/gen_ndr/srv_initshutdown.c
+++ b/librpc/gen_ndr/srv_initshutdown.c
@@ -240,7 +240,7 @@ void initshutdown_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_initshutdown_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_initshutdown_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_initshutdown_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_initshutdown.h b/librpc/gen_ndr/srv_initshutdown.h
index c4845a677de6ba6f56ed1b1f2df142fe9e82e338..27f5f68dd03ab4b6a706be93dcbcf8f6a5e5a8db 100644 (file)
--- a/librpc/gen_ndr/srv_initshutdown.h
+++ b/librpc/gen_ndr/srv_initshutdown.h
@@ -5,7 +5,7 @@ WERROR _initshutdown_Init(pipes_struct *p, struct initshutdown_Init *r);
 WERROR _initshutdown_Abort(pipes_struct *p, struct initshutdown_Abort *r);
 WERROR _initshutdown_InitEx(pipes_struct *p, struct initshutdown_InitEx *r);
 void initshutdown_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_initshutdown_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_initshutdown_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _initshutdown_Init(pipes_struct *p, struct initshutdown_Init *r);
 WERROR _initshutdown_Abort(pipes_struct *p, struct initshutdown_Abort *r);
 WERROR _initshutdown_InitEx(pipes_struct *p, struct initshutdown_InitEx *r);

diff --git a/librpc/gen_ndr/srv_lsa.c b/librpc/gen_ndr/srv_lsa.c
index f1b4a06d0d403b80bc22c35c835e08dd2a683161..da7af5f15b847a46e2273cb7c21227b3f643e3a5 100644 (file)
--- a/librpc/gen_ndr/srv_lsa.c
+++ b/librpc/gen_ndr/srv_lsa.c
@@ -6385,7 +6385,7 @@ void lsarpc_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_lsarpc_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_lsa.h b/librpc/gen_ndr/srv_lsa.h
index 3e9eb1b42f962b664607ce104004f041c34891a8..0213aadd48e1c7bea078c093f1b0f0781e1d421c 100644 (file)
--- a/librpc/gen_ndr/srv_lsa.h
+++ b/librpc/gen_ndr/srv_lsa.h
@@ -84,7 +84,7 @@ NTSTATUS _lsa_LSARADTREGISTERSECURITYEVENTSOURCE(pipes_struct *p, struct lsa_LSA
 NTSTATUS _lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(pipes_struct *p, struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *r);
 NTSTATUS _lsa_LSARADTREPORTSECURITYEVENT(pipes_struct *p, struct lsa_LSARADTREPORTSECURITYEVENT *r);
 void lsarpc_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_lsarpc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 NTSTATUS _lsa_Close(pipes_struct *p, struct lsa_Close *r);
 NTSTATUS _lsa_Delete(pipes_struct *p, struct lsa_Delete *r);
 NTSTATUS _lsa_EnumPrivs(pipes_struct *p, struct lsa_EnumPrivs *r);

diff --git a/librpc/gen_ndr/srv_netlogon.c b/librpc/gen_ndr/srv_netlogon.c
index be92d4a4dd2b8c039d5c04768a679ed6f6e23932..a52ff0f5d59ff7b1c76ce8fbb5e104e116f7ab38 100644 (file)
--- a/librpc/gen_ndr/srv_netlogon.c
+++ b/librpc/gen_ndr/srv_netlogon.c
@@ -3898,7 +3898,7 @@ void netlogon_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_netlogon_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_netlogon.h b/librpc/gen_ndr/srv_netlogon.h
index 521f08f6885f33a83101324d1f85b53649f5884e..f73f1acd81c0a04e5e4a4517e43a1c888e87b672 100644 (file)
--- a/librpc/gen_ndr/srv_netlogon.h
+++ b/librpc/gen_ndr/srv_netlogon.h
@@ -49,7 +49,7 @@ WERROR _netr_GetForestTrustInformation(pipes_struct *p, struct netr_GetForestTru
 NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p, struct netr_LogonSamLogonWithFlags *r);
 NTSTATUS _netr_ServerGetTrustInfo(pipes_struct *p, struct netr_ServerGetTrustInfo *r);
 void netlogon_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_netlogon_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _netr_LogonUasLogon(pipes_struct *p, struct netr_LogonUasLogon *r);
 WERROR _netr_LogonUasLogoff(pipes_struct *p, struct netr_LogonUasLogoff *r);
 NTSTATUS _netr_LogonSamLogon(pipes_struct *p, struct netr_LogonSamLogon *r);

diff --git a/librpc/gen_ndr/srv_ntsvcs.c b/librpc/gen_ndr/srv_ntsvcs.c
index de2bb6d4a3e8831ac5fb4e8c5fd3058f3ebddb60..026a8c5a5e9b50dc2671df7336162ecfb9346d76 100644 (file)
--- a/librpc/gen_ndr/srv_ntsvcs.c
+++ b/librpc/gen_ndr/srv_ntsvcs.c
@@ -4871,7 +4871,7 @@ void ntsvcs_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_ntsvcs_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_ntsvcs.h b/librpc/gen_ndr/srv_ntsvcs.h
index 40d28a9e55e7a31e38879b8158ebcaab18a9a97a..6aa64f0b8fabf23c1d4e5b45f5a5d132b3f4b50b 100644 (file)
--- a/librpc/gen_ndr/srv_ntsvcs.h
+++ b/librpc/gen_ndr/srv_ntsvcs.h
@@ -67,7 +67,7 @@ WERROR _PNP_GetVersionInternal(pipes_struct *p, struct PNP_GetVersionInternal *r
 WERROR _PNP_GetBlockedDriverInfo(pipes_struct *p, struct PNP_GetBlockedDriverInfo *r);
 WERROR _PNP_GetServerSideDeviceInstallFlags(pipes_struct *p, struct PNP_GetServerSideDeviceInstallFlags *r);
 void ntsvcs_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_ntsvcs_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _PNP_Disconnect(pipes_struct *p, struct PNP_Disconnect *r);
 WERROR _PNP_Connect(pipes_struct *p, struct PNP_Connect *r);
 WERROR _PNP_GetVersion(pipes_struct *p, struct PNP_GetVersion *r);

diff --git a/librpc/gen_ndr/srv_samr.c b/librpc/gen_ndr/srv_samr.c
index eba50b3e111a47856c69dcf7348b1d02cfb3675a..2b866bf8988634b7bef25828c1cbe526870062ff 100644 (file)
--- a/librpc/gen_ndr/srv_samr.c
+++ b/librpc/gen_ndr/srv_samr.c
@@ -5476,7 +5476,7 @@ void samr_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_samr_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_samr.h b/librpc/gen_ndr/srv_samr.h
index 4b308ebf29d9f7684bbb380f39e3de888cf199fc..02ff1bb6c3317a3e91e36f092f4af2ac5d21352a 100644 (file)
--- a/librpc/gen_ndr/srv_samr.h
+++ b/librpc/gen_ndr/srv_samr.h
@@ -70,7 +70,7 @@ NTSTATUS _samr_RidToSid(pipes_struct *p, struct samr_RidToSid *r);
 NTSTATUS _samr_SetDsrmPassword(pipes_struct *p, struct samr_SetDsrmPassword *r);
 NTSTATUS _samr_ValidatePassword(pipes_struct *p, struct samr_ValidatePassword *r);
 void samr_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_samr_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 NTSTATUS _samr_Connect(pipes_struct *p, struct samr_Connect *r);
 NTSTATUS _samr_Close(pipes_struct *p, struct samr_Close *r);
 NTSTATUS _samr_SetSecurity(pipes_struct *p, struct samr_SetSecurity *r);

diff --git a/librpc/gen_ndr/srv_spoolss.c b/librpc/gen_ndr/srv_spoolss.c
index c3266dc5af3ae89b5521743dde42d11229e5c924..e078b98ee754b66652fab973f6e3e9d3a50c8772 100644 (file)
--- a/librpc/gen_ndr/srv_spoolss.c
+++ b/librpc/gen_ndr/srv_spoolss.c
@@ -8640,7 +8640,7 @@ void spoolss_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_spoolss_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_spoolss.h b/librpc/gen_ndr/srv_spoolss.h
index 8b5d8f8d48688e605fd7d8f163dbf29e1e967a03..68998c8d845ce0a412ace3a46f47c8392b45e005 100644 (file)
--- a/librpc/gen_ndr/srv_spoolss.h
+++ b/librpc/gen_ndr/srv_spoolss.h
@@ -112,7 +112,7 @@ WERROR _spoolss_6b(pipes_struct *p, struct spoolss_6b *r);
 WERROR _spoolss_6c(pipes_struct *p, struct spoolss_6c *r);
 WERROR _spoolss_6d(pipes_struct *p, struct spoolss_6d *r);
 void spoolss_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _spoolss_EnumPrinters(pipes_struct *p, struct spoolss_EnumPrinters *r);
 WERROR _spoolss_OpenPrinter(pipes_struct *p, struct spoolss_OpenPrinter *r);
 WERROR _spoolss_SetJob(pipes_struct *p, struct spoolss_SetJob *r);

diff --git a/librpc/gen_ndr/srv_srvsvc.c b/librpc/gen_ndr/srv_srvsvc.c
index f024c177c4b2ed4f12ed5a9cc7115963bf778198..176a9ce46dfdfd9fa51fe96ba4e5b2a83da963f2 100644 (file)
--- a/librpc/gen_ndr/srv_srvsvc.c
+++ b/librpc/gen_ndr/srv_srvsvc.c
@@ -4190,7 +4190,7 @@ void srvsvc_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_srvsvc_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_srvsvc.h b/librpc/gen_ndr/srv_srvsvc.h
index b96466c7008b14f8e5c6b4bdb9e0a240c328aed1..410494af0953ef737831e2fc8a232ff8357cf4ab 100644 (file)
--- a/librpc/gen_ndr/srv_srvsvc.h
+++ b/librpc/gen_ndr/srv_srvsvc.h
@@ -56,7 +56,7 @@ WERROR _srvsvc_NETRDFSFIXLOCALVOLUME(pipes_struct *p, struct srvsvc_NETRDFSFIXLO
 WERROR _srvsvc_NETRDFSMANAGERREPORTSITEINFO(pipes_struct *p, struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r);
 WERROR _srvsvc_NETRSERVERTRANSPORTDELEX(pipes_struct *p, struct srvsvc_NETRSERVERTRANSPORTDELEX *r);
 void srvsvc_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_srvsvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _srvsvc_NetCharDevEnum(pipes_struct *p, struct srvsvc_NetCharDevEnum *r);
 WERROR _srvsvc_NetCharDevGetInfo(pipes_struct *p, struct srvsvc_NetCharDevGetInfo *r);
 WERROR _srvsvc_NetCharDevControl(pipes_struct *p, struct srvsvc_NetCharDevControl *r);

diff --git a/librpc/gen_ndr/srv_svcctl.c b/librpc/gen_ndr/srv_svcctl.c
index cd5a0eec65cd970e89fabbc5eaf308bf79b609c5..227bcd3dc6ef44647451326d227eca98e647d43c 100644 (file)
--- a/librpc/gen_ndr/srv_svcctl.c
+++ b/librpc/gen_ndr/srv_svcctl.c
@@ -3609,7 +3609,7 @@ void svcctl_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_svcctl_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_svcctl.h b/librpc/gen_ndr/srv_svcctl.h
index d7bd2fb6cf4c91a9b76abdbae7209c7157ffcffc..cac1ac91d6db733416728f67b28cc1feb5741a0f 100644 (file)
--- a/librpc/gen_ndr/srv_svcctl.h
+++ b/librpc/gen_ndr/srv_svcctl.h
@@ -46,7 +46,7 @@ WERROR _EnumServicesStatusExA(pipes_struct *p, struct EnumServicesStatusExA *r);
 WERROR _EnumServicesStatusExW(pipes_struct *p, struct EnumServicesStatusExW *r);
 WERROR _svcctl_SCSendTSMessage(pipes_struct *p, struct svcctl_SCSendTSMessage *r);
 void svcctl_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_svcctl_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _svcctl_CloseServiceHandle(pipes_struct *p, struct svcctl_CloseServiceHandle *r);
 WERROR _svcctl_ControlService(pipes_struct *p, struct svcctl_ControlService *r);
 WERROR _svcctl_DeleteService(pipes_struct *p, struct svcctl_DeleteService *r);

diff --git a/librpc/gen_ndr/srv_winreg.c b/librpc/gen_ndr/srv_winreg.c
index d0873f8d62b9145a2fa59c34499dc4552e239054..95e06e166811b06e8fcf35004eb28365fcce6c52 100644 (file)
--- a/librpc/gen_ndr/srv_winreg.c
+++ b/librpc/gen_ndr/srv_winreg.c
@@ -2766,7 +2766,7 @@ void winreg_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_winreg_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_winreg.h b/librpc/gen_ndr/srv_winreg.h
index f259150e5b7a03c13fb9c7979047b00e530f7bb3..bd48f3ff9425ea58daecca550adb654f0bb16120 100644 (file)
--- a/librpc/gen_ndr/srv_winreg.h
+++ b/librpc/gen_ndr/srv_winreg.h
@@ -37,7 +37,7 @@ WERROR _winreg_OpenHKPT(pipes_struct *p, struct winreg_OpenHKPT *r);
 WERROR _winreg_OpenHKPN(pipes_struct *p, struct winreg_OpenHKPN *r);
 WERROR _winreg_QueryMultipleValues2(pipes_struct *p, struct winreg_QueryMultipleValues2 *r);
 void winreg_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_winreg_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _winreg_OpenHKCR(pipes_struct *p, struct winreg_OpenHKCR *r);
 WERROR _winreg_OpenHKCU(pipes_struct *p, struct winreg_OpenHKCU *r);
 WERROR _winreg_OpenHKLM(pipes_struct *p, struct winreg_OpenHKLM *r);

diff --git a/librpc/gen_ndr/srv_wkssvc.c b/librpc/gen_ndr/srv_wkssvc.c
index eab971f42b2f166898548e448212eb54562ba90e..c6809f3cd3aff56aaac7d44f891d5ff250aa6a8d 100644 (file)
--- a/librpc/gen_ndr/srv_wkssvc.c
+++ b/librpc/gen_ndr/srv_wkssvc.c
@@ -2406,7 +2406,7 @@ void wkssvc_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_wkssvc_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/librpc/gen_ndr/srv_wkssvc.h b/librpc/gen_ndr/srv_wkssvc.h
index dd8eb7752aa06417a53eeee33859198670423fe0..7b3c69a5b9d1503abd0af2ec4d991badec99232a 100644 (file)
--- a/librpc/gen_ndr/srv_wkssvc.h
+++ b/librpc/gen_ndr/srv_wkssvc.h
@@ -33,7 +33,7 @@ WERROR _wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p, struct wkssvc_Ne
 WERROR _wkssvc_NetrSetPrimaryComputername(pipes_struct *p, struct wkssvc_NetrSetPrimaryComputername *r);
 WERROR _wkssvc_NetrEnumerateComputerNames(pipes_struct *p, struct wkssvc_NetrEnumerateComputerNames *r);
 void wkssvc_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_wkssvc_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 WERROR _wkssvc_NetWkstaGetInfo(pipes_struct *p, struct wkssvc_NetWkstaGetInfo *r);
 WERROR _wkssvc_NetWkstaSetInfo(pipes_struct *p, struct wkssvc_NetWkstaSetInfo *r);
 WERROR _wkssvc_NetWkstaEnumUsers(pipes_struct *p, struct wkssvc_NetWkstaEnumUsers *r);

diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 3fc63a49991069c352d67a84023d5964c30c9930..53ca52e97951eee9267b218a4ccab4f544532f78 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -223,7 +223,7 @@ sub ParseFunctionAsyncSend($$$)
        $self->pidl("");
 
        $self->pidl("subreq = cli->dispatch_send(state, ev, cli,");
-       $self->pidl("\t\t\t    &ndr_table_$if,");
+       $self->pidl("\t\t\t    NDR_".$uif."_UUID, NDR_".$uif."_VERSION,");
        $self->pidl("\t\t\t    $ufn,");
        $self->pidl("\t\t\t    &state->tmp);");
        $self->pidl("if (tevent_req_nomem(subreq, req)) {");
@@ -387,7 +387,7 @@ sub ParseFunctionSync($$$)
        $self->pidl("");
        $self->pidl("status = cli->dispatch(cli,");
        $self->pidl("\t\t\tmem_ctx,");
-       $self->pidl("\t\t\t&ndr_table_$if,");
+       $self->pidl("\t\t\tNDR_".$uif."_UUID, NDR_".$uif."_VERSION,");
        $self->pidl("\t\t\t$ufn,");
        $self->pidl("\t\t\t&r);");
        $self->pidl("");

diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 5599de9d790904692ee2b215859f8957f603e584..fca55563abc1aa5a5a69a85d3cc7f56a121e85dd 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -226,8 +226,8 @@ sub ParseDispatchFunction($)
 {
        my ($if) = @_;
 
-       pidl_hdr "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);";
-       pidl "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)";
+       pidl_hdr "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);";
+       pidl "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)";
        pidl "{";
        indent;
        pidl "if (cli->pipes_struct == NULL) {";

diff --git a/source3/include/client.h b/source3/include/client.h
index 82d94b055f6c36c2b5352a56a9e258ea713ad868..3b3931bb6bbd49cde0880d1c736131c3201d8e90 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -123,14 +123,14 @@ struct rpc_pipe_client {
 
        NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
                        TALLOC_CTX *mem_ctx,
-                       const struct ndr_interface_table *table,
+                       const char *interface, uint32_t interface_version,
                        uint32_t opnum, void *r);
 
        struct tevent_req *(*dispatch_send)(
                TALLOC_CTX *mem_ctx,
                struct tevent_context *ev,
                struct rpc_pipe_client *cli,
-               const struct ndr_interface_table *table,
+               const char *interface, uint32_t interface_version,
                uint32_t opnum,
                void *r);
        NTSTATUS (*dispatch_recv)(struct tevent_req *req,

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2364360d4f5d3f2888e6bc7cde4b2d03f7471be1..a0355732e7886aad48989e5288da6d01b5d60fa5 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5310,8 +5310,13 @@ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host,
 NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
                               const struct ndr_syntax_id *abstract_syntax,
                               struct rpc_pipe_client **presult);
-NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax, 
-                               NTSTATUS (*dispatch) (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r),
+NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
+                               const struct ndr_syntax_id *abstract_syntax,
+                               NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
+                                                     TALLOC_CTX *mem_ctx,
+                                                     const char *interface,
+                                                     uint32_t interface_version,
+                                                     uint32_t opnum, void *r),
                                struct auth_serversupplied_info *serversupplied_info,
                                struct rpc_pipe_client **presult);
 NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli,
@@ -5634,14 +5639,15 @@ void init_samr_CryptPassword(const char *pwd,
 struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx,
                                       struct tevent_context *ev,
                                       struct rpc_pipe_client *cli,
-                                      const struct ndr_interface_table *table,
+                                      const char *interface,
+                                      uint32_t interface_version,
                                       uint32_t opnum,
                                       void *r);
 NTSTATUS cli_do_rpc_ndr_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx);
 NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
                        TALLOC_CTX *mem_ctx,
-                       const struct ndr_interface_table *table,
-                       uint32 opnum, void *r);
+                       const char *interface, uint32_t interface_version,
+                       uint32_t opnum, void *r);
 
 /* The following definitions come from rpc_parse/parse_misc.c  */
 

diff --git a/source3/librpc/gen_ndr/cli_wbint.c b/source3/librpc/gen_ndr/cli_wbint.c
index 3115a20d9df9f3bbbadc4fdf2d1cd745461d0d15..9b64375b952bed7de35ca8cd4dc51328d5dd73b4 100644 (file)
--- a/source3/librpc/gen_ndr/cli_wbint.c
+++ b/source3/librpc/gen_ndr/cli_wbint.c
@@ -49,7 +49,7 @@ struct tevent_req *rpccli_wbint_Ping_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_PING,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -122,7 +122,7 @@ NTSTATUS rpccli_wbint_Ping(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_PING,
                                &r);
 
@@ -191,7 +191,7 @@ struct tevent_req *rpccli_wbint_LookupSid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_LOOKUPSID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -275,7 +275,7 @@ NTSTATUS rpccli_wbint_LookupSid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_LOOKUPSID,
                                &r);
 
@@ -348,7 +348,7 @@ struct tevent_req *rpccli_wbint_LookupName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_LOOKUPNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -434,7 +434,7 @@ NTSTATUS rpccli_wbint_LookupName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_LOOKUPNAME,
                                &r);
 
@@ -502,7 +502,7 @@ struct tevent_req *rpccli_wbint_Sid2Uid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_SID2UID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -584,7 +584,7 @@ NTSTATUS rpccli_wbint_Sid2Uid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_SID2UID,
                                &r);
 
@@ -651,7 +651,7 @@ struct tevent_req *rpccli_wbint_Sid2Gid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_SID2GID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -733,7 +733,7 @@ NTSTATUS rpccli_wbint_Sid2Gid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_SID2GID,
                                &r);
 
@@ -800,7 +800,7 @@ struct tevent_req *rpccli_wbint_Uid2Sid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_UID2SID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -882,7 +882,7 @@ NTSTATUS rpccli_wbint_Uid2Sid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_UID2SID,
                                &r);
 
@@ -949,7 +949,7 @@ struct tevent_req *rpccli_wbint_Gid2Sid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_GID2SID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1031,7 +1031,7 @@ NTSTATUS rpccli_wbint_Gid2Sid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_GID2SID,
                                &r);
 
@@ -1094,7 +1094,7 @@ struct tevent_req *rpccli_wbint_AllocateUid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_ALLOCATEUID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1172,7 +1172,7 @@ NTSTATUS rpccli_wbint_AllocateUid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_ALLOCATEUID,
                                &r);
 
@@ -1235,7 +1235,7 @@ struct tevent_req *rpccli_wbint_AllocateGid_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_ALLOCATEGID,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1313,7 +1313,7 @@ NTSTATUS rpccli_wbint_AllocateGid(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_ALLOCATEGID,
                                &r);
 
@@ -1378,7 +1378,7 @@ struct tevent_req *rpccli_wbint_QueryUser_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_QUERYUSER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1458,7 +1458,7 @@ NTSTATUS rpccli_wbint_QueryUser(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_QUERYUSER,
                                &r);
 
@@ -1523,7 +1523,7 @@ struct tevent_req *rpccli_wbint_LookupUserAliases_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_LOOKUPUSERALIASES,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1603,7 +1603,7 @@ NTSTATUS rpccli_wbint_LookupUserAliases(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_LOOKUPUSERALIASES,
                                &r);
 
@@ -1668,7 +1668,7 @@ struct tevent_req *rpccli_wbint_LookupUserGroups_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_LOOKUPUSERGROUPS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1748,7 +1748,7 @@ NTSTATUS rpccli_wbint_LookupUserGroups(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_LOOKUPUSERGROUPS,
                                &r);
 
@@ -1811,7 +1811,7 @@ struct tevent_req *rpccli_wbint_QuerySequenceNumber_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_QUERYSEQUENCENUMBER,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -1889,7 +1889,7 @@ NTSTATUS rpccli_wbint_QuerySequenceNumber(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_QUERYSEQUENCENUMBER,
                                &r);
 
@@ -1956,7 +1956,7 @@ struct tevent_req *rpccli_wbint_LookupGroupMembers_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_LOOKUPGROUPMEMBERS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2038,7 +2038,7 @@ NTSTATUS rpccli_wbint_LookupGroupMembers(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_LOOKUPGROUPMEMBERS,
                                &r);
 
@@ -2101,7 +2101,7 @@ struct tevent_req *rpccli_wbint_QueryUserList_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_QUERYUSERLIST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2179,7 +2179,7 @@ NTSTATUS rpccli_wbint_QueryUserList(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_QUERYUSERLIST,
                                &r);
 
@@ -2242,7 +2242,7 @@ struct tevent_req *rpccli_wbint_QueryGroupList_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_QUERYGROUPLIST,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2320,7 +2320,7 @@ NTSTATUS rpccli_wbint_QueryGroupList(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_QUERYGROUPLIST,
                                &r);
 
@@ -2391,7 +2391,7 @@ struct tevent_req *rpccli_wbint_DsGetDcName_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_DSGETDCNAME,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2477,7 +2477,7 @@ NTSTATUS rpccli_wbint_DsGetDcName(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_DSGETDCNAME,
                                &r);
 
@@ -2542,7 +2542,7 @@ struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_LOOKUPRIDS,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2622,7 +2622,7 @@ NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_LOOKUPRIDS,
                                &r);
 
@@ -2677,7 +2677,7 @@ struct tevent_req *rpccli_wbint_CheckMachineAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_CHECKMACHINEACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2753,7 +2753,7 @@ NTSTATUS rpccli_wbint_CheckMachineAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_CHECKMACHINEACCOUNT,
                                &r);
 
@@ -2807,7 +2807,7 @@ struct tevent_req *rpccli_wbint_ChangeMachineAccount_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_CHANGEMACHINEACCOUNT,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -2883,7 +2883,7 @@ NTSTATUS rpccli_wbint_ChangeMachineAccount(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_CHANGEMACHINEACCOUNT,
                                &r);
 
@@ -2943,7 +2943,7 @@ struct tevent_req *rpccli_wbint_SetMapping_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_SETMAPPING,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3025,7 +3025,7 @@ NTSTATUS rpccli_wbint_SetMapping(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_SETMAPPING,
                                &r);
 
@@ -3085,7 +3085,7 @@ struct tevent_req *rpccli_wbint_RemoveMapping_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_REMOVEMAPPING,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3167,7 +3167,7 @@ NTSTATUS rpccli_wbint_RemoveMapping(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_REMOVEMAPPING,
                                &r);
 
@@ -3225,7 +3225,7 @@ struct tevent_req *rpccli_wbint_SetHWM_send(TALLOC_CTX *mem_ctx,
        state->tmp = state->orig;
 
        subreq = cli->dispatch_send(state, ev, cli,
-                                   &ndr_table_wbint,
+                                   NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                    NDR_WBINT_SETHWM,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
@@ -3305,7 +3305,7 @@ NTSTATUS rpccli_wbint_SetHWM(struct rpc_pipe_client *cli,
 
        status = cli->dispatch(cli,
                                mem_ctx,
-                               &ndr_table_wbint,
+                               NDR_WBINT_UUID, NDR_WBINT_VERSION,
                                NDR_WBINT_SETHWM,
                                &r);
 

diff --git a/source3/librpc/gen_ndr/srv_wbint.c b/source3/librpc/gen_ndr/srv_wbint.c
index 0f39cd93e19d0e5335ae944f8a587d169c67c270..08a346a3f6d4875518ab1bc2f4dd969375102e1f 100644 (file)
--- a/source3/librpc/gen_ndr/srv_wbint.c
+++ b/source3/librpc/gen_ndr/srv_wbint.c
@@ -1864,7 +1864,7 @@ void wbint_get_pipe_fns(struct api_struct **fns, int *n_fns)
        *n_fns = sizeof(api_wbint_cmds) / sizeof(struct api_struct);
 }
 
-NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)
+NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)
 {
        if (cli->pipes_struct == NULL) {
                return NT_STATUS_INVALID_PARAMETER;

diff --git a/source3/librpc/gen_ndr/srv_wbint.h b/source3/librpc/gen_ndr/srv_wbint.h
index c8c04fb3cc6b4712b5d390b2b19f1aeb82c741d8..1e7f15ececfa10cf63e0298046510d5c7040c628 100644 (file)
--- a/source3/librpc/gen_ndr/srv_wbint.h
+++ b/source3/librpc/gen_ndr/srv_wbint.h
@@ -25,7 +25,7 @@ NTSTATUS _wbint_SetMapping(pipes_struct *p, struct wbint_SetMapping *r);
 NTSTATUS _wbint_RemoveMapping(pipes_struct *p, struct wbint_RemoveMapping *r);
 NTSTATUS _wbint_SetHWM(pipes_struct *p, struct wbint_SetHWM *r);
 void wbint_get_pipe_fns(struct api_struct **fns, int *n_fns);
-NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);
+NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);
 void _wbint_Ping(pipes_struct *p, struct wbint_Ping *r);
 NTSTATUS _wbint_LookupSid(pipes_struct *p, struct wbint_LookupSid *r);
 NTSTATUS _wbint_LookupName(pipes_struct *p, struct wbint_LookupName *r);

diff --git a/source3/rpc_client/ndr.c b/source3/rpc_client/ndr.c
index 6433a7d196a7dfe9533e14c9d0bdf565effe7760..1db6ff72904832275b96b8e5b52327c075bcd0f8 100644 (file)
--- a/source3/rpc_client/ndr.c
+++ b/source3/rpc_client/ndr.c
@@ -33,12 +33,15 @@ static void cli_do_rpc_ndr_done(struct tevent_req *subreq);
 struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx,
                                       struct tevent_context *ev,
                                       struct rpc_pipe_client *cli,
-                                      const struct ndr_interface_table *table,
+                                      const char *interface,
+                                      uint32_t interface_version,
                                       uint32_t opnum,
                                       void *r)
 {
        struct tevent_req *req, *subreq;
        struct cli_do_rpc_ndr_state *state;
+       struct ndr_syntax_id syntax;
+       const struct ndr_interface_table *table;
        struct ndr_push *push;
        DATA_BLOB blob;
        enum ndr_err_code ndr_err;
@@ -50,6 +53,17 @@ struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
+       if (!ndr_syntax_from_string(interface, interface_version, &syntax)) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       table = get_iface_from_syntax(&syntax);
+       if (table == NULL) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
        if (!ndr_syntax_id_equal(&table->syntax_id, &cli->abstract_syntax)
            || (opnum >= table->num_calls)) {
                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
@@ -156,7 +170,7 @@ NTSTATUS cli_do_rpc_ndr_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx)
 
 NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
                        TALLOC_CTX *mem_ctx,
-                       const struct ndr_interface_table *table,
+                       const char *interface, uint32_t interface_version,
                        uint32_t opnum, void *r)
 {
        TALLOC_CTX *frame = talloc_stackframe();
@@ -170,7 +184,8 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
                goto fail;
        }
 
-       req = cli_do_rpc_ndr_send(frame, ev, cli, table, opnum, r);
+       req = cli_do_rpc_ndr_send(frame, ev, cli, interface, interface_version,
+                                 opnum, r);
        if (req == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto fail;

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 5d5eb0eeb1e6ad2255616b7a077cb0ad31524132..254241c74368a24816d3fd02905a82906c7b88ae 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1464,7 +1464,8 @@ NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
                                const struct ndr_syntax_id *abstract_syntax,
                                NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
                                                      TALLOC_CTX *mem_ctx,
-                                                     const struct ndr_interface_table *table,
+                                                     const char *interface,
+                                                     uint32_t interface_version,
                                                      uint32_t opnum, void *r),
                                struct auth_serversupplied_info *serversupplied_info,
                                struct rpc_pipe_client **presult)

diff --git a/source3/winbindd/winbindd_dual_ndr.c b/source3/winbindd/winbindd_dual_ndr.c
index 8a23ce48e041f01f259c4cb954f043d0ec7fc02b..eb018aa87e79049e9c2c169a03e5a212c2662f8f 100644 (file)
--- a/source3/winbindd/winbindd_dual_ndr.c
+++ b/source3/winbindd/winbindd_dual_ndr.c
@@ -51,7 +51,8 @@ static void wb_ndr_dispatch_done(struct tevent_req *subreq);
 static struct tevent_req *wb_ndr_dispatch_send(TALLOC_CTX *mem_ctx,
                                               struct tevent_context *ev,
                                               struct rpc_pipe_client *cli,
-                                              const struct ndr_interface_table *table,
+                                              const char *interface,
+                                              uint32_t interface_version,
                                               uint32_t opnum,
                                               void *r)
 {
@@ -69,7 +70,7 @@ static struct tevent_req *wb_ndr_dispatch_send(TALLOC_CTX *mem_ctx,
        }
 
        state->r = r;
-       state->call = &table->calls[opnum];
+       state->call = &ndr_table_wbint.calls[opnum];
        state->transport = transport;
        state->opnum = opnum;
 
@@ -167,7 +168,8 @@ static NTSTATUS wb_ndr_dispatch_recv(struct tevent_req *req,
 
 static NTSTATUS wb_ndr_dispatch(struct rpc_pipe_client *cli,
                                TALLOC_CTX *mem_ctx,
-                               const struct ndr_interface_table *table,
+                               const char *interface,
+                               uint32_t interface_version,
                                uint32_t opnum, void *r)
 {
        TALLOC_CTX *frame = talloc_stackframe();
@@ -181,7 +183,8 @@ static NTSTATUS wb_ndr_dispatch(struct rpc_pipe_client *cli,
                goto fail;
        }
 
-       req = wb_ndr_dispatch_send(frame, ev, cli, table, opnum, r);
+       req = wb_ndr_dispatch_send(frame, ev, cli, interface,
+                                  interface_version, opnum, r);
        if (req == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto fail;