From c96d5d5dfbd0a844516a0b7466bc67607237a5f2 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 11 Jan 2013 11:36:40 +0100 Subject: [PATCH] bug #1723: Install user hooks after bootstrapping the database. (cherry picked from commit 8c9498132e5ce41e98cdd00900fd0e68acd6cbd1) --- src/um/UserPool.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/um/UserPool.cc b/src/um/UserPool.cc index 44791f6291..f96b14d769 100644 --- a/src/um/UserPool.cc +++ b/src/um/UserPool.cc @@ -80,8 +80,6 @@ UserPool::UserPool(SqlDB * db, _session_expiration_time = __session_expiration_time; - register_hooks(hook_mads, remotes_location); - User * oneadmin_user = get(0, true); if (oneadmin_user != 0) @@ -89,6 +87,8 @@ UserPool::UserPool(SqlDB * db, oneadmin_name = oneadmin_user->get_name(); oneadmin_user->unlock(); + register_hooks(hook_mads, remotes_location); + return; } @@ -198,6 +198,8 @@ UserPool::UserPool(SqlDB * db, goto error_serveradmin; } + register_hooks(hook_mads, remotes_location); + return; error_no_file: