From d93a89c8c52c4dc0f88ec35e949bf57b97b90cad Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Wed, 28 Aug 2013 12:57:12 -0600 Subject: [PATCH] don't load auth file twice at boot the stat wasn't getting cached on the initial load, so immediately after booting the janitor would notice it "changed", and reload it --- src/loader.c | 1 + src/main.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/loader.c b/src/loader.c index 9b914a6..d1ab7b6 100644 --- a/src/loader.c +++ b/src/loader.c @@ -463,6 +463,7 @@ bool load_auth_file(const char *fn) return false; } + log_debug("loading auth_file: \"%s\"", fn); disable_users(); p = buf; diff --git a/src/main.c b/src/main.c index 1b83d6a..a541bfe 100644 --- a/src/main.c +++ b/src/main.c @@ -302,7 +302,7 @@ void load_config(void) if (ok) { /* load users if needed */ if (cf_auth_type >= AUTH_TRUST) - load_auth_file(cf_auth_file); + loader_users_check(); loaded = true; } else if (!loaded) { die("Cannot load config file"); -- 2.40.0