Add support for the new modules system to auth/ (merge from HEAD)

(This used to be commit c7a1de090db35835be1a1623bfc80c04065c5dd9)

8 files changed, 105 insertions, 84 deletions

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 126a712fbd..71e9ab0428 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -23,26 +23,45 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
-/** List of various built-in authentication modules */
-
-static const struct auth_init_function_entry builtin_auth_init_functions[] = {
-	{ "guest", auth_init_guest },
-	{ "rhosts", auth_init_rhosts },
-	{ "hostsequiv", auth_init_hostsequiv },
-	{ "sam", auth_init_sam },	
-	{ "samstrict", auth_init_samstrict },
-	{ "unix", auth_init_unix },
-	{ "smbserver", auth_init_smbserver },
-	{ "ntdomain", auth_init_ntdomain },
-	{ "trustdomain", auth_init_trustdomain },
-	{ "winbind", auth_init_winbind },
-#ifdef DEVELOPER
-	{ "name_to_ntstatus", auth_init_name_to_ntstatus },
-	{ "fixed_challenge", auth_init_fixed_challenge },
-#endif
-	{ "plugin", auth_init_plugin },
-	{ NULL, NULL}
-};
+static struct auth_init_function_entry *backends = NULL;
+
+BOOL smb_register_auth(const char *name, auth_init_function init, int version)
+{
+	struct auth_init_function_entry *entry = backends;
+
+	if(version != AUTH_INTERFACE_VERSION)
+		return False;
+
+	DEBUG(5,("Attempting to register auth backend %s\n", name));
+
+	while(entry) {
+		if (strequal(name, entry->name)) {
+			DEBUG(0,("There already is an auth backend registered with the name %s!\n", name));
+			return False;
+		}
+		entry = entry->next;
+	}
+	
+	entry = smb_xmalloc(sizeof(struct auth_init_function_entry));
+	entry->name = smb_xstrdup(name);
+	entry->init = init;
+
+	DLIST_ADD(backends, entry);
+	DEBUG(5,("Successfully added auth backend '%s'\n", name));
+	return True;
+}
+
+static struct auth_init_function_entry *auth_find_backend_entry(const char *name)
+{
+	struct auth_init_function_entry *entry = backends;
+
+	while(entry) {
+		if (strequal(entry->name, name)) return entry;
+		entry = entry->next;
+	}
+	
+	return NULL;
+}
 
 /****************************************************************************
  Try to get a challenge out of the various authentication modules.
@@ -324,8 +343,8 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context,
 	auth_methods *list = NULL;
 	auth_methods *t = NULL;
 	auth_methods *tmp;
-	int i;
 	NTSTATUS nt_status;
+	static BOOL initialised_static_modules = False;
 
 	if (!text_list) {
 		DEBUG(2,("make_auth_context_text_list: No auth method list!?\n"));
@@ -334,15 +353,22 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context,
 	
 	if (!NT_STATUS_IS_OK(nt_status = make_auth_context(auth_context)))
 		return nt_status;
+
+	/* Initialise static modules if not done so yet */
+	if(!initialised_static_modules) {
+		static_init_auth;
+		initialised_static_modules = True;
+	}
 	
 	for (;*text_list; text_list++) { 
-		DEBUG(5,("make_auth_context_text_list: Attempting to find an auth method to match %s\n",
-					*text_list));
-		for (i = 0; builtin_auth_init_functions[i].name; i++) {
+			struct auth_init_function_entry *entry;
 			char *module_name = smb_xstrdup(*text_list);
 			char *module_params = NULL;
 			char *p;
 
+			DEBUG(5,("make_auth_context_text_list: Attempting to find an auth method to match %s\n",
+				 *text_list));
+
 			p = strchr(module_name, ':');
 			if (p) {
 				*p = 0;
@@ -352,20 +378,20 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context,
 
 			trim_string(module_name, " ", " ");
 
-			if (strequal(builtin_auth_init_functions[i].name, module_name)) {
-				DEBUG(5,("make_auth_context_text_list: Found auth method %s (at pos %d)\n", *text_list, i));
-				if (NT_STATUS_IS_OK(builtin_auth_init_functions[i].init(*auth_context, module_params, &t))) {
-					DEBUG(5,("make_auth_context_text_list: auth method %s has a valid init\n",
-								*text_list));
-					DLIST_ADD_END(list, t, tmp);
-				} else {
-					DEBUG(0,("make_auth_context_text_list: auth method %s did not correctly init\n",
-								*text_list));
-				}
-				break;
+			entry = auth_find_backend_entry(module_name);
+
+			if(!(entry = auth_find_backend_entry(module_name)) && !smb_probe_module("auth", module_name) && 
+			   !(entry = auth_find_backend_entry(module_name))) {
+				DEBUG(0,("make_auth_context_text_list: can't find auth method %s!\n", module_name));
+			} else if (!NT_STATUS_IS_OK(entry->init(*auth_context, module_params, &t))) {
+				DEBUG(0,("make_auth_context_text_list: auth method %s did not correctly init\n",
+							*text_list));
+			} else {
+				DEBUG(5,("make_auth_context_text_list: auth method %s has a valid init\n",
+							*text_list));
+				DLIST_ADD_END(list, t, tmp);
 			}
 			SAFE_FREE(module_name);
-		}
 	}
 	
 	(*auth_context)->auth_method_list = list;
@@ -417,7 +443,7 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context)
 			break;
 		case SEC_ADS:
 			DEBUG(5,("Making default auth method list for security=ADS\n"));
-			auth_method_list = str_list_make("guest sam ads winbind ntdomain", NULL);
+			auth_method_list = str_list_make("guest sam winbind ntdomain", NULL);
 			break;
 		default:
 			DEBUG(5,("Unknown auth method!\n"));
diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index a19c532fc9..509a4afba9 100644
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -161,50 +161,12 @@ NTSTATUS auth_init_fixed_challenge(struct auth_context *auth_context, const char
 	return NT_STATUS_OK;
 }
 
-/**
- * Outsorce an auth module to an external loadable .so
- *
- * Only works on systems with dlopen() etc.
- **/
-
-/* Plugin modules initialisation */
-
-NTSTATUS auth_init_plugin(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+int auth_builtin_init(void)
 {
-	void * dl_handle;
-	char *plugin_param, *plugin_name, *p;
-	auth_init_function plugin_init;
-
-	if (param == NULL) {
-		DEBUG(0, ("auth_init_plugin: The plugin module needs an argument!\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	plugin_name = smb_xstrdup(param);
-	p = strchr(plugin_name, ':');
-	if (p) {
-		*p = 0;
-		plugin_param = p+1;
-		trim_string(plugin_param, " ", " ");
-	} else plugin_param = NULL;
-
-	trim_string(plugin_name, " ", " ");
-
-	DEBUG(5, ("auth_init_plugin: Trying to load auth plugin %s\n", plugin_name));
-	dl_handle = sys_dlopen(plugin_name, RTLD_NOW );
-	if (!dl_handle) {
-		DEBUG(0, ("auth_init_plugin: Failed to load auth plugin %s using sys_dlopen (%s)\n",
-					plugin_name, sys_dlerror()));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-    
-	plugin_init = sys_dlsym(dl_handle, "auth_init");
-	if (!plugin_init){
-		DEBUG(0, ("Failed to find function 'auth_init' using sys_dlsym in sam plugin %s (%s)\n",
-					plugin_name, sys_dlerror()));	    
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	DEBUG(5, ("Starting sam plugin %s with paramater %s\n", plugin_name, plugin_param?plugin_param:"(null)"));
-	return plugin_init(auth_context, plugin_param, auth_method);
+	smb_register_auth("guest", auth_init_guest, AUTH_INTERFACE_VERSION);
+#ifdef DEVELOPER
+	smb_register_auth("fixed_challenge", auth_init_fixed_challenge, AUTH_INTERFACE_VERSION);
+	smb_register_auth("name_to_ntstatus", auth_init_name_to_ntstatus, AUTH_INTERFACE_VERSION);
+#endif
+	return True;
 }
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 534af2257d..24a5bb562c 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -24,7 +24,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
-BOOL global_machine_password_needs_changing = False;
+extern BOOL global_machine_password_needs_changing;
 
 extern userdom_struct current_user_info;
 
@@ -545,3 +545,10 @@ NTSTATUS auth_init_trustdomain(struct auth_context *auth_context, const char* pa
 	(*auth_method)->auth = check_trustdomain_security;
 	return NT_STATUS_OK;
 }
+
+int auth_domain_init(void) 
+{
+	smb_register_auth("trustdomain", auth_init_trustdomain, AUTH_INTERFACE_VERSION);
+	smb_register_auth("ntdomain", auth_init_ntdomain, AUTH_INTERFACE_VERSION);
+	return True;
+}
diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c
index 5451f7d930..db37193579 100644
--- a/source3/auth/auth_rhosts.c
+++ b/source3/auth/auth_rhosts.c
@@ -242,3 +242,10 @@ NTSTATUS auth_init_rhosts(struct auth_context *auth_context, const char *param,
 	(*auth_method)->name = "rhosts";
 	return NT_STATUS_OK;
 }
+
+int auth_rhosts_init(void)
+{
+	smb_register_auth("rhosts", auth_init_rhosts, AUTH_INTERFACE_VERSION);
+	smb_register_auth("hostsequiv", auth_init_hostsequiv, AUTH_INTERFACE_VERSION);
+	return True;
+}
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index b309833440..1fc8aa51bb 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -518,4 +518,9 @@ NTSTATUS auth_init_samstrict(struct auth_context *auth_context, const char *para
 	return NT_STATUS_OK;
 }
 
-
+int auth_sam_init(void)
+{
+	smb_register_auth("samstrict", auth_init_samstrict, AUTH_INTERFACE_VERSION);
+	smb_register_auth("sam", auth_init_sam, AUTH_INTERFACE_VERSION);
+	return True;
+}
diff --git a/source3/auth/auth_server.c b/source3/auth/auth_server.c
index 5144852d3b..a311f01dc3 100644
--- a/source3/auth/auth_server.c
+++ b/source3/auth/auth_server.c
@@ -400,3 +400,8 @@ NTSTATUS auth_init_smbserver(struct auth_context *auth_context, const char* para
 	(*auth_method)->free_private_data = free_server_private_data;
 	return NT_STATUS_OK;
 }
+
+int auth_server_init(void)
+{
+	return smb_register_auth("smbserver", auth_init_smbserver, AUTH_INTERFACE_VERSION);
+}
diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 4f44767a81..efab2046c3 100644
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -130,3 +130,7 @@ NTSTATUS auth_init_unix(struct auth_context *auth_context, const char* param, au
 	return NT_STATUS_OK;
 }
 
+int auth_unix_init(void)
+{
+	return smb_register_auth("unix", auth_init_unix, AUTH_INTERFACE_VERSION);
+}
diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 5e1567d3c1..e2a292dd01 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -134,3 +134,8 @@ NTSTATUS auth_init_winbind(struct auth_context *auth_context, const char *param,
 	(*auth_method)->auth = check_winbind_security;
 	return NT_STATUS_OK;
 }
+
+int auth_winbind_init(void)
+{
+	return smb_register_auth("winbind", auth_init_winbind, AUTH_INTERFACE_VERSION);
+}