The branch, v3-2-test has been updated via de2fdc6b5a78932f8ea5cf4c4715296f18dae4d3 (commit) via b734cd8aab163d794b969c4e1e721e81a8b4d44c (commit) via 0a8759d0118715ef1546ae5fc404a26f874f2d80 (commit) via 91bf2ac1af66acd8bcc831e758b3765fc94b2485 (commit) via 677d9e6d86997a1ae10266e9bab3b18c3fdd2890 (commit) via 8a1b306b826c75dde9caadc93b022bfa9bf3c4e3 (commit) via 298b0ce951f02705c5660a4171f7cc208de7a1db (commit) from a3fbb5323222334c86c0dc360df8c6a39039bbe6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit de2fdc6b5a78932f8ea5cf4c4715296f18dae4d3 Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:40:36 2007 +0100 Fix shutdown callers. Guenther commit b734cd8aab163d794b969c4e1e721e81a8b4d44c Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:40:09 2007 +0100 Fix wkssvc callers. Guenther commit 0a8759d0118715ef1546ae5fc404a26f874f2d80 Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:36:25 2007 +0100 Fix dfs callers. Guenther commit 91bf2ac1af66acd8bcc831e758b3765fc94b2485 Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:25:13 2007 +0100 Fix svcctl callers. Guenther commit 677d9e6d86997a1ae10266e9bab3b18c3fdd2890 Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:21:40 2007 +0100 Fix winreg callers. Guenther commit 8a1b306b826c75dde9caadc93b022bfa9bf3c4e3 Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:20:02 2007 +0100 Forgot header in previous commit. Guenther commit 298b0ce951f02705c5660a4171f7cc208de7a1db Author: Günther Deschner <[EMAIL PROTECTED]> Date: Mon Dec 3 18:19:20 2007 +0100 Regenerate pidl rpc client calls that are WERROR based. Guenther ----------------------------------------------------------------------- Summary of changes: source/lib/netapi/joindomain.c | 9 +- source/librpc/gen_ndr/cli_dfs.c | 132 ++++++++++-- source/librpc/gen_ndr/cli_dfs.h | 44 ++-- source/librpc/gen_ndr/cli_initshutdown.c | 18 ++- source/librpc/gen_ndr/cli_initshutdown.h | 6 +- source/librpc/gen_ndr/cli_netlogon.c | 174 +++++++++++++--- source/librpc/gen_ndr/cli_netlogon.h | 58 +++--- source/librpc/gen_ndr/cli_srvsvc.c | 324 +++++++++++++++++++++++++----- source/librpc/gen_ndr/cli_srvsvc.h | 108 +++++----- source/librpc/gen_ndr/cli_svcctl.c | 264 ++++++++++++++++++++---- source/librpc/gen_ndr/cli_svcctl.h | 88 ++++---- source/librpc/gen_ndr/cli_winreg.c | 210 ++++++++++++++++---- source/librpc/gen_ndr/cli_winreg.h | 70 ++++---- source/librpc/gen_ndr/cli_wkssvc.c | 186 ++++++++++++++--- source/librpc/gen_ndr/cli_wkssvc.h | 62 +++--- source/rpc_client/cli_reg.c | 10 +- source/rpcclient/cmd_dfs.c | 98 +++++---- source/rpcclient/cmd_wkssvc.c | 6 +- source/utils/net_rpc.c | 15 +- source/utils/net_rpc_registry.c | 57 +++--- source/utils/net_rpc_service.c | 20 +- 21 files changed, 1423 insertions(+), 536 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c index f6944e4..2107631 100644 --- a/source/lib/netapi/joindomain.c +++ b/source/lib/netapi/joindomain.c @@ -89,14 +89,12 @@ WERROR NetJoinDomain(const char *server_name, server_name, domain_name, account_ou, Account, &encrypted_password, - join_flags); + join_flags, &werr); if (!NT_STATUS_IS_OK(status)) { werr = ntstatus_to_werror(status); goto done; } - werr = WERR_OK; - done: if (cli) { cli_set_timeout(cli, old_timeout); @@ -166,14 +164,13 @@ WERROR NetUnjoinDomain(const char *server_name, server_name, account, &encrypted_password, - unjoin_flags); + unjoin_flags, + &werr); if (!NT_STATUS_IS_OK(status)) { werr = ntstatus_to_werror(status); goto done; } - werr = WERR_OK; - done: if (cli) { cli_set_timeout(cli, old_timeout); diff --git a/source/librpc/gen_ndr/cli_dfs.c b/source/librpc/gen_ndr/cli_dfs.c index 154ceff..fda0460 100644 --- a/source/librpc/gen_ndr/cli_dfs.c +++ b/source/librpc/gen_ndr/cli_dfs.c @@ -36,7 +36,7 @@ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli, TALLOC_CTX *m return NT_STATUS_OK; } -NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *path, const char *server, const char *share, const char *comment, uint32_t flags) +NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *path, const char *server, const char *share, const char *comment, uint32_t flags, WERROR *werror) { struct dfs_Add r; NTSTATUS status; @@ -67,10 +67,14 @@ NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename) +NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, WERROR *werror) { struct dfs_Remove r; NTSTATUS status; @@ -99,10 +103,14 @@ NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info) +NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info, WERROR *werror) { struct dfs_SetInfo r; NTSTATUS status; @@ -133,10 +141,14 @@ NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, co /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info) +NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info, WERROR *werror) { struct dfs_GetInfo r; NTSTATUS status; @@ -167,10 +179,14 @@ NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, co *info = *r.out.info; /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total) +NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total, WERROR *werror) { struct dfs_Enum r; NTSTATUS status; @@ -206,10 +222,14 @@ NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint3 } /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_Rename r; NTSTATUS status; @@ -235,10 +255,14 @@ NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_Move r; NTSTATUS status; @@ -264,10 +288,14 @@ NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_ManagerGetConfigInfo r; NTSTATUS status; @@ -293,10 +321,14 @@ NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli, TALLOC_CTX /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_ManagerSendSiteInfo r; NTSTATUS status; @@ -322,10 +354,14 @@ NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli, TALLOC_CTX /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, const char *comment, const char *dfs_config_dn, uint8_t unknown1, uint32_t flags, struct dfs_UnknownStruct **unknown2) +NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, const char *comment, const char *dfs_config_dn, uint8_t unknown1, uint32_t flags, struct dfs_UnknownStruct **unknown2, WERROR *werror) { struct dfs_AddFtRoot r; NTSTATUS status; @@ -363,10 +399,14 @@ NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, } /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, uint32_t flags, struct dfs_UnknownStruct **unknown) +NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, uint32_t flags, struct dfs_UnknownStruct **unknown, WERROR *werror) { struct dfs_RemoveFtRoot r; NTSTATUS status; @@ -401,10 +441,14 @@ NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct } /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, uint32_t flags) +NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, uint32_t flags, WERROR *werror) { struct dfs_AddStdRoot r; NTSTATUS status; @@ -434,10 +478,14 @@ NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, uint32_t flags) +NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, uint32_t flags, WERROR *werror) { struct dfs_RemoveStdRoot r; NTSTATUS status; @@ -466,10 +514,14 @@ NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, uint32_t flags) +NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, uint32_t flags, WERROR *werror) { struct dfs_ManagerInitialize r; NTSTATUS status; @@ -497,10 +549,14 @@ NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli, TALLOC_CTX *m /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, const char *store) +NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, const char *store, WERROR *werror) { struct dfs_AddStdRootForced r; NTSTATUS status; @@ -530,10 +586,14 @@ NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli, TALLOC_CTX *me /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_GetDcAddress r; NTSTATUS status; @@ -559,10 +619,14 @@ NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_SetDcAddress r; NTSTATUS status; @@ -588,10 +652,14 @@ NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare) +NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, WERROR *werror) { struct dfs_FlushFtTable r; NTSTATUS status; @@ -619,10 +687,14 @@ NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_Add2 r; NTSTATUS status; @@ -648,10 +720,14 @@ NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_Remove2 r; NTSTATUS status; @@ -677,10 +753,14 @@ NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total) +NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total, WERROR *werror) { struct dfs_EnumEx r; NTSTATUS status; @@ -717,10 +797,14 @@ NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, con } /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) +NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror) { struct dfs_SetInfo2 r; NTSTATUS status; @@ -746,6 +830,10 @@ NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx) /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } diff --git a/source/librpc/gen_ndr/cli_dfs.h b/source/librpc/gen_ndr/cli_dfs.h index 16088e3..1b03fbf 100644 --- a/source/librpc/gen_ndr/cli_dfs.h +++ b/source/librpc/gen_ndr/cli_dfs.h @@ -2,26 +2,26 @@ #ifndef __CLI_NETDFS__ #define __CLI_NETDFS__ NTSTATUS rpccli_dfs_GetManagerVersion(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, enum dfs_ManagerVersion *version); -NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *path, const char *server, const char *share, const char *comment, uint32_t flags); -NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename); -NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info); -NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info); -NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total); -NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, const char *comment, const char *dfs_config_dn, uint8_t unknown1, uint32_t flags, struct dfs_UnknownStruct **unknown2); -NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, uint32_t flags, struct dfs_UnknownStruct **unknown); -NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, uint32_t flags); -NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, uint32_t flags); -NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, uint32_t flags); -NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, const char *store); -NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare); -NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total); -NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); +NTSTATUS rpccli_dfs_Add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *path, const char *server, const char *share, const char *comment, uint32_t flags, WERROR *werror); +NTSTATUS rpccli_dfs_Remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, WERROR *werror); +NTSTATUS rpccli_dfs_SetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info, WERROR *werror); +NTSTATUS rpccli_dfs_GetInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_entry_path, const char *servername, const char *sharename, uint32_t level, union dfs_Info *info, WERROR *werror); +NTSTATUS rpccli_dfs_Enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total, WERROR *werror); +NTSTATUS rpccli_dfs_Rename(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_Move(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_ManagerGetConfigInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_ManagerSendSiteInfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_AddFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, const char *comment, const char *dfs_config_dn, uint8_t unknown1, uint32_t flags, struct dfs_UnknownStruct **unknown2, WERROR *werror); +NTSTATUS rpccli_dfs_RemoveFtRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *dns_servername, const char *dfsname, const char *rootshare, uint32_t flags, struct dfs_UnknownStruct **unknown, WERROR *werror); +NTSTATUS rpccli_dfs_AddStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, uint32_t flags, WERROR *werror); +NTSTATUS rpccli_dfs_RemoveStdRoot(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, uint32_t flags, WERROR *werror); +NTSTATUS rpccli_dfs_ManagerInitialize(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, uint32_t flags, WERROR *werror); +NTSTATUS rpccli_dfs_AddStdRootForced(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, const char *comment, const char *store, WERROR *werror); +NTSTATUS rpccli_dfs_GetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_SetDcAddress(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_FlushFtTable(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *servername, const char *rootshare, WERROR *werror); +NTSTATUS rpccli_dfs_Add2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_Remove2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); +NTSTATUS rpccli_dfs_EnumEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *dfs_name, uint32_t level, uint32_t bufsize, struct dfs_EnumStruct *info, uint32_t *total, WERROR *werror); +NTSTATUS rpccli_dfs_SetInfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, WERROR *werror); #endif /* __CLI_NETDFS__ */ diff --git a/source/librpc/gen_ndr/cli_initshutdown.c b/source/librpc/gen_ndr/cli_initshutdown.c index 4e6647d..57c5e60 100644 --- a/source/librpc/gen_ndr/cli_initshutdown.c +++ b/source/librpc/gen_ndr/cli_initshutdown.c @@ -6,7 +6,7 @@ #include "includes.h" #include "librpc/gen_ndr/cli_initshutdown.h" -NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t *hostname, struct initshutdown_String *message, uint32_t timeout, uint8_t force_apps, uint8_t reboot) +NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t *hostname, struct initshutdown_String *message, uint32_t timeout, uint8_t force_apps, uint8_t reboot, WERROR *werror) { struct initshutdown_Init r; NTSTATUS status; @@ -37,10 +37,14 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t *server) +NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t *server, WERROR *werror) { struct initshutdown_Abort r; NTSTATUS status; @@ -67,10 +71,14 @@ NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ /* Return variables */ /* Return result */ + if (werror) { + *werror = r.out.result; + } + return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t *hostname, struct initshutdown_String *message, uint32_t timeout, uint8_t force_apps, uint8_t reboot, uint32_t reason) +NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t *hostname, struct initshutdown_String *message, uint32_t timeout, uint8_t force_apps, uint8_t reboot, uint32_t reason, WERROR *werror) { struct initshutdown_InitEx r; NTSTATUS status; @@ -102,6 +110,10 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli, TALLOC_CTX *mem /* Return variables */ /* Return result */ + if (werror) { -- Samba Shared Repository