Static module inits for raduis and pam

diff --git a/src/src/drtables.c b/src/src/drtables.c
index 32765aedc264c4cae36a48122e54e4dd3adb5417..b9d4650f1dc1cef660809a98d992d241ec64db19 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -738,6 +738,9 @@ DEBUG(D_lookup) debug_printf("Loaded %d lookup modules\n", countmodules);
 }
 
 
 }
 
 

+/* Add module info struct to the modules list for those that are
+built as static */
+

 #if !defined(DISABLE_DKIM) && (!defined(SUPPORT_DKIM) || SUPPORT_DKIM!=2)
 extern misc_module_info dkim_module_info;
 #endif
 #if !defined(DISABLE_DKIM) && (!defined(SUPPORT_DKIM) || SUPPORT_DKIM!=2)
 extern misc_module_info dkim_module_info;
 #endif


@@ -750,6 +753,12 @@ extern misc_module_info spf_module_info;
 #if defined(EXPERIMENTAL_ARC) && (!defined(SUPPORT_ARC) || SUPPORT_ARC!=2)
 extern misc_module_info arc_module_info;
 #endif
 #if defined(EXPERIMENTAL_ARC) && (!defined(SUPPORT_ARC) || SUPPORT_ARC!=2)
 extern misc_module_info arc_module_info;
 #endif

+#if defined(RADIUS_CONFIG_FILE) && (!defined(SUPPORT_RADIUS) || SUPPORT_RADUIS!=2)
+extern misc_module_info radius_module_info;
+#endif
+#if defined(SUPPORT_PAM) && SUPPORT_PAM!=2
+extern misc_module_info pam_module_info;
+#endif

 
 void
 init_misc_mod_list(void)
 
 void
 init_misc_mod_list(void)


@@ -771,6 +780,12 @@ onetime = TRUE;
 #if defined(EXPERIMENTAL_ARC) && (!defined(SUPPORT_ARC) || SUPPORT_ARC!=2)
   misc_mod_add(&arc_module_info);
 #endif
 #if defined(EXPERIMENTAL_ARC) && (!defined(SUPPORT_ARC) || SUPPORT_ARC!=2)
   misc_mod_add(&arc_module_info);
 #endif

+#if defined(RADIUS_CONFIG_FILE) && (!defined(SUPPORT_RADIUS) || SUPPORT_RADUIS!=2)
+  misc_mod_add(&radius_module_info);
+#endif
+#if defined(SUPPORT_PAM) && SUPPORT_PAM!=2
+  misc_mod_add(&pam_module_info);
+#endif

 }
 
 
 }
 
 

diff --git a/src/src/miscmods/radius.c b/src/src/miscmods/radius.c
index 61ca6ea3aacfe619895a12bfb14431ec000cfdf5..6a8d41cac8e2b928e73fdf32b62b5dabeafeb9d1 100644 (file)
--- a/src/src/miscmods/radius.c
+++ b/src/src/miscmods/radius.c
@@ -228,7 +228,7 @@ static void * rad_functions[] = {
   [RADIUS_AUTH_CALL] = auth_call_radius,
 };
 
   [RADIUS_AUTH_CALL] = auth_call_radius,
 };
 

-misc_module_info rad_module_info =
+misc_module_info radius_module_info =

 {
   .name =              US"radius",
 # ifdef DYNLOOKUP
 {
   .name =              US"radius",
 # ifdef DYNLOOKUP