git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5685063
)
Fix error message for multiple authenticators misconfiguration. Bug 2817
author
Wolfgang Breyha
<wbreyha@gmx.net>
Sun, 24 Oct 2021 11:46:29 +0000
(12:46 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 24 Oct 2021 11:46:29 +0000
(12:46 +0100)
src/src/readconf.c
patch
|
blob
|
history
diff --git
a/src/src/readconf.c
b/src/src/readconf.c
index 754ab197b48da653ad51e5cb23558ccc03622c72..907ffeb71b87f7b16624c48866df31ea89e9b29f 100644
(file)
--- a/
src/src/readconf.c
+++ b/
src/src/readconf.c
@@
-4190,11
+4190,12
@@
for (auth_instance * au = auths; au; au = au->next)
for (auth_instance * bu = au->next; bu; bu = bu->next)
if (strcmpic(au->public_name, bu->public_name) == 0)
for (auth_instance * bu = au->next; bu; bu = bu->next)
if (strcmpic(au->public_name, bu->public_name) == 0)
- if ((au->client && bu->client) || (au->server && bu->server))
+ if ( au->client && bu->client
+ || au->server && bu->server)
log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "two %s authenticators "
"(%s and %s) have the same public name (%s)",
log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "two %s authenticators "
"(%s and %s) have the same public name (%s)",
- au->client
? US"client" : US"server", au->name, bu->name
,
- au->public_name);
+ au->client
&& bu->client ? US"client" : US"server"
,
+
au->name, bu->name,
au->public_name);
#ifndef DISABLE_PIPE_CONNECT
nauths++;
#endif
#ifndef DISABLE_PIPE_CONNECT
nauths++;
#endif