git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3-waf: use proper RPC_X_SRC names.
[samba.git] / source3 / wscript_build
diff --git a/source3/wscript_build b/source3/wscript_build
index 157b70ce17fb2f20209f51d84e8ff34b628fca7f..44deb38a2b8dd9a4b05832f65ed777388f1e8398 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -149,10 +149,7 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ../librpc/gen_ndr/ndr_eventlog.c
                  ${LIBNDR_NETLOGON_SRC}
                  ../librpc/gen_ndr/ndr_dssetup.c
-                 librpc/gen_ndr/ndr_notify.c
-                 ${LIBNDR_XATTR_SRC}
                  ../librpc/gen_ndr/ndr_epmapper.c
-                 ../librpc/gen_ndr/ndr_named_pipe_auth.c
                  ../librpc/gen_ndr/ndr_ntsvcs.c
                  ${LIBNDR_SPOOLSS_SRC}'''
 
@@ -349,18 +346,22 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              ${CLDAP_SRC}
              ${DRSUAPI_SRC}'''
 
-RPC_CLIENT_SRC1 = '''${SCHANNEL_SRC}'''
-
 LIBMSRPC_SRC = '''
-               ${RPC_CLIENT_SRC1}
-               ${RPC_CLIENT_SRC}
-                   ../librpc/rpc/binding.c'''
+               ${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_spnego.c
+               rpc_client/rpc_transport_np.c
+               rpc_client/rpc_transport_sock.c
+               ../librpc/rpc/binding.c
+               ../librpc/rpc/dcerpc_util.c
+               librpc/rpc/dcerpc_helpers.c
+               ../librpc/rpc/binding_handle.c'''
 
 LIBMSRPC_GEN_SRC = '''
                    ${LIBCLI_EPMAPPER_SRC}
-                   ../librpc/rpc/dcerpc_util.c
-                   librpc/rpc/dcerpc_helpers.c
-                   ../librpc/rpc/binding_handle.c
                    ${LIBNDR_GEN_SRC}'''
 
 #
@@ -416,10 +417,11 @@ LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
 
 RPC_STATIC = ''
 
-RPC_LSA_SRC = '''rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
+RPC_LSARPC_SRC = '''rpc_server/srv_lsa_nt.c
+                    ../librpc/gen_ndr/srv_lsa.c'''
 
-RPC_NETLOG_SRC = '''rpc_server/srv_netlog_nt.c
-                 ../librpc/gen_ndr/srv_netlogon.c'''
+RPC_NETLOGON_SRC = '''rpc_server/srv_netlog_nt.c
+                      ../librpc/gen_ndr/srv_netlogon.c'''
 
 RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
                rpc_server/srv_samr_util.c
@@ -428,15 +430,16 @@ RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
 
 RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
 
-RPC_REG_SRC = ''' rpc_server/srv_winreg_nt.c
-               ../librpc/gen_ndr/srv_winreg.c'''
+RPC_WINREG_SRC = '''rpc_server/srv_winreg_nt.c
+                    ../librpc/gen_ndr/srv_winreg.c'''
 
 RPC_DSSETUP_SRC = ''' rpc_server/srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
 
-RPC_SVC_SRC = '''rpc_server/srv_srvsvc_nt.c
-              ../librpc/gen_ndr/srv_srvsvc.c'''
+RPC_SRVSVC_SRC = '''rpc_server/srv_srvsvc_nt.c
+                    ../librpc/gen_ndr/srv_srvsvc.c'''
 
-RPC_WKS_SRC = ''' ../librpc/gen_ndr/srv_wkssvc.c rpc_server/srv_wkssvc_nt.c'''
+RPC_WKSSVC_SRC = '''../librpc/gen_ndr/srv_wkssvc.c
+                    rpc_server/srv_wkssvc_nt.c'''
 
 RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
                   ../librpc/gen_ndr/srv_svcctl.c
@@ -447,7 +450,8 @@ RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
 RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
                  ../librpc/gen_ndr/srv_ntsvcs.c'''
 
-RPC_DFS_SRC = ''' ../librpc/gen_ndr/srv_dfs.c rpc_server/srv_dfs_nt.c'''
+RPC_NETDFS_SRC = '''../librpc/gen_ndr/srv_dfs.c
+                    rpc_server/srv_dfs_nt.c'''
 
 RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
                      rpc_server/srv_spoolss_util.c
@@ -456,7 +460,8 @@ RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
 RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
                    ${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c'''
 
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
+                     ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
 
 RPC_NCACN_NP_INTERNAL = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np_internal.c
                         rpc_server/rpc_handles.c'''
@@ -464,17 +469,9 @@ RPC_NCACN_NP_INTERNAL = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_n
 RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
                ${RPC_NCACN_NP_INTERNAL}'''
 
-RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
-
-#TODO: RPC_SERVER_SRC used to include RPC_STATIC modules
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
+RPC_RPCECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
 
-RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c
-                    librpc/rpc/rpc_common.c
-                    librpc/rpc/dcerpc_gssapi.c
-                    librpc/rpc/dcerpc_spnego.c
-                    rpc_client/rpc_transport_np.c
-                    rpc_client/rpc_transport_sock.c'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}'''
 
 RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
 
@@ -488,7 +485,7 @@ PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
 PDB_STATIC =        ''
 PDB_TDBSAM_SRC =    'passdb/pdb_tdb.c'
-PDB_LDAP_SRC =      'passdb/pdb_ldap.c'
+PDB_LDAP_SRC =      'passdb/pdb_ldap.c passdb/pdb_nds.c'
 PDB_ADS_SRC =       'passdb/pdb_ads.c'
 PDB_SMBPASSWD_SRC = 'passdb/pdb_smbpasswd.c'
 PDB_WBC_SAM_SRC =   'passdb/pdb_wbc_sam.c'
@@ -521,7 +518,8 @@ PROFILES_SRC = '''utils/profiles.c
 OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
              smbd/oplock_onefs.c'''
 
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
+                librpc/gen_ndr/ndr_notify.c'''
 
 FNAME_UTIL_SRC = '''smbd/filename_util.c'''
 
@@ -593,7 +591,7 @@ 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/server_info.c auth/server_info_sam.c
+           auth/user_util.c auth/user_krb5.c auth/server_info.c auth/server_info_sam.c
            ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
 
 #FIXME: set IDMAP_STATIC during configuration
@@ -723,7 +721,7 @@ WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
                   ${AFS_SRC} ${AFS_SETTOKEN_SRC}
                   ${LIBADS_SERVER_SRC}
-                  ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSA_SRC}
+                  ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
                   ${TDB_VALIDATE_SRC}
                   ${LIBCLI_DSSETUP_SRC}
                   ${LIBCLI_LSA_SRC}
@@ -796,13 +794,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${LIBADS_SERVER_SRC} ${LIBADS_PRINTER_SRC} ${REG_FULL_SRC}
                 ${BUILDOPT_SRC}
                 ${LIBNET_SRC} ${LIBSMBCONF_SRC}
-                ${RPC_LSA_SRC}
-                ${RPC_NETLOG_SRC} ${RPC_SAMR_SRC}
-                ${RPC_INITSHUTDOWN_SRC} ${RPC_REG_SRC}
-                ${RPC_DSSETUP_SRC} ${RPC_SVC_SRC} ${RPC_WKS_SRC}
-                ${RPC_SVCCTL_SRC} ${RPC_NTSVCS_SRC} ${RPC_DFS_SRC}
-                ${RPC_SPOOLSS_SRC} ${RPC_EVENTLOG_SRC}
-                ${RPC_ECHO_SRC}
                 ${LIBCLI_SPOOLSS_SRC}
                 ${LIBCLI_WINREG_SRC}
                 ${LIBCLI_SRVSVC_SRC}
@@ -813,7 +804,8 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 rpc_client/init_netlogon.c
                 rpc_client/init_samr.c
                 ${AUTH_SRC}
-                ${PRIVILEGES_BASIC_SRC}'''
+                ${PRIVILEGES_BASIC_SRC}
+                ${LIBNDR_XATTR_SRC}'''
 
 PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_cups.c printing/print_generic.c
Samba Shared Repository