git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
routers
/
rf_queue_add.c
diff --git
a/src/src/routers/rf_queue_add.c
b/src/src/routers/rf_queue_add.c
index 784a5477fca25d2c98e8da40ab22dc101db2bb86..8d94f57254bf77f459a730d63941ffeb3c33b4b9 100644
(file)
--- a/
src/src/routers/rf_queue_add.c
+++ b/
src/src/routers/rf_queue_add.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../exim.h"
#include "rf_functions.h"
#include "../exim.h"
#include "rf_functions.h"
@@
-41,7
+43,7
@@
addr->prop.localpart_data = deliver_localpart_data; /* use in the transport */
/* Handle a local transport */
/* Handle a local transport */
-if (addr->transport
!= NULL
&& addr->transport->info->local)
+if (addr->transport && addr->transport->info->local)
{
ugid_block ugid;
{
ugid_block ugid;
@@
-50,11
+52,13
@@
if (addr->transport != NULL && addr->transport->info->local)
When getting the home directory out of the password information, set the
flag that prevents expansion later. */
When getting the home directory out of the password information, set the
flag that prevents expansion later. */
- if (pw
!= NULL
)
+ if (pw)
{
addr->uid = pw->pw_uid;
addr->gid = pw->pw_gid;
{
addr->uid = pw->pw_uid;
addr->gid = pw->pw_gid;
- setflag(addr, af_uid_set|af_gid_set|af_home_expanded);
+ setflag(addr, af_uid_set);
+ setflag(addr, af_gid_set);
+ setflag(addr, af_home_expanded);
addr->home_dir = string_copy(US pw->pw_dir);
}
addr->home_dir = string_copy(US pw->pw_dir);
}
@@
-65,12
+69,12
@@
if (addr->transport != NULL && addr->transport->info->local)
otherwise use the expanded value of router_home_directory. The flag also
tells the transport not to re-expand it. */
otherwise use the expanded value of router_home_directory. The flag also
tells the transport not to re-expand it. */
- if (rblock->home_directory
!= NULL
)
+ if (rblock->home_directory)
{
addr->home_dir = rblock->home_directory;
clearflag(addr, af_home_expanded);
}
{
addr->home_dir = rblock->home_directory;
clearflag(addr, af_home_expanded);
}
- else if (
addr->home_dir == NULL
&& testflag(addr, af_home_expanded))
+ else if (
!addr->home_dir
&& testflag(addr, af_home_expanded))
addr->home_dir = deliver_home;
addr->current_dir = rblock->current_directory;
addr->home_dir = deliver_home;
addr->current_dir = rblock->current_directory;
@@
-94,9
+98,9
@@
DEBUG(D_route)
{
debug_printf("queued for %s transport: local_part = %s\ndomain = %s\n"
" errors_to=%s\n",
{
debug_printf("queued for %s transport: local_part = %s\ndomain = %s\n"
" errors_to=%s\n",
-
(addr->transport == NULL)? US"<unset>" : addr->transport->name
,
+
addr->transport ? addr->transport->name : US"<unset>"
,
addr->local_part, addr->domain, addr->prop.errors_address);
addr->local_part, addr->domain, addr->prop.errors_address);
- debug_printf(" domain_data=%s localpart_data=%s\n", addr->prop.domain_data,
+ debug_printf(" domain_data=%s local
_
part_data=%s\n", addr->prop.domain_data,
addr->prop.localpart_data);
}
addr->prop.localpart_data);
}