[SCM] Samba Shared Repository - branch master updated

Kai Blin kai at samba.org
Wed May 26 06:11:17 MDT 2010


The branch, master has been updated
       via  83b2fd3... s3-waf: Build smbclient binary
       via  59f3c4e... s3-waf: Fix the naming of some variables introduced recently
      from  c2021e4... s4/test: Connect SAMR and LDARPC pipes before calling libnet_ functions

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 83b2fd30215c5286f0f05bddce76bd5e0959c5c8
Author: Kai Blin <kai at samba.org>
Date:   Wed May 26 14:09:39 2010 +0200

    s3-waf: Build smbclient binary

commit 59f3c4ec591e21235650e7e8bfae2540e423c533
Author: Kai Blin <kai at samba.org>
Date:   Wed May 26 14:09:06 2010 +0200

    s3-waf: Fix the naming of some variables introduced recently

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript_build |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 2c74bf1..cbe2cbb 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -304,7 +304,7 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
 # registry-related objects
 #
 UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
-REG_UTIL_MARSHALLING_OBJ = '''registry/reg_util_marshalling.c'''
+REG_UTIL_MARSHALLING_SRC = '''registry/reg_util_marshalling.c'''
 
 REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
@@ -333,7 +333,7 @@ REG_BASE_SRC = '''registry/reg_api.c
                ${REGFIO_SRC}
                ${REGSRCS_SRC}
                registry/reg_util_internal.c
-	       ${REG_UTIL_MARSHALLING_OBJ}
+	       ${REG_UTIL_MARSHALLING_SRC}
                lib/util_nttoken.c
                ${REG_BACKENDS_BASE_SRC}
                ${REG_INIT_BASIC_SRC}'''
@@ -771,6 +771,17 @@ EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
 		../librpc/gen_ndr/ndr_eventlog.c
 		../librpc/gen_ndr/ndr_lsa.c'''
 
+DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
+
+CLIENT_SRC1 = '''client/client.c client/clitar.c ${RPC_CLIENT_SRC}
+                 ../librpc/rpc/binding.c client/dnsbrowse.c
+                 ${RPC_CLIENT_SRC1} ${RPC_PARSE_SRC2}'''
+
+CLIENT_SRC = '''${CLIENT_SRC1} ${PARAM_SRC}
+	        ${KRBCLIENT_SRC} ${LIBMSRPC_GEN_SRC}
+                ${READLINE_SRC} ${DISPLAY_SEC_SRC}'''
+
+
 LIBS='ICONV'
 
 bld.SAMBA_GENERATOR('build_options',
@@ -934,6 +945,12 @@ bld.SAMBA_BINARY('web/swat',
                  install_path='${SBINDIR}',
                  vars=locals())
 
+bld.SAMBA_BINARY('smbclient',
+                 source=CLIENT_SRC,
+                 deps='''talloc tdb POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
+                 PARAM_WITHOUT_REG LIBWBCLIENT DYNCONFIG''',
+                 vars=locals())
+
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc LIBWBCLIENT DYNCONFIG tevent cap


-- 
Samba Shared Repository


More information about the samba-cvs mailing list