The branch, v3-6-test has been updated via 52a2dd8 s3:build: don't use cli_dssetup.c any more via c5ba32b s3: Attempt to please autobuild from 863330e talloc: Typo fix for api docs (cherry picked from commit 564830ef909b62be064590b865bde5d41a7ceac3)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 52a2dd8bc5ada2cfeb96f5e512723b08ed18c4b7 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Jan 4 13:56:05 2011 +0100 s3:build: don't use cli_dssetup.c any more metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Tue Jan 4 22:21:48 CET 2011 on sn-devel-104 (cherry picked from commit 899adcaec97f5f8781507a221d0ffcbe73e59b0c) commit c5ba32bd2d08d4e6949e2f5080d04f00aeb06a8e Author: Volker Lendecke <v...@samba.org> Date: Wed Dec 1 07:57:38 2010 +0100 s3: Attempt to please autobuild Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Wed Dec 1 08:43:37 CET 2010 on sn-devel-104 (cherry picked from commit bf9c3eedf834e5637a23f051e0c8db6687c6dcf1) Signed-off-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 3 +-- source3/locale/net/de.po | 2 +- source3/wscript_build | 10 +++------- 3 files changed, 5 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index 25bbe2c..cfcadce 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -363,8 +363,7 @@ LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \ LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/cli_initshutdown.o \ librpc/gen_ndr/ndr_initshutdown_c.o -LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/cli_dssetup.o \ - librpc/gen_ndr/ndr_dssetup_c.o +LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/ndr_dssetup_c.o LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/cli_svcctl.o \ librpc/gen_ndr/ndr_svcctl_c.o diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po index 85b195e..a12fabd 100644 --- a/source3/locale/net/de.po +++ b/source3/locale/net/de.po @@ -3066,7 +3066,7 @@ msgstr "\t-e oder --encrypt\t\t\tSMB Ãbertragung verschlüsseln (nur UNIX erwe #: ../../utils/net_help_common.c:54 msgid "\t-k or --kerberos\t\tUse kerberos (active directory) authentication\n" -msgstr "\t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active Directory)\n"y +msgstr "\t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active Directory)\n" #: ../../utils/net_idmap.c:26 msgid "Out of memory!\n" diff --git a/source3/wscript_build b/source3/wscript_build index 5b821dc..78da067 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1122,10 +1122,6 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL', source='../librpc/gen_ndr/cli_svcctl.c', public_deps='RPC_NDR_SVCCTL') -bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP', - source='../librpc/gen_ndr/cli_dssetup.c', - public_deps='RPC_NDR_DSSETUP') - bld.SAMBA_SUBSYSTEM('RPCCLI_DFS', source='../librpc/gen_ndr/cli_dfs.c', public_deps='RPC_NDR_DFS') @@ -1196,7 +1192,7 @@ bld.SAMBA_BINARY('winbindd/winbindd', LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON - RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON + RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC ''', enabled=bld.env.build_winbind, @@ -1220,7 +1216,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 RPCCLI_DSSETUP RPCCLI_DFS + RPCCLI_SRVSVC RPCCLI_WKSSVC RPC_NDR_DSSETUP RPCCLI_DFS RPCCLI_DRSUAPI RPC_NDR_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON INIT_SAMR ''', @@ -1242,7 +1238,7 @@ bld.SAMBA_BINARY('net', REGFIO NDR_NTPRINTING RPCCLI_WINREG RPC_CLIENT_SCHANNEL TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS - RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP + RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPC_NDR_DSSETUP RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR ''', vars=locals()) -- Samba Shared Repository