auth: Removed USERDB_STATIC macro. It's always built anyway.

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index e0772d22463c3c0b6e47d53c77ce3722abdc3e6f..860f35beaa11ec447355a47e5c4785ed5362e54c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -258,7 +258,6 @@ dnl always enable all of the passbs and userdbs that don't require extra libs
 want_passwd=yes
 want_passwd_file=yes
 want_checkpassword=yes
-want_static_userdb=yes
 want_prefetch_userdb=yes
 
 AC_ISC_POSIX
@@ -1746,12 +1745,7 @@ passdb=""
 not_userdb=""
 not_passdb=""
 
-if test $want_static_userdb != no; then
-        AC_DEFINE(USERDB_STATIC,, Build with static userdb support)
-       userdb="$userdb static"
-else
-       not_userdb="$not_userdb static"
-fi
+userdb="$userdb static"
 
 if test $want_prefetch_userdb != no; then
         AC_DEFINE(USERDB_PREFETCH,, Build with prefetch userdb support)

diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index 84ab1476ccd6eb65ef0cd0393d2a4aae82a8cbae..b570aa993bd6df12fced48abe3dd498eff199c17 100644 (file)
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -122,8 +122,6 @@ void userdb_static_template_export(struct userdb_static_template *tmpl,
        }
 }
 
-#ifdef USERDB_STATIC
-
 struct static_context {
        userdb_callback_t *callback, *old_callback;
        void *old_context;
@@ -242,8 +240,3 @@ struct userdb_module_interface userdb_static = {
        NULL,
        NULL
 };
-#else
-struct userdb_module_interface userdb_static = {
-       .name = "static"
-};
-#endif