From f4c96f944c455feb80b0b10fb6f343fff9fc84c9 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Thu, 3 Feb 2011 10:37:44 +0000 Subject: [PATCH] Let the caller log info about successful privilege drop. We don't want to log this in hastctl. MFC after: 1 week --- sbin/hastd/primary.c | 1 + sbin/hastd/secondary.c | 1 + sbin/hastd/subr.c | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index a82a0070975e..656ead955c5c 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -850,6 +850,7 @@ hastd_primary(struct hast_resource *res) cleanup(res); exit(EX_CONFIG); } + pjdlog_info("Privileges successfully dropped."); /* * Create the guard thread first, so we can handle signals from the diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index b19bb959c487..12a68deecf8c 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -414,6 +414,7 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin) if (drop_privs() != 0) exit(EX_CONFIG); + pjdlog_info("Privileges successfully dropped."); /* * Create the control thread before sending any event to the parent, diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index ae169759eed1..24d6dd51441d 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -184,7 +184,5 @@ drop_privs(void) PJDLOG_VERIFY(getgroups(1, gidset) == 1); PJDLOG_VERIFY(gidset[0] == pw->pw_gid); - pjdlog_info("Privileges successfully dropped."); - return (0); }