[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Jan 6 07:21:02 MST 2011
The branch, master has been updated
via 2958a43 s3-waf: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
via 577b4e5 s3-build: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
via 7888108 s3-rpcclient: use dcerpc_dfs_X functions.
from 2778130 pidl:Samba4/Python: fix memory leak in _ndr_print functions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2958a43fad6b714e3f2bfe5f0e43b344395de179
Author: Günther Deschner <gd at samba.org>
Date: Wed Jan 5 17:26:39 2011 +0100
s3-waf: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Jan 6 15:20:14 CET 2011 on sn-devel-104
commit 577b4e527c27ff074ea375ff31a339a5ad4e8071
Author: Günther Deschner <gd at samba.org>
Date: Wed Jan 5 17:26:16 2011 +0100
s3-build: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
Guenther
commit 7888108e89995b0bacbd5915bd70778fe901820a
Author: Günther Deschner <gd at samba.org>
Date: Wed Jan 5 17:22:24 2011 +0100
s3-rpcclient: use dcerpc_dfs_X functions.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 3 +--
source3/rpcclient/cmd_dfs.c | 36 ++++++++++++++++++++++++------------
source3/wscript_build | 6 +-----
3 files changed, 26 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index cfcadce..50046cc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -354,8 +354,7 @@ LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/ndr_ntsvcs_c.o
LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/cli_drsuapi.o \
librpc/gen_ndr/ndr_drsuapi_c.o
-LIBCLI_DFS_OBJ = librpc/gen_ndr/cli_dfs.o \
- librpc/gen_ndr/ndr_dfs_c.o
+LIBCLI_DFS_OBJ = librpc/gen_ndr/ndr_dfs_c.o
LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
librpc/gen_ndr/ndr_echo_c.o
diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index 1f1eb3d..3de6aff 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -30,13 +30,14 @@ static WERROR cmd_dfs_version(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
{
enum dfs_ManagerVersion version;
NTSTATUS result;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
if (argc != 1) {
printf("Usage: %s\n", argv[0]);
return WERR_OK;
}
- result = rpccli_dfs_GetManagerVersion(cli, mem_ctx, &version);
+ result = dcerpc_dfs_GetManagerVersion(b, mem_ctx, &version);
if (!NT_STATUS_IS_OK(result)) {
return ntstatus_to_werror(result);
@@ -58,6 +59,7 @@ static WERROR cmd_dfs_add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
WERROR werr;
const char *path, *servername, *sharename, *comment;
uint32 flags = 0;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
if (argc != 5) {
printf("Usage: %s path servername sharename comment\n",
@@ -70,7 +72,7 @@ static WERROR cmd_dfs_add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
sharename = argv[3];
comment = argv[4];
- result = rpccli_dfs_Add(cli, mem_ctx, path, servername,
+ result = dcerpc_dfs_Add(b, mem_ctx, path, servername,
sharename, comment, flags, &werr);
if (!NT_STATUS_IS_OK(result)) {
return ntstatus_to_werror(result);
@@ -85,6 +87,7 @@ static WERROR cmd_dfs_remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
NTSTATUS result;
WERROR werr;
const char *path, *servername, *sharename;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
if (argc != 4) {
printf("Usage: %s path servername sharename\n", argv[0]);
@@ -95,7 +98,7 @@ static WERROR cmd_dfs_remove(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
servername = argv[2];
sharename = argv[3];
- result = rpccli_dfs_Remove(cli, mem_ctx, path, servername,
+ result = dcerpc_dfs_Remove(b, mem_ctx, path, servername,
sharename, &werr);
if (!NT_STATUS_IS_OK(result)) {
return ntstatus_to_werror(result);
@@ -195,6 +198,7 @@ static WERROR cmd_dfs_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
struct dfs_EnumArray4 info4;
struct dfs_EnumArray200 info200;
struct dfs_EnumArray300 info300;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS result;
WERROR werr;
@@ -221,10 +225,12 @@ static WERROR cmd_dfs_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
break;
}
- result = rpccli_dfs_Enum(cli, mem_ctx, str.level, 0xFFFFFFFF, &str,
+ result = dcerpc_dfs_Enum(b, mem_ctx, str.level, 0xFFFFFFFF, &str,
&total, &werr);
-
- if (NT_STATUS_IS_OK(result)) {
+ if (!NT_STATUS_IS_OK(result)) {
+ return ntstatus_to_werror(result);
+ }
+ if (W_ERROR_IS_OK(werr)) {
display_dfs_enumstruct(&str);
}
@@ -243,6 +249,7 @@ static WERROR cmd_dfs_enumex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
struct dfs_EnumArray4 info4;
struct dfs_EnumArray200 info200;
struct dfs_EnumArray300 info300;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS result;
WERROR werr;
@@ -270,10 +277,12 @@ static WERROR cmd_dfs_enumex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
break;
}
- result = rpccli_dfs_EnumEx(cli, mem_ctx, argv[1], str.level,
+ result = dcerpc_dfs_EnumEx(b, mem_ctx, argv[1], str.level,
0xFFFFFFFF, &str, &total, &werr);
-
- if (NT_STATUS_IS_OK(result)) {
+ if (!NT_STATUS_IS_OK(result)) {
+ return ntstatus_to_werror(result);
+ }
+ if (W_ERROR_IS_OK(werr)) {
display_dfs_enumstruct(&str);
}
@@ -289,6 +298,7 @@ static WERROR cmd_dfs_getinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
const char *path, *servername, *sharename;
uint32 info_level = 1;
union dfs_Info ctr;
+ struct dcerpc_binding_handle *b = cli->binding_handle;
if (argc < 4 || argc > 5) {
printf("Usage: %s path servername sharename "
@@ -303,10 +313,12 @@ static WERROR cmd_dfs_getinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
if (argc == 5)
info_level = atoi(argv[4]);
- result = rpccli_dfs_GetInfo(cli, mem_ctx, path, servername,
+ result = dcerpc_dfs_GetInfo(b, mem_ctx, path, servername,
sharename, info_level, &ctr, &werr);
-
- if (NT_STATUS_IS_OK(result)) {
+ if (!NT_STATUS_IS_OK(result)) {
+ return ntstatus_to_werror(result);
+ }
+ if (W_ERROR_IS_OK(werr)) {
display_dfs_info(info_level, &ctr);
}
diff --git a/source3/wscript_build b/source3/wscript_build
index af7c6cb..db4b48e 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1137,10 +1137,6 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
source='../librpc/gen_ndr/cli_svcctl.c',
public_deps='RPC_NDR_SVCCTL')
-bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
- source='../librpc/gen_ndr/cli_dfs.c',
- public_deps='RPC_NDR_DFS')
-
bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
source='../librpc/gen_ndr/cli_drsuapi.c',
public_deps='RPC_NDR_DRSUAPI')
@@ -1231,7 +1227,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
RPC_CLIENT_SCHANNEL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
- RPCCLI_SRVSVC RPCCLI_WKSSVC RPC_NDR_DSSETUP RPCCLI_DFS
+ RPCCLI_SRVSVC RPCCLI_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
RPCCLI_DRSUAPI RPC_NDR_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
INIT_SAMR
''',
--
Samba Shared Repository
More information about the samba-cvs
mailing list