s4:s3compat Compile much less of Samba3

We don't need the passdb, idmap or most of the RPC server modules.

We keep the SAMR server for now, as there are direct C calls into it.

Andrew Bartlett

diff --git a/source4/s3compat/compat/config.h b/source4/s3compat/compat/config.h
index 5adb87008af5f1d616aa1e6a4ee8c8d2699bbcb5..298b5de63ecc5440d963d54c565154d6572213ad 100644 (file)
--- a/source4/s3compat/compat/config.h
+++ b/source4/s3compat/compat/config.h
@@ -220,14 +220,14 @@ extern const char *dyn_CONFIGFILE;
 #define DEFAULT_UNIX_CHARSET "UTF-8"
 
 /* s3 modules */
-#define STRING_STATIC_MODULES "pdb_ldap pdb_ads pdb_smbpasswd     pdb_tdbsam pdb_wbc_sam rpc_winreg rpc_initshutdown      rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netdfs rpc_srvsvc     rpc_spoolss rpc_eventlog rpc_samr rpc_rpcecho idmap_ldap idmap_tdb     idmap_passdb idmap_nss nss_info_template auth_builtin vfs_default"
+#define STRING_STATIC_MODULES "rpc_winreg rpc_initshutdown      rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netdfs rpc_srvsvc     rpc_spoolss rpc_eventlog rpc_samr rpc_rpcecho idmap_ldap idmap_tdb     idmap_passdb idmap_nss nss_info_template auth_builtin vfs_default"
 #define static_init_vfs {  vfs_default_init();}
-#define static_init_pdb { pdb_smbpasswd_init();  pdb_tdbsam_init();  pdb_wbc_sam_init();}
+#define static_init_pdb { }
 #define static_init_rpc {  rpc_winreg_init();     rpc_initshutdown_init();  rpc_wkssvc_init();     rpc_svcctl_init();  rpc_ntsvcs_init();  rpc_netdfs_init();  rpc_srvsvc_init();  rpc_spoolss_init();     rpc_eventlog_init();  rpc_rpcecho_init();}
 #define static_init_auth {  auth_builtin_init();  }
 #define static_init_nss_info {}
 #define static_init_charset {}
-#define static_init_idmap {idmap_tdb_init();  idmap_passdb_init();  idmap_nss_init();}
+#define static_init_idmap {idmap_passdb_init();}
 #define auth_script_init init_samba_module
 #define charset_CP437_init init_samba_module
 #define charset_CP850_init init_samba_module
@@ -235,11 +235,11 @@ extern const char *dyn_CONFIGFILE;
 #define static_decl_auth extern NTSTATUS auth_sam_init(void); extern     NTSTATUS auth_unix_init(void); extern NTSTATUS auth_winbind_init(void);     extern NTSTATUS auth_wbc_init(void); extern NTSTATUS auth_server_init(void);     extern NTSTATUS auth_domain_init(void); extern NTSTATUS     auth_builtin_init(void); extern NTSTATUS auth_netlogond_init(void);
 #define static_decl_charset
 #define static_decl_gpext
-#define static_decl_pdb extern     NTSTATUS pdb_ads_init(void); extern NTSTATUS pdb_smbpasswd_init(void);     extern NTSTATUS pdb_tdbsam_init(void); extern NTSTATUS     pdb_wbc_sam_init(void);
+#define static_decl_pdb 
 #define static_decl_perfcount
-#define static_decl_rpc extern NTSTATUS rpc_lsarpc_init(void);     extern NTSTATUS rpc_winreg_init(void); extern NTSTATUS     rpc_initshutdown_init(void); extern NTSTATUS rpc_dssetup_init(void); extern     NTSTATUS rpc_wkssvc_init(void); extern NTSTATUS rpc_svcctl_init(void); extern     NTSTATUS rpc_ntsvcs_init(void); extern NTSTATUS rpc_netlogon_init(void);     extern NTSTATUS rpc_netdfs_init(void); extern NTSTATUS rpc_srvsvc_init(void);     extern NTSTATUS rpc_spoolss_init(void); extern NTSTATUS     rpc_eventlog_init(void); extern NTSTATUS rpc_samr_init(void); extern NTSTATUS     rpc_rpcecho_init(void);
+#define static_decl_rpc extern NTSTATUS rpc_lsarpc_init(void);     extern NTSTATUS rpc_winreg_init(void); extern NTSTATUS     rpc_initshutdown_init(void);extern     NTSTATUS rpc_wkssvc_init(void); extern NTSTATUS rpc_svcctl_init(void); extern     NTSTATUS rpc_ntsvcs_init(void); extern NTSTATUS rpc_netdfs_init(void); extern NTSTATUS rpc_srvsvc_init(void);     extern NTSTATUS rpc_spoolss_init(void); extern NTSTATUS     rpc_eventlog_init(void); extern NTSTATUS     rpc_rpcecho_init(void);
 #define static_decl_vfs extern NTSTATUS vfs_default_init(void);
-#define static_decl_idmap extern NTSTATUS idmap_ldap_init(void); extern NTSTATUS idmap_tdb_init(void); extern NTSTATUS idmap_passdb_init(void); extern NTSTATUS idmap_nss_init(void);
+#define static_decl_idmap extern NTSTATUS idmap_passdb_init(void); 
 #define static_init_gpext {}
 #define static_init_perfcount {}
 #define STAT_ST_BLOCKSIZE 512

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 207ac322bb6ba75df3a45af5fd023bb670c2e285..312f98c616590e5779a47a0445fb003c96c771fd 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -323,11 +323,6 @@ REG_FULL_SRC = '''${REG_SMBCONF_SRC}
 
 LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
 
-RPC_LSA_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_SAMR_SRC = '''rpc_server/srv_samr_nt.c
                rpc_server/srv_samr_util.c
                rpc_server/srv_samr_chgpasswd.c
@@ -338,8 +333,6 @@ RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_i
 RPC_REG_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'''
 
@@ -386,8 +379,7 @@ PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 #FIXME: Hack around the missing AC_MODULE
 PDB_STATIC = 'passdb/pdb_tdb.c'
 
-PASSDB_MODULES_SRC = '''passdb/pdb_wbc_sam.c passdb/pdb_ads.c
-passdb/pdb_smbpasswd.c passdb/secrets.c'''
+PASSDB_MODULES_SRC = '''passdb/secrets.c'''
 #passdb/pdb_ldap.c passdb/pdb_nds.c'''
 
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
@@ -501,7 +493,7 @@ AUTH_SRC = '''${AUTH_SRC1} auth/auth.c ${AUTH_STATIC} auth/auth_util.c
 
 
 #FIXME: set IDMAP_STATIC during configuration
-IDMAP_STATIC='winbindd/idmap_tdb.c winbindd/idmap_passdb.c winbindd/idmap_nss.c'
+IDMAP_STATIC='winbindd/idmap_passdb.c'
 
 IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_STATIC}'
 
@@ -696,10 +688,9 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${AVAHI_SRC}
                 ${REG_FULL_SRC}
                 ${LIBNET_SRC}
-                ${RPC_LSA_SRC}
-                ${RPC_NETLOG_SRC} ${RPC_SAMR_SRC}
+                ${RPC_SAMR_SRC}
                 ${RPC_INITSHUTDOWN_SRC} ${RPC_REG_SRC}
-                ${RPC_DSSETUP_SRC} ${RPC_SVC_SRC} ${RPC_WKS_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}