From: Jeremy Harris Date: Thu, 9 Jul 2020 11:27:12 +0000 (+0100) Subject: tidying X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/d78e97406b4d15e53a9eeb345ac07dc2fa69689e tidying --- diff --git a/src/src/exim.c b/src/src/exim.c index 3edbc29d3..6454bc6ae 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -4758,16 +4758,16 @@ for (i = 0;;) configuration specifies something to use. When running in the test harness, any setting of unknown_login overrides the actual name. */ -if (originator_login == NULL || f.running_in_test_harness) +if (!originator_login || f.running_in_test_harness) { - if (unknown_login != NULL) + if (unknown_login) { originator_login = expand_string(unknown_login); - if (originator_name == NULL && unknown_username != NULL) + if (!originator_name && unknown_username) originator_name = expand_string(unknown_username); - if (originator_name == NULL) originator_name = US""; + if (!originator_name) originator_name = US""; } - if (originator_login == NULL) + if (!originator_login) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Failed to get user name for uid %d", (int)real_uid); }