[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Mon Sep 20 23:53:22 MDT 2010
The branch, v3-6-test has been updated
via ee51d03 s3-build: only link in prs parser where needed.
via 8f335f8 s3-waf: only link in prs parser where needed.
via aca3c38 s3-build: use proper RPC_X_OBJ target names.
via 8043e0d s3-waf: use proper RPC_X_SRC names.
via 5ed191d s3-build: only link LIBNDR_XATTR_OBJ where needed.
via 2cab2ec s3-waf: only link LIBNDR_XATTR_SRC where needed.
via d390d46 s3-build: link ndr_notify only where needed.
via 95c5218 s3-waf: link ndr_notify only where needed.
via 6991976 s3-build: link ndr_named_pipe_auth only where needed.
via c19cb1e s3-waf: link ndr_named_pipe_auth only where needed.
from 78b93e4 s3-build: further rationalise LIBMSRPC_OBJ and remove RPC_CLIENT_OBJ.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit ee51d035c183587669eb34080261258d30981467
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 14 23:58:10 2010 +0200
s3-build: only link in prs parser where needed.
Guenther
(cherry picked from commit 2d23ddb68d20a7e10297841ff7a550c03a8c6b74)
commit 8f335f8246ed197b2c168bb76a476aa23e42a150
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 15 08:22:37 2010 +0200
s3-waf: only link in prs parser where needed.
Guenther
(cherry picked from commit f7051250eab1bb3336b3159e3b9a077a0e046263)
commit aca3c381fe655779dab19a45a41f29953114dfd4
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:51:32 2010 +0200
s3-build: use proper RPC_X_OBJ target names.
Guenther
(cherry picked from commit 33fdf8dac2dfd843ea10e3703d65b903b253270e)
commit 8043e0de202c662d3e67b9fb35332ca6a301f546
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:49:49 2010 +0200
s3-waf: use proper RPC_X_SRC names.
This allows to build using waf without --enable-developer and should also fix
support for rpc server modules.
Guenther
(cherry picked from commit 4577fb3163f3921dfea45ee96c041e549cc84255)
commit 5ed191d6e050fd3697c665f95ab2d83f778fd582
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:28:54 2010 +0200
s3-build: only link LIBNDR_XATTR_OBJ where needed.
Guenther
(cherry picked from commit 7b1efc7282ea0a2e2f7ba84c5c2bb3cd0c6f52c5)
commit 2cab2ec9deb25ac59a7b2fc0f2060a7856540271
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:28:38 2010 +0200
s3-waf: only link LIBNDR_XATTR_SRC where needed.
Guenther
(cherry picked from commit 32a1b21f1c65589a142919f85cf78ece169d3d92)
commit d390d462921df1f76fabe600ed597fad66dea8fd
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:27:52 2010 +0200
s3-build: link ndr_notify only where needed.
Guenther
(cherry picked from commit a1392ee9a04765d849e1d297fb5f156ad169afd0)
commit 95c5218d8842aa63cd58c766da21a03265ae9878
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:26:35 2010 +0200
s3-waf: link ndr_notify only where needed.
Guenther
(cherry picked from commit b15ac83bda4adbdfc7b7e04ad126cffd8d44efba)
commit 69919767abb36dd1710ea0268f11ee29b8a795f8
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:24:28 2010 +0200
s3-build: link ndr_named_pipe_auth only where needed.
Guenther
(cherry picked from commit ed239fc784299e6cfc4417101fdefbc413d6531c)
commit c19cb1eb2bccfbc350aae030ce4a8d545d2d5ec8
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 10 11:23:59 2010 +0200
s3-waf: link ndr_named_pipe_auth only where needed.
Guenther
(cherry picked from commit f8b10a738c5da88a72fa969e217f6c72016d44b0)
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 69 +++++++++++++++++++++++++-----------------------
source3/configure.in | 14 +++++-----
source3/wscript_build | 51 ++++++++++++++++--------------------
3 files changed, 66 insertions(+), 68 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a7314e6..0908166 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -400,10 +400,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
librpc/gen_ndr/ndr_eventlog.o \
$(LIBNDR_NETLOGON_OBJ) \
librpc/gen_ndr/ndr_dssetup.o \
- librpc/gen_ndr/ndr_notify.o \
- $(LIBNDR_XATTR_OBJ) \
librpc/gen_ndr/ndr_epmapper.o \
- librpc/gen_ndr/ndr_named_pipe_auth.o \
librpc/gen_ndr/ndr_ntsvcs.o \
$(LIBNDR_SPOOLSS_OBJ)
@@ -543,7 +540,6 @@ LIBSMB_ERR_OBJ0 = $(NTERR_OBJ) $(DOSERR_OBJ) $(ERRORMAP_OBJ) $(DCE_RPC_ERR_OBJ)
LIBSMB_ERR_OBJ1 = ../libcli/auth/smbdes.o ../libcli/auth/smbencrypt.o ../libcli/auth/msrpc_parse.o ../libcli/auth/session.o
LIBSMB_ERR_OBJ = $(LIBSMB_ERR_OBJ0) $(LIBSMB_ERR_OBJ1) \
- $(REG_PARSE_PRS_OBJ) \
$(SECRETS_OBJ)
LIBSMB_OBJ0 = \
@@ -617,7 +613,8 @@ REG_INIT_BASIC_OBJ = registry/reg_init_basic.o
REG_INIT_SMBCONF_OBJ = registry/reg_init_smbconf.o
REG_INIT_FULL_OBJ = registry/reg_init_full.o
-REGFIO_OBJ = registry/regfio.o
+REGFIO_OBJ = registry/regfio.o \
+ $(REG_PARSE_PRS_OBJ)
REGOBJS_OBJ = registry/reg_objects.o
@@ -659,10 +656,11 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
-RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
+RPC_LSARPC_OBJ = rpc_server/srv_lsa_nt.o \
+ librpc/gen_ndr/srv_lsa.o
-RPC_NETLOG_OBJ = rpc_server/srv_netlog_nt.o \
- librpc/gen_ndr/srv_netlogon.o
+RPC_NETLOGON_OBJ = rpc_server/srv_netlog_nt.o \
+ librpc/gen_ndr/srv_netlogon.o
RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
rpc_server/srv_samr_util.o \
@@ -671,15 +669,16 @@ RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
-RPC_REG_OBJ = rpc_server/srv_winreg_nt.o \
- librpc/gen_ndr/srv_winreg.o
+RPC_WINREG_OBJ = rpc_server/srv_winreg_nt.o \
+ librpc/gen_ndr/srv_winreg.o
RPC_DSSETUP_OBJ = rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
-RPC_SVC_OBJ = rpc_server/srv_srvsvc_nt.o \
- librpc/gen_ndr/srv_srvsvc.o
+RPC_SRVSVC_OBJ = rpc_server/srv_srvsvc_nt.o \
+ librpc/gen_ndr/srv_srvsvc.o
-RPC_WKS_OBJ = librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
+RPC_WKSSVC_OBJ = librpc/gen_ndr/srv_wkssvc.o \
+ rpc_server/srv_wkssvc_nt.o
RPC_SVCCTL_OBJ = rpc_server/srv_svcctl_nt.o \
librpc/gen_ndr/srv_svcctl.o \
@@ -690,7 +689,8 @@ RPC_SVCCTL_OBJ = rpc_server/srv_svcctl_nt.o \
RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs_nt.o \
librpc/gen_ndr/srv_ntsvcs.o
-RPC_DFS_OBJ = librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
+RPC_NETDFS_OBJ = librpc/gen_ndr/srv_dfs.o \
+ rpc_server/srv_dfs_nt.o
RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss_nt.o \
rpc_server/srv_spoolss_util.o \
@@ -699,7 +699,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss_nt.o \
RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \
$(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o
-NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o
+NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
+ librpc/gen_ndr/ndr_named_pipe_auth.o
RPC_NCACN_NP_INTERNAL = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np_internal.o \
rpc_server/rpc_handles.o
@@ -707,7 +708,7 @@ RPC_NCACN_NP_INTERNAL = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np_i
RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
$(RPC_NCACN_NP_INTERNAL)
-RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
+RPC_RPCECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
$(LIBCLI_SPOOLSS_OBJ) \
@@ -754,7 +755,8 @@ PROFILES_OBJ = utils/profiles.o \
OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o \
smbd/oplock_onefs.o
-NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o
+NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
+ librpc/gen_ndr/ndr_notify.o
FNAME_UTIL_OBJ = smbd/filename_util.o
@@ -894,7 +896,8 @@ SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
$(REG_FULL_OBJ) $(POPT_LIB_OBJ) $(BUILDOPT_OBJ) \
$(SMBLDAP_OBJ) $(LIBNET_OBJ) \
$(LIBSMBCONF_OBJ) \
- $(PRIVILEGES_BASIC_OBJ)
+ $(PRIVILEGES_BASIC_OBJ) \
+ $(LIBNDR_XATTR_OBJ)
PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
printing/print_cups.o printing/print_generic.o \
@@ -1375,7 +1378,7 @@ WINBINDD_OBJ = \
$(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
- $(RPC_NCACN_NP_INTERNAL) $(RPC_SAMR_OBJ) $(RPC_LSA_OBJ) \
+ $(RPC_NCACN_NP_INTERNAL) $(RPC_SAMR_OBJ) $(RPC_LSARPC_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
$(LIBADS_SERVER_OBJ) \
$(TDB_VALIDATE_OBJ) \
@@ -2575,17 +2578,17 @@ SHLD_LIBRARY = $(SHLD) $(LDSHFLAGS) $(MODULE_EXPORTS) \
SHLD_MODULE = $(SHLD) $(LDSHFLAGS_MODULES) $(MODULE_EXPORTS) \
-o $@ @SONAMEFLAG@`basename $@`
-bin/librpc_lsarpc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_LSA_OBJ)
+bin/librpc_lsarpc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_LSARPC_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_LSA_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_LSARPC_OBJ)
bin/librpc_samr. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SAMR_OBJ)
@echo "Linking $@"
@$(SHLD_LIBRARY) $(RPC_SAMR_OBJ)
-bin/librpc_srvsvc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SVC_OBJ)
+bin/librpc_srvsvc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SRVSVC_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_SVC_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_SRVSVC_OBJ)
bin/librpc_svcctl. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SVCCTL_OBJ)
@echo "Linking $@"
@@ -2595,17 +2598,17 @@ bin/librpc_ntsvcs. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NTSVCS_OBJ)
@echo "Linking $@"
@$(SHLD_LIBRARY) $(RPC_NTSVCS_OBJ)
-bin/librpc_wkssvc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_WKS_OBJ)
+bin/librpc_wkssvc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_WKSSVC_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_WKS_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_WKSSVC_OBJ)
-bin/librpc_NETLOGON. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NETLOG_OBJ)
+bin/librpc_NETLOGON. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NETLOGON_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_NETLOG_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_NETLOGON_OBJ)
-bin/librpc_winreg. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_REG_OBJ)
+bin/librpc_winreg. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_WINREG_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_REG_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_WINREG_OBJ)
bin/librpc_initshutdown. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_INITSHUTDOWN_OBJ)
@echo "Linking $@"
@@ -2623,13 +2626,13 @@ bin/librpc_eventlog. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_EVENTLOG_OBJ)
@echo "Linking $@"
@$(SHLD_LIBRARY) $(RPC_EVENTLOG_OBJ)
-bin/librpc_netdfs. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_DFS_OBJ)
+bin/librpc_netdfs. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_NETDFS_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_DFS_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_NETDFS_OBJ)
-bin/librpc_echo. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_ECHO_OBJ)
+bin/librpc_rpcecho. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_RPCECHO_OBJ)
@echo "Linking $@"
- @$(SHLD_LIBRARY) $(RPC_ECHO_OBJ)
+ @$(SHLD_LIBRARY) $(RPC_RPCECHO_OBJ)
bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo "Linking $@"
diff --git a/source3/configure.in b/source3/configure.in
index 80cf05b..faf0858 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6659,20 +6659,20 @@ SMB_MODULE(pdb_wbc_sam, passdb/pdb_wbc_sam.o, "bin/wbc_sam.$SHLIBEXT", PDB)
SMB_SUBSYSTEM(PDB,passdb/pdb_interface.o)
-SMB_MODULE(rpc_lsarpc, \$(RPC_LSA_OBJ), "bin/librpc_lsarpc.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_winreg, \$(RPC_REG_OBJ), "bin/librpc_winreg.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_lsarpc, \$(RPC_LSARPC_OBJ), "bin/librpc_lsarpc.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_winreg, \$(RPC_WINREG_OBJ), "bin/librpc_winreg.$SHLIBEXT", RPC)
SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), "bin/librpc_initshutdown.$SHLIBEXT", RPC)
SMB_MODULE(rpc_dssetup, \$(RPC_DSSETUP_OBJ), "bin/librpc_dssetup.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_wkssvc, \$(RPC_WKSSVC_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC)
SMB_MODULE(rpc_svcctl, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl.$SHLIBEXT", RPC)
SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_netlogon, \$(RPC_NETLOG_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_srvsvc, \$(RPC_SVC_OBJ), "bin/librpc_svcsvc.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_netlogon, \$(RPC_NETLOGON_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_netdfs, \$(RPC_NETDFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_srvsvc, \$(RPC_SRVSVC_OBJ), "bin/librpc_svcsvc.$SHLIBEXT", RPC)
SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC)
SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog.$SHLIBEXT", RPC)
SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), "bin/librpc_rpcecho.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_rpcecho, \$(RPC_RPCECHO_OBJ), "bin/librpc_rpcecho.$SHLIBEXT", RPC)
SMB_SUBSYSTEM(RPC,smbd/process.o)
SMB_MODULE(idmap_ldap, winbindd/idmap_ldap.o, "bin/ldap.$SHLIBEXT", IDMAP)
diff --git a/source3/wscript_build b/source3/wscript_build
index 51d9a1f..78e7140 100644
--- 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}'''
@@ -306,7 +303,7 @@ LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SR
LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
-LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${REG_PARSE_PRS_SRC}'
+LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}'
LIBSMB_SRC0 = '''
../libcli/auth/ntlm_check.c
@@ -374,7 +371,7 @@ REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
-REGFIO_SRC = '''registry/regfio.c'''
+REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
REGSRCS_SRC = '''registry/reg_objects.c'''
@@ -418,10 +415,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
@@ -430,15 +428,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
@@ -449,7 +448,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
@@ -458,7 +458,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'''
@@ -466,10 +467,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'''
+RPC_RPCECHO_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_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}'''
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
@@ -516,7 +516,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'''
@@ -718,7 +719,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}
@@ -791,13 +792,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}
@@ -808,7 +802,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
More information about the samba-cvs
mailing list