s4:s3compat Remove even more Samba3 modules

This ensures we compile no auth modules into the s3compat tree.  The
config.h changes will need to be redone in a proper waf build script
at some point.

Andrew Bartlett

diff --git a/source4/s3compat/compat/config.h b/source4/s3compat/compat/config.h
index 298b5de63ecc5440d963d54c565154d6572213ad..60c74ce5f9c583088eef239412e7d78171da15ac 100644 (file)
--- a/source4/s3compat/compat/config.h
+++ b/source4/s3compat/compat/config.h
@@ -220,11 +220,11 @@ extern const char *dyn_CONFIGFILE;
 #define DEFAULT_UNIX_CHARSET "UTF-8"
 
 /* s3 modules */
-#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 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_templatevfs_default"
 #define static_init_vfs {  vfs_default_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_auth {  }
 #define static_init_nss_info {}
 #define static_init_charset {}
 #define static_init_idmap {idmap_passdb_init();}
@@ -232,7 +232,7 @@ extern const char *dyn_CONFIGFILE;
 #define charset_CP437_init init_samba_module
 #define charset_CP850_init init_samba_module
 #define charset_weird_init init_samba_module
-#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_auth 
 #define static_decl_charset
 #define static_decl_gpext
 #define static_decl_pdb 

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 312f98c616590e5779a47a0445fb003c96c771fd..a34a6da45b0fb72389cda8bdea628958eb0a9487 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -394,8 +394,6 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
 
 EXTRA_SRC = ''
 
-AUTH_SRC1 = '''${AUTH_BUILTIN_SRC}'''
-
 DEVEL_HELP_WEIRD_SRC = '''modules/weird.c'''
 CP850_SRC = '''modules/CP850.c'''
 CP437_SRC = '''modules/CP437.c'''
@@ -473,21 +471,11 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
 
 DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
 
-AUTH_BUILTIN_SRC = 'auth/auth_builtin.c'
-AUTH_DOMAIN_SRC = 'auth/auth_domain.c'
-AUTH_SAM_SRC = 'auth/auth_sam.c'
-AUTH_SERVER_SRC = 'auth/auth_server.c'
-AUTH_UNIX_SRC = 'auth/auth_unix.c'
-AUTH_WINBIND_SRC = 'auth/auth_winbind.c'
-AUTH_WBC_SRC = 'auth/auth_wbc.c'
-AUTH_SCRIPT_SRC = 'auth/auth_script.c'
-AUTH_NETLOGOND_SRC = 'auth/auth_netlogond.c'
-
 AUTH_BASE_SRC = '''${SLCACHE_SRC} auth/user_info.c 
                    auth/server_info_sam.c auth/server_info.c 
                    auth/token_util.c'''
 
-AUTH_SRC = '''${AUTH_SRC1} auth/auth.c ${AUTH_STATIC} auth/auth_util.c 
+AUTH_SRC = '''auth/auth.c ${AUTH_STATIC} auth/auth_util.c 
            auth/auth_compat.c 
            ${PLAINTEXT_AUTH_SRC}'''