s4:s3compat Don't load or compile auth modules from source3

The only auth module should be the wrapper that plugs into the source4
auth subsystem, and builtin, for compatability.

Andrew Bartlett

diff --git a/source4/s3compat/auth_samba4.c b/source4/s3compat/auth_samba4.c
index 75ce44d4578c3c69e770dc74147c3e7ca43e9ff2..95d7c94cf6bfdba5f845c2da9902224f346d3c28 100644 (file)
--- a/source4/s3compat/auth_samba4.c
+++ b/source4/s3compat/auth_samba4.c
@@ -83,6 +83,7 @@ NTSTATUS auth_samba4_init(void)
        return NT_STATUS_OK;
 }
 
+/* Winbindd calls directly to this function, not via the full auth stack */
 NTSTATUS check_sam_security(const DATA_BLOB *challenge,
                            TALLOC_CTX *mem_ctx,
                            const struct auth_usersupplied_info *user_info,
@@ -106,3 +107,9 @@ NTSTATUS check_sam_security(const DATA_BLOB *challenge,
        talloc_free(tmp_ctx);
        return status;
 }
+
+/* smbd/process.c calls directly into this function originally from auth_domain.c */
+void attempt_machine_password_change(void)
+{
+       return;
+}

diff --git a/source4/s3compat/compat/config.h b/source4/s3compat/compat/config.h
index 66be2bbc855c31e44980150bd99062b3e7f754fb..f28f7ecbff92d4c1c97a234fe7facc14a9f75810 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 "pdb_ldap pdb_ads pdb_smbpasswd     pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_winreg rpc_initshutdown rpc_dssetup     rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc     rpc_spoolss rpc_eventlog rpc_samr rpc_rpcecho idmap_ldap idmap_tdb     idmap_passdb idmap_nss nss_info_template auth_sam auth_unix auth_winbind     auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default"
+#define STRING_STATIC_MODULES "pdb_ldap pdb_ads pdb_smbpasswd     pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_winreg rpc_initshutdown rpc_dssetup     rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon 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_rpc {  rpc_lsarpc_init();  rpc_winreg_init();     rpc_initshutdown_init();  rpc_dssetup_init();  rpc_wkssvc_init();     rpc_svcctl_init();  rpc_ntsvcs_init();  rpc_netlogon_init();     rpc_netdfs_init();  rpc_srvsvc_init();  rpc_spoolss_init();     rpc_eventlog_init();  rpc_samr_init();  rpc_rpcecho_init();}
-#define static_init_auth {  auth_sam_init();  auth_unix_init();     auth_winbind_init();  auth_wbc_init();  auth_server_init();     auth_domain_init();  auth_builtin_init();  auth_netlogond_init();}
+#define static_init_auth {  auth_builtin_init();  }
 #define static_init_nss_info {}
 #define static_init_charset {}
 #define static_init_idmap {}

diff --git a/source4/s3compat/s3replace.c b/source4/s3compat/s3replace.c
index 16526ec6d4dd0c1b7bfcd5a510df08df14ccb968..0311c7fa8e1c75bd5fbce53e7908e8115e77e715 100644 (file)
--- a/source4/s3compat/s3replace.c
+++ b/source4/s3compat/s3replace.c
@@ -40,3 +40,4 @@ krb5_realm *krb5_princ_realm(krb5_context context, krb5_principal principal)
 {
        DEBUG(2,("WARNING: krb5_princ_set_realm not implemented in s3replace\n"));
 }
+

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 8186cf6dfd6a6ff6a09dd39f26f15bfe0ef6d32d..44299b0314f182db3b53aaaa6e290e9be287f420 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -425,9 +425,7 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
 
 EXTRA_SRC = ''
 
-AUTH_SRC1 = '''${AUTH_BUILTIN_SRC} ${AUTH_DOMAIN_SRC} ${AUTH_SAM_SRC}
-${AUTH_SERVER_SRC} ${AUTH_UNIX_SRC} ${AUTH_WINBIND_SRC}
-${AUTH_WBC_SRC} ${AUTH_SCRIPT_SRC} ${AUTH_NETLOGOND_SRC}'''
+AUTH_SRC1 = '''${AUTH_BUILTIN_SRC}'''
 
 DEVEL_HELP_WEIRD_SRC = '''modules/weird.c'''
 CP850_SRC = '''modules/CP850.c'''