lib-master: Don't use USER environment in log prefix

USER environment is not so generally supported anymore. The tools
supporting it should change the log prefix themselves if they want it.

Also this fixes inconsistency where some tools logged "tool(USER): "
or "tool: " log prefix depending on whether the configuration was read
by executing doveconf or not (because doveconf dropped the USER
environment).

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index d1553da7bf05997cabb6375dc7c7c42dcd277241..32faf1b2065d3902caeba8d773f7816de2731230 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -570,12 +570,7 @@ master_service_init(const char *name, enum master_service_flags flags,
           we want to log */
        if (getenv(MASTER_SERVICE_LOG_SERVICE_ENV) != NULL)
                i_set_failure_internal();
-       if (getenv("USER") != NULL) {
-               i_set_failure_prefix("%s(%s): ", service->configured_name,
-                                    getenv("USER"));
-       } else {
-               i_set_failure_prefix("%s: ", service->configured_name);
-       }
+       i_set_failure_prefix("%s: ", service->configured_name);
 
        /* Initialize debug logging */
        value = getenv(DOVECOT_LOG_DEBUG_ENV);