The branch, master has been updated
via e1e8693 s3:build: don't use cli_ntsvcs.c any more.
via d99e9c3 s3:rpcclient: use dcerpc_binding_handle client stubs in
cmd_ntsvcs.c
via fbcbeab s3:build: don't use cli_wbint.c any more
from 1cbce84 s4/ldapcmp: Fix the parsing of the second set of credentials
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e1e869352565b8e1d7865a2338f8f0f3ef154519
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jan 4 10:55:48 2011 +0100
s3:build: don't use cli_ntsvcs.c any more.
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Tue Jan 4 17:23:17 CET 2011 on sn-devel-104
commit d99e9c389b6c0d8ed84a7b36ccadd8b43e3b19f2
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jan 4 10:52:14 2011 +0100
s3:rpcclient: use dcerpc_binding_handle client stubs in cmd_ntsvcs.c
metze
commit fbcbeabd655029309ee42627a0bb75d6a5820f50
Author: Stefan Metzmacher <[email protected]>
Date: Tue Jan 4 13:58:25 2011 +0100
s3:build: don't use cli_wbint.c any more
metze
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 4 +---
source3/librpc/wscript_build | 5 -----
source3/rpcclient/cmd_ntsvcs.c | 21 ++++++++++++++-------
source3/wscript_build | 8 ++------
4 files changed, 17 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index cd0f376..968e2eb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -349,8 +349,7 @@ LIBCLI_EVENTLOG_OBJ = librpc/gen_ndr/cli_eventlog.o \
LIBCLI_WINREG_OBJ = librpc/gen_ndr/cli_winreg.o \
librpc/gen_ndr/ndr_winreg_c.o
-LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/cli_ntsvcs.o \
- librpc/gen_ndr/ndr_ntsvcs_c.o
+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
@@ -1328,7 +1327,6 @@ WINBINDD_OBJ1 = \
winbindd/winbindd_dual.o \
winbindd/winbindd_dual_ndr.o \
winbindd/winbindd_dual_srv.o \
- librpc/gen_ndr/cli_wbint.o \
librpc/gen_ndr/ndr_wbint_c.o \
librpc/gen_ndr/srv_wbint.o \
librpc/gen_ndr/ndr_wbint.o \
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 0bb7322..5b30507 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -45,11 +45,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WBINT',
public_deps='dcerpc NDR_WBINT'
)
-bld.SAMBA_SUBSYSTEM('RPCCLI_NDR_WBINT',
- source='../librpc/gen_ndr/cli_wbint.c',
- public_deps='RPC_NDR_WBINT'
- )
-
bld.SAMBA_SUBSYSTEM('SRV_NDR_WBINT',
source='../librpc/gen_ndr/srv_wbint.c',
public_deps='NDR_WBINT'
diff --git a/source3/rpcclient/cmd_ntsvcs.c b/source3/rpcclient/cmd_ntsvcs.c
index 95b905a..68135d5 100644
--- a/source3/rpcclient/cmd_ntsvcs.c
+++ b/source3/rpcclient/cmd_ntsvcs.c
@@ -27,11 +27,12 @@ static WERROR cmd_ntsvcs_get_version(struct rpc_pipe_client
*cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
uint16_t version;
- status = rpccli_PNP_GetVersion(cli, mem_ctx,
+ status = dcerpc_PNP_GetVersion(b, mem_ctx,
&version, &werr);
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
@@ -49,6 +50,7 @@ static WERROR cmd_ntsvcs_validate_dev_inst(struct
rpc_pipe_client *cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
const char *devicepath = NULL;
@@ -65,7 +67,7 @@ static WERROR cmd_ntsvcs_validate_dev_inst(struct
rpc_pipe_client *cli,
flags = atoi(argv[2]);
}
- status = rpccli_PNP_ValidateDeviceInstance(cli, mem_ctx,
+ status = dcerpc_PNP_ValidateDeviceInstance(b, mem_ctx,
devicepath,
flags,
&werr);
@@ -81,6 +83,7 @@ static WERROR cmd_ntsvcs_hw_prof_flags(struct rpc_pipe_client
*cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
const char *devicepath = NULL;
@@ -96,7 +99,7 @@ static WERROR cmd_ntsvcs_hw_prof_flags(struct rpc_pipe_client
*cli,
devicepath = argv[1];
- status = rpccli_PNP_HwProfFlags(cli, mem_ctx,
+ status = dcerpc_PNP_HwProfFlags(b, mem_ctx,
0,
devicepath,
0,
@@ -119,6 +122,7 @@ static WERROR cmd_ntsvcs_get_hw_prof_info(struct
rpc_pipe_client *cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
uint32_t idx = 0;
@@ -127,7 +131,7 @@ static WERROR cmd_ntsvcs_get_hw_prof_info(struct
rpc_pipe_client *cli,
ZERO_STRUCT(info);
- status = rpccli_PNP_GetHwProfInfo(cli, mem_ctx,
+ status = dcerpc_PNP_GetHwProfInfo(b, mem_ctx,
idx,
&info,
size,
@@ -145,6 +149,7 @@ static WERROR cmd_ntsvcs_get_dev_reg_prop(struct
rpc_pipe_client *cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
const char *devicepath = NULL;
@@ -170,7 +175,7 @@ static WERROR cmd_ntsvcs_get_dev_reg_prop(struct
rpc_pipe_client *cli,
buffer = talloc_array(mem_ctx, uint8_t, buffer_size);
W_ERROR_HAVE_NO_MEMORY(buffer);
- status = rpccli_PNP_GetDeviceRegProp(cli, mem_ctx,
+ status = dcerpc_PNP_GetDeviceRegProp(b, mem_ctx,
devicepath,
property,
®_data_type,
@@ -191,6 +196,7 @@ static WERROR cmd_ntsvcs_get_dev_list_size(struct
rpc_pipe_client *cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
uint32_t size = 0;
@@ -210,7 +216,7 @@ static WERROR cmd_ntsvcs_get_dev_list_size(struct
rpc_pipe_client *cli,
flags = atoi(argv[2]);
}
- status = rpccli_PNP_GetDeviceListSize(cli, mem_ctx,
+ status = dcerpc_PNP_GetDeviceListSize(b, mem_ctx,
filter,
&size,
flags,
@@ -229,6 +235,7 @@ static WERROR cmd_ntsvcs_get_dev_list(struct
rpc_pipe_client *cli,
int argc,
const char **argv)
{
+ struct dcerpc_binding_handle *b = cli->binding_handle;
NTSTATUS status;
WERROR werr;
const char *filter = NULL;
@@ -258,7 +265,7 @@ static WERROR cmd_ntsvcs_get_dev_list(struct
rpc_pipe_client *cli,
return WERR_NOMEM;
}
- status = rpccli_PNP_GetDeviceList(cli, mem_ctx,
+ status = dcerpc_PNP_GetDeviceList(b, mem_ctx,
filter,
buffer,
&length,
diff --git a/source3/wscript_build b/source3/wscript_build
index d670ecb..907335d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1149,10 +1149,6 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
source='../librpc/gen_ndr/cli_drsuapi.c',
public_deps='RPC_NDR_DRSUAPI')
-bld.SAMBA_SUBSYSTEM('RPCCLI_NTSVCS',
- source='../librpc/gen_ndr/cli_ntsvcs.c',
- public_deps='RPC_NDR_NTSVCS')
-
bld.SAMBA_SUBSYSTEM('RPCCLI_EVENTLOG',
source='../librpc/gen_ndr/cli_eventlog.c',
public_deps='RPC_NDR_EVENTLOG')
@@ -1215,7 +1211,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
deps='''talloc tdb tevent cap dl z
wbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS
LIBADS_SERVER
- SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+ SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
@@ -1244,7 +1240,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
RPC_CLIENT_SCHANNEL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
- RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
+ RPCCLI_DRSUAPI RPC_NDR_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
INIT_SAMR
''',
vars=locals())
--
Samba Shared Repository
