[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Sep 10 05:19:14 MDT 2010
The branch, master has been updated
via 33fdf8d s3-build: use proper RPC_X_OBJ target names.
via 4577fb3 s3-waf: use proper RPC_X_SRC names.
from 788bfc8 s4/fsmo: Change return type from NTSTATUS to WERROR for drepl_takeFSMOrole
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 33fdf8dac2dfd843ea10e3703d65b903b253270e
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
commit 4577fb3163f3921dfea45ee96c041e549cc84255
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
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 53 +++++++++++++++++++++++++-----------------------
source3/configure.in | 14 ++++++------
source3/wscript_build | 35 +++++++++++++------------------
3 files changed, 50 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 939a32b..63345ed 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -659,10 +659,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 +672,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 +692,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 \
@@ -708,7 +711,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) \
@@ -1379,7 +1382,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) \
@@ -2578,17 +2581,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 $@"
@@ -2598,17 +2601,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 $@"
@@ -2626,13 +2629,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 1f4da24..83db9e1 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 4e03b74..44deb38 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -417,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
@@ -429,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
@@ -448,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
@@ -466,10 +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'''
+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'''
@@ -719,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}
@@ -792,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}
--
Samba Shared Repository
More information about the samba-cvs
mailing list