X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/13a4b4c1810a1a9f3c956f1e92807a0d86c6f5bf..38965d80d70cacd0c944d32f7107549a3a272b35:/src/src/auths/plaintext.c?ds=sidebyside diff --git a/src/src/auths/plaintext.c b/src/src/auths/plaintext.c index c12037562..814896047 100644 --- a/src/src/auths/plaintext.c +++ b/src/src/auths/plaintext.c @@ -2,10 +2,14 @@ * Exim - an Internet mail transport agent * *************************************************/ +/* Copyright (c) The Exim Maintainers 2020 - 2023 */ /* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include "../exim.h" + +#ifdef AUTH_PLAINTEXT /* Remainder of file */ #include "plaintext.h" @@ -60,9 +64,9 @@ auth_plaintext_init(auth_instance *ablock) { auth_plaintext_options_block *ob = (auth_plaintext_options_block *)(ablock->options_block); -if (ablock->public_name == NULL) ablock->public_name = ablock->name; -if (ablock->server_condition != NULL) ablock->server = TRUE; -if (ob->client_send != NULL) ablock->client = TRUE; +if (!ablock->public_name) ablock->public_name = ablock->name; +if (ablock->server_condition) ablock->server = TRUE; +if (ob->client_send) ablock->client = TRUE; } @@ -108,7 +112,7 @@ already been provided as part of the AUTH command. For the rest, send them out as prompts, and get a data item back. If the data item is "*", abandon the authentication attempt. Otherwise, split it into items as above. */ -while ( (s = string_nextinlist(&prompts, &sep, big_buffer, big_buffer_size)) +while ( (s = string_nextinlist(&prompts, &sep, NULL, 0)) && expand_nmax < EXPAND_MAXN) if (number++ > expand_nmax) if ((rc = auth_prompt(CUS s)) != OK) @@ -174,5 +178,6 @@ while ((s = string_nextinlist(&text, &sep, NULL, 0))) return FAIL; } -#endif /*!MACRO_PREDEF*/ +#endif /*!MACRO_PREDEF*/ +#endif /*AUTH_PLAINTEST*/ /* End of plaintext.c */