[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Thu Sep 23 01:15:02 MDT 2010


The branch, master has been updated
       via  b6f149e s3-waf: add all remaining binaries from the make build.
       via  a11d6c7 s3-build: fix the build of split_tokens.
       via  34008ef s3-build: fix the build of test_lp_load.
       via  099394a s3-build: strip down dependencies of smbta-util.
       via  8037a46 s3-waf: reconcile objects to old make-based build.
       via  9ddfbd1 s3-waf: add libsmbclient.
      from  7378b6d s4-selftest: Move credentials tests to standard python directory.

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


- Log -----------------------------------------------------------------
commit b6f149eec38a69aea2efec307c559e08721a26ca
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 00:13:34 2010 -0700

    s3-waf: add all remaining binaries from the make build.
    
    Guenther

commit a11d6c77e460bdb9755a66a62483b3ad0ae57373
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 00:06:17 2010 -0700

    s3-build: fix the build of split_tokens.
    
    Guenther

commit 34008ef6b35f09b37a3cc7d99cb085e9ff9c85df
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 00:05:31 2010 -0700

    s3-build: fix the build of test_lp_load.
    
    Guenther

commit 099394a8f768e16c15b001bd27757ecf4b1d5f0b
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 00:04:08 2010 -0700

    s3-build: strip down dependencies of smbta-util.
    
    Guenther

commit 8037a46c2e5a2e1ee9479690e38770fdffdcd413
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 22 17:15:15 2010 -0700

    s3-waf: reconcile objects to old make-based build.
    
    Guenther

commit 9ddfbd1c4ea38b47854b298dfba22f8e7026c897
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 22 14:22:09 2010 -0700

    s3-waf: add libsmbclient.
    
    Guenther

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

Summary of changes:
 source3/Makefile.in          |   10 +-
 source3/param/test_lp_load.c |    1 +
 source3/utils/split_tokens.c |    1 +
 source3/wscript_build        |  527 +++++++++++++++++++++++++++++++++++-------
 4 files changed, 448 insertions(+), 91 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7062d31..03a89c5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -977,7 +977,7 @@ TESTPARM_OBJ = utils/testparm.o \
 	       $(LIBSMB_ERR_OBJ)
 
 SMBTA_UTIL_OBJ = utils/smbta-util.o $(PARAM_OBJ) $(POPT_LIB_OBJ) \
-	$(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) \
+	$(LIB_NONSMBD_OBJ) \
 	$(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
 
 TEST_LP_LOAD_OBJ = param/test_lp_load.o \
@@ -3067,11 +3067,11 @@ bin/rpc_open_tcp at EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(L
 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
 		$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
 
-bin/test_lp_load at EXEEXT@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/test_lp_load at EXEEXT@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
 	@echo "Linking $@"
 	@$(CC) -o $@ $(TEST_LP_LOAD_OBJ) \
 		$(LDFLAGS) $(DYNEXP) $(LIBS) \
-		$(LDAP_LIBS) \
+		$(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
 		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
 bin/dbwrap_tool at EXEEXT@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
@@ -3095,12 +3095,12 @@ bin/dbwrap_torture at EXEEXT@: $(DBWRAP_TORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
 install-dbwrap_torture:: bin/dbwrap_torture at EXEEXT@
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $<
 
-bin/split_tokens at EXEEXT@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
+bin/split_tokens at EXEEXT@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
 	@echo "Linking $@"
 	@$(CC) -o $@ $(SPLIT_TOKENS_OBJ) \
 		$(LDFLAGS) $(DYNEXP) \
 		$(LIBS) $(POPT_LIBS) \
-		$(LDAP_LIBS) \
+		$(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
 install:: installservers installbin installman \
diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
index 1ec123e..53ac23b 100644
--- a/source3/param/test_lp_load.c
+++ b/source3/param/test_lp_load.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/utils/split_tokens.c b/source3/utils/split_tokens.c
index ac4f726..6c49b8b 100644
--- a/source3/utils/split_tokens.c
+++ b/source3/utils/split_tokens.c
@@ -24,6 +24,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/wscript_build b/source3/wscript_build
index a98b07a..df646bd 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -66,6 +66,9 @@ LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
+LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
+                           ../librpc/ndr/ndr_ntprinting.c'''
+
 LIBNDR_PREG_SRC = '''librpc/gen_ndr/ndr_preg.c
                      librpc/ndr/ndr_preg.c'''
 
@@ -156,9 +159,6 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ../librpc/gen_ndr/ndr_ntsvcs.c
                  ${LIBNDR_SPOOLSS_SRC}'''
 
-LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
-                           ../librpc/ndr/ndr_ntprinting.c'''
-
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
@@ -220,8 +220,9 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
           lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
           lib/wins_srv.c
           lib/util_str.c lib/clobber.c lib/util_sid.c
-          lib/util_unistr.c lib/util_file.c lib/util_names.c
-          lib/util.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c
+          lib/util_unistr.c lib/util_file.c
+          lib/util.c lib/util_names.c
+          lib/util_sock.c lib/sock_exec.c lib/util_sec.c
           lib/substitute.c lib/dbwrap_util.c
           lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
           lib/tallocmsg.c lib/dmallocmsg.c
@@ -280,12 +281,15 @@ LIBADS_SRC = '''libads/ldap.c
              libads/disp_sec.c libads/ldap_utils.c
              libads/ldap_schema.c libads/util.c libads/ndr.c'''
 
-LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
-
 LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
                     ../librpc/ndr/ndr_krb5pac.c
                     ../librpc/gen_ndr/ndr_krb5pac.c'''
 
+LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
+
+SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
+                 passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
+
 LIBNBT_SRC = '''../libcli/nbt/nbtname.c
              ../libcli/netlogon.c
              ../libcli/ndr_netlogon.c
@@ -316,7 +320,7 @@ LIBSMB_SRC0 = '''
                ../libcli/auth/ntlmssp_sign.c
                ${LIBNDR_NTLMSSP_SRC}
                ../libcli/auth/ntlmssp_ndr.c
-	       ../libcli/auth/ntlmssp_server.c'''
+               ../libcli/auth/ntlmssp_server.c'''
 
 LIBSAMBA_SRC = '${LIBSMB_SRC0}'
 
@@ -352,10 +356,10 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
 LIBMSRPC_SRC = '''
                ${SCHANNEL_SRC}
                rpc_client/cli_pipe.c
-               librpc/rpc/rpc_common.c
-               librpc/rpc/dcerpc_gssapi.c
                librpc/rpc/dcerpc_krb5.c
+               librpc/rpc/dcerpc_gssapi.c
                librpc/rpc/dcerpc_spnego.c
+               librpc/rpc/rpc_common.c
                rpc_client/rpc_transport_np.c
                rpc_client/rpc_transport_sock.c
                rpc_client/rpc_transport_tstream.c
@@ -430,7 +434,7 @@ RPC_NETLOGON_SRC = '''rpc_server/srv_netlog_nt.c
 
 RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
                rpc_server/srv_samr_util.c
-	       rpc_server/srv_samr_chgpasswd.c
+               rpc_server/srv_samr_chgpasswd.c
                ../librpc/gen_ndr/srv_samr.c'''
 
 RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
@@ -497,9 +501,6 @@ PDB_ADS_SRC =       'passdb/pdb_ads.c'
 PDB_SMBPASSWD_SRC = 'passdb/pdb_smbpasswd.c'
 PDB_WBC_SAM_SRC =   'passdb/pdb_wbc_sam.c'
 
-SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
-                 passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
-
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
                 passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
                 passdb/util_unixsids.c passdb/lookup_sid.c
@@ -518,9 +519,7 @@ GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
 
 PROFILE_SRC = '''profile/profile.c'''
 PROFILES_SRC = '''utils/profiles.c
-               ${LIBSMB_ERR_SRC}
-               ${PARAM_SRC}
-               ${LIB_SRC} ${LIB_DUMMY_SRC}'''
+               ${REGFIO_SRC}'''
 
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
@@ -578,6 +577,7 @@ VFS_ONEFS_SHADOW_COPY_SRC = 'modules/vfs_onefs_shadow_copy.c modules/onefs_shado
 VFS_DIRSORT_SRC = 'modules/vfs_dirsort.c'
 VFS_SCANNEDONLY_SRC = 'modules/vfs_scannedonly.c'
 VFS_CROSSRENAME_SRC = 'modules/vfs_crossrename.c'
+VFS_LINUX_XFS_SGID_SRC = 'modules/vfs_linux_xfs_sgid.c'
 
 PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
 
@@ -587,7 +587,7 @@ DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_uti
 
 AUTH_BUILTIN_SRC = 'auth/auth_builtin.c'
 AUTH_DOMAIN_SRC = 'auth/auth_domain.c'
-AUTH_SAM_SRC = 'auth/auth_sam.c'
+AUTH_SAM_SRC = 'auth/auth_sam.c auth/check_samsec.c'
 AUTH_SERVER_SRC = 'auth/auth_server.c'
 AUTH_UNIX_SRC = 'auth/auth_unix.c'
 AUTH_WINBIND_SRC = 'auth/auth_winbind.c'
@@ -597,13 +597,18 @@ AUTH_NETLOGOND_SRC = 'auth/auth_netlogond.c'
 
 AUTH_STATIC = ''
 AUTH_SRC = '''${AUTH_STATIC} auth/auth.c auth/auth_util.c auth/token_util.c
-           auth/auth_compat.c auth/auth_ntlmssp.c auth/user_info.c auth/check_samsec.c
-           auth/user_util.c auth/user_krb5.c auth/server_info.c auth/server_info_sam.c
+           auth/server_info.c
+           auth/server_info_sam.c
+           auth/user_info.c
+           auth/user_util.c
+           auth/user_krb5.c
+           auth/auth_compat.c auth/auth_ntlmssp.c
            ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
 
 #FIXME: set IDMAP_STATIC during configuration
 IDMAP_STATIC=''
-IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_STATIC}'
+IDMAP_RW_SRC = 'winbindd/idmap_rw.c'
+IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_RW_SRC} ${IDMAP_STATIC}'
 
 #FIXME: set NSS_INFO_STATIC during configuration
 NSS_INFO_STATIC = ''
@@ -718,7 +723,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    auth/server_info_sam.c
                    auth/user_info.c
                    auth/user_util.c
-		   rpc_server/srv_samr_chgpasswd.c
+                   rpc_server/srv_samr_chgpasswd.c
                    ../nsswitch/libwbclient/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
@@ -736,12 +741,6 @@ WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${LIBCLI_NETLOGON_SRC}
                   rpc_client/init_netlogon.c'''
 
-LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
-
-LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
-                    ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c
-                    lib/smbconf/smbconf_init.c'''
-
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
 SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c'''
@@ -763,6 +762,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                printing/printspoolss.c
                lib/sysquotas.c lib/sysquotas_linux.c
                lib/sysquotas_xfs.c lib/sysquotas_4A.c
+               lib/sysquotas_nfs.c
                smbd/fake_file.c
                smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
                ${AFS_SETTOKEN_SRC} smbd/aio.c smbd/statvfs.c
@@ -856,29 +856,40 @@ SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
            ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
            ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
            ${LIBCLI_SAMR_SRC}
-	   rpc_client/init_lsa.c'''
+           rpc_client/init_lsa.c'''
+
+STATUS_SRC = '''utils/status.c utils/status_profile.c
+             ${LOCKING_SRC}
+             ${PROFILE_SRC}
+             ${FNAME_UTIL_SRC}'''
 
-WBINFO_SRC = '../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'
+SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}'''
+
+SMBTREE_SRC = '''utils/smbtree.c
+             ${PROFILE_SRC}
+             ${LIBMSRPC_GEN_SRC}
+             ${LIBMSRPC_SRC}
+             ${LIBCLI_SRVSVC_SRC}'''
 
 TESTPARM_SRC = 'utils/testparm.c'
 
-EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
+SMBTA_UTIL_SRC = '''utils/smbta-util.c ${FNAME_UTIL_SRC}'''
 
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
-	        registry/reg_eventlog.c ${LIB_EVENTLOG_SRC}
-		../librpc/gen_ndr/ndr_eventlog.c
-		../librpc/gen_ndr/ndr_lsa.c'''
+TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
 
-DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
+PASSWD_UTIL_SRC = 'utils/passwd_util.c'
 
-CLIENT_SRC1 = '''client/client.c client/clitar.c
-                 client/dnsbrowse.c
-                 ${LIBMSRPC_SRC}'''
+SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSWD_UTIL_SRC} ${PASSCHANGE_SRC}
+                ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
+                ${LIBCLI_SAMR_SRC}
+                rpc_client/init_lsa.c'''
 
-CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
-                ${READLINE_SRC} ${DISPLAY_SEC_SRC}
-                ${LIBCLI_SRVSVC_SRC}
-		rpc_client/init_lsa.c'''
+PDBEDIT_SRC = '''utils/pdbedit.c ${PASSWD_UTIL_SRC}
+                ${LIBCLI_LDAP_NDR_SRC}'''
+
+SMBGET_SRC = '''utils/smbget.c'''
+
+DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
 
 RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
                     rpcclient/cmd_samr.c rpcclient/cmd_spoolss.c
@@ -914,6 +925,55 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
                    rpc_client/init_netlogon.c
                    rpc_client/init_samr.c'''
 
+PAM_WINBIND_SRC = '''../nsswitch/pam_winbind.c ${WBCOMMON_SRC}
+                  ${LIBREPLACE_SRC} ${INIPARSER_SRC}'''
+
+LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
+                        libsmb/libsmb_thread_posix.c'''
+
+LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
+                    libsmb/libsmb_compat.c
+                    libsmb/libsmb_context.c
+                    libsmb/libsmb_dir.c
+                    libsmb/libsmb_file.c
+                    libsmb/libsmb_misc.c
+                    libsmb/libsmb_path.c
+                    libsmb/libsmb_printjob.c
+                    libsmb/libsmb_server.c
+                    libsmb/libsmb_stat.c
+                    libsmb/libsmb_xattr.c
+                    libsmb/libsmb_setget.c'''
+
+LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
+                    ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+                    ${LIBCLI_SRVSVC_SRC}
+                    ${LIBCLI_LSA_SRC}'''
+
+LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
+
+
+# FIXME:  bigballofmud
+
+CLIENT_SRC1 = '''client/client.c client/clitar.c
+                 client/dnsbrowse.c
+                 ${LIBMSRPC_SRC}'''
+
+CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
+                ${READLINE_SRC} ${DISPLAY_SEC_SRC}
+                ${LIBCLI_SRVSVC_SRC}
+                rpc_client/init_lsa.c'''
+
+LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
+                    ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c
+                    lib/smbconf/smbconf_init.c'''
+
+SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
+
+SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
+
+LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
+
+
 LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
                        libnet/libnet_dssync_keytab.c
                        ../libcli/drsuapi/repl_decrypt.c'''
@@ -925,8 +985,6 @@ LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
                         libnet/libnet_samsync_keytab.c
                         ../libcli/samsync/decrypt.c'''
 
-PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-
 NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
               utils/net_rpc_join.c utils/net_time.c utils/net_lookup.c
@@ -963,7 +1021,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               registry/reg_parse_internal.c registry/reg_import.c
               lib/cbuf.c lib/srprs.c'''
 
-
 NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
 
 NET_SRC = '''${NET_SRC1}
@@ -977,6 +1034,112 @@ NET_SRC = '''${NET_SRC1}
              ${LIBNET_SRC} ${LIBNET_DSSYNC_SRC} ${LIBNET_SAMSYNC_SRC}
              ${LIB_EVENTLOG_SRC} ${REGFIO_SRC}'''
 
+CUPS_SRC = '''client/smbspool.c ${LIBNDR_GEN_SRC0}'''
+
+NMBLOOKUP_SRC = '''utils/nmblookup.c ${LIBNMB_SRC}'''
+
+SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
+                torture/denytest.c torture/mangle_test.c
+                torture/nbench.c
+                torture/test_posix_append.c'''
+
+SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
+        ../nsswitch/libwbclient/wbc_async.c
+        ../nsswitch/libwbclient/wb_reqtrans.c
+        ${LIBNDR_GEN_SRC0}'''
+
+MASKTEST_SRC = '''torture/masktest.c
+                 ${LIBNDR_GEN_SRC0}'''
+
+MSGTEST_SRC = '''torture/msgtest.c
+                 ${LIBNDR_GEN_SRC0}'''
+
+LOCKTEST_SRC = '''torture/locktest.c ${LOCKING_SRC}
+               ${LIBNDR_GEN_SRC0} ${FNAME_UTIL_SRC}'''
+
+NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
+
+PDBTEST_SRC = '''torture/pdbtest.c
+                ${LIBNDR_GEN_SRC0}'''
+
+VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c ${SMBD_SRC_BASE} ${READLINE_SRC}'''
+
+SMBICONV_SRC = '''torture/smbiconv.c'''
+
+LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
+
+LOCKTEST2_SRC = '''torture/locktest2.c ${LOCKING_SRC}
+                ${LIBNDR_GEN_SRC0} ${FNAME_UTIL_SRC}'''
+
+SMBCACLS_SRC = '''utils/smbcacls.c
+                ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+                ${LIBCLI_LSA_SRC}'''
+
+SMBCQUOTAS_SRC = '''utils/smbcquotas.c
+                ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+                ${LIBCLI_LSA_SRC}'''
+
+EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
+
+EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
+                registry/reg_eventlog.c ${LIB_EVENTLOG_SRC}
+                ../librpc/gen_ndr/ndr_eventlog.c
+                ../librpc/gen_ndr/ndr_lsa.c'''
+
+SHARESEC_SRC0 = 'utils/sharesec.c'
+SHARESEC_SRC  = '''${SHARESEC_SRC0}'''
+
+DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
+
+SMBFILTER_SRC = '''utils/smbfilter.c
+                 ${LIBNDR_GEN_SRC0}'''
+
+WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
+        ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
+
+PAM_SMBPASS_SRC_0 = '''pam_smbpass/pam_smb_auth.c pam_smbpass/pam_smb_passwd.c
+                pam_smbpass/pam_smb_acct.c pam_smbpass/support.c ../lib/util/asn1.c'''
+PAM_SMBPASS_SRC = '''${PAM_SMBPASS_SRC_0} ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${PASSDB_SRC} ${GROUPDB_SRC} \
+                ${SMBLDAP_SRC} ${LIBSAMBA_SRC} \
+                ${LIBTSOCKET_SRC}'''
+
+WBINFO_SRC = '''../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'''
+
+WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
+
+WINBIND_KRB5_LOCATOR_SRC1 = '../nsswitch/winbind_krb5_locator.c'
+WINBIND_KRB5_LOCATOR_SRC = '''${WINBIND_KRB5_LOCATOR_SRC1} ${LIBREPLACE_SRC}'''
+
+POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c \
+          ../lib/popt/popthelp.c ../lib/popt/poptparse.c'''
+
+INIPARSER_SRC = '''../lib/iniparser_build/iniparser.c ../lib/iniparser_build/dictionary.c
+                ../lib/iniparser_build/strlib.c'''
+
+NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
+
+NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
+                ../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
+                libsmb/samlogon_cache.c
+                ${LIBADS_SERVER_SRC}
+                ${LIBNMB_SRC}
+                ${LIBCLI_LDAP_NDR_SRC}
+                ${LIBNDR_GEN_SRC0} ${LIBNDR_NETLOGON_SRC}'''
+
+
+VLP_SRC = '''printing/tests/vlp.c
+          ../lib/util/util_tdb.c
+          ${LIBSAMBAUTIL_SRC}
+          param/util.c'''
+
+RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}'
+
+DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
+
+DBWRAP_TORTURE_SRC = 'utils/dbwrap_torture.c'
+
+SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
+
 LIBS='ICONV'
 
 bld.SAMBA_GENERATOR('build_options',
@@ -1039,23 +1202,28 @@ bld.SAMBA_LIBRARY('libwbclient',
 
 bld.SAMBA_LIBRARY('libnetapi',
                     source='''lib/netapi/netapi.c
-			      lib/netapi/cm.c
-			      librpc/gen_ndr/ndr_libnetapi.c
-			      lib/netapi/libnetapi.c
-			      lib/netapi/joindomain.c
-			      lib/netapi/serverinfo.c
-			      lib/netapi/getdc.c
-			      lib/netapi/user.c
-			      lib/netapi/group.c
-			      lib/netapi/localgroup.c
-			      lib/netapi/samr.c
-			      lib/netapi/sid.c
-			      lib/netapi/share.c
-			      lib/netapi/file.c


-- 
Samba Shared Repository


More information about the samba-cvs mailing list