[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  7032d7c s3-waf: Fixed the build. (cherry picked from commit f036b449db07c17d04b7f47b1defedef2c2a0970)
       via  7d5f32f s3-waf: Fixed the rpc_client build. (cherry picked from commit 45c7f83ccb2822564ec8df3c41b5c0a9dead6e9c)
       via  997a039 s3-waf: fix the build.
      from  60f20fc s4:auth Move struct auth_usersupplied_info to a common location

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 7032d7c715233f295c5cef6c8d7b70ad0b538101
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Aug 16 20:18:20 2010 +0200

    s3-waf: Fixed the build.
    (cherry picked from commit f036b449db07c17d04b7f47b1defedef2c2a0970)

commit 7d5f32fb54e6703321ac9fd64f4e78c9a209f754
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Aug 16 20:35:16 2010 +0200

    s3-waf: Fixed the rpc_client build.
    (cherry picked from commit 45c7f83ccb2822564ec8df3c41b5c0a9dead6e9c)

commit 997a039e76a6e8138393b2917befd36384233c55
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 12 16:51:24 2010 +0200

    s3-waf: fix the build.
    
    Guenther
    (cherry picked from commit 73a69e2d0f011327dddf2d0086e13b7b05397af7)

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

Summary of changes:
 source3/wscript_build |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 46abb69..c2c20d2 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -54,8 +54,6 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
              librpc/ndr/util.c
              ../librpc/gen_ndr/ndr_dcerpc.c'''
 
-RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c'''
-
 LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
                   ../librpc/gen_ndr/ndr_lsa.c'''
 
@@ -291,6 +289,24 @@ LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
                rpc_client/init_samr.c
                    ../librpc/rpc/binding.c'''
 
+DCERPC_CLIENT_GEN_SRC = '''
+                librpc/gen_ndr/ndr_lsa_c.c
+                librpc/gen_ndr/ndr_dfs_c.c
+                librpc/gen_ndr/ndr_echo_c.c
+                librpc/gen_ndr/ndr_srvsvc_c.c
+                librpc/gen_ndr/ndr_svcctl_c.c
+                librpc/gen_ndr/ndr_winreg_c.c
+                librpc/gen_ndr/ndr_initshutdown_c.c
+                librpc/gen_ndr/ndr_eventlog_c.c
+                librpc/gen_ndr/ndr_wkssvc_c.c
+                librpc/gen_ndr/ndr_netlogon_c.c
+                librpc/gen_ndr/ndr_samr_c.c
+                librpc/gen_ndr/ndr_dssetup_c.c
+                librpc/gen_ndr/ndr_ntsvcs_c.c
+                librpc/gen_ndr/ndr_epmapper_c.c
+                librpc/gen_ndr/ndr_drsuapi_c.c
+                librpc/gen_ndr/ndr_spoolss_c.c'''
+
 LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
                    ../librpc/gen_ndr/cli_dfs.c
                    ../librpc/gen_ndr/cli_echo.c
@@ -307,10 +323,11 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
                    ../librpc/gen_ndr/cli_epmapper.c
                    ../librpc/gen_ndr/cli_drsuapi.c
                    ../librpc/gen_ndr/cli_spoolss.c
+                   ${DCERPC_CLIENT_GEN_SRC}
                    ../librpc/rpc/dcerpc_util.c
                    librpc/rpc/dcerpc_helpers.c
-                   ${LIBNDR_GEN_SRC}
-                   ${RPCCLIENT_NDR_SRC}'''
+                   ../librpc/rpc/binding_handle.c
+                   ${LIBNDR_GEN_SRC}'''
 
 #
 # registry-related objects
@@ -423,8 +440,7 @@ RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c
                     librpc/rpc/dcerpc_gssapi.c
                     librpc/rpc/dcerpc_spnego.c
                     rpc_client/rpc_transport_np.c
-		    rpc_client/rpc_transport_sock.c
-		    rpc_client/rpc_transport_smbd.c'''
+                    rpc_client/rpc_transport_sock.c'''
 
 LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
 
@@ -586,6 +602,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    librpc/gen_ndr/cli_wbint.c
                    librpc/gen_ndr/srv_wbint.c
                    librpc/gen_ndr/ndr_wbint.c
+                   librpc/gen_ndr/ndr_wbint_c.c
                    winbindd/winbindd_async.c
                    winbindd/winbindd_creds.c
                    winbindd/winbindd_cred_cache.c
@@ -647,9 +664,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_check_machine_acct.c
                    winbindd/winbindd_change_machine_acct.c
                    winbindd/winbindd_ping_dc.c
-                   winbindd/winbindd_set_mapping.c
-                   winbindd/winbindd_remove_mapping.c
-                   winbindd/winbindd_set_hwm.c
                    winbindd/winbindd_pam_auth.c
                    winbindd/winbindd_pam_logoff.c
                    winbindd/winbindd_pam_chauthtok.c


-- 
Samba Shared Repository