Merge branch 'exim-4.96+security'

[exim.git] / src / src / auths / external.c

diff --git a/src/src/auths/external.c b/src/src/auths/external.c
index 10e1366a88523b94c55fd3c215329c68b8f577f4..f6aa527f2e5f4270feedc9788a2032d359d1778f 100644 (file)
--- a/src/src/auths/external.c
+++ b/src/src/auths/external.c
@@ -2,8 +2,9 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) Jeremy Harris 2019 */
+/* Copyright (c) Jeremy Harris 2019-2020 */
 /* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /* This file provides an Exim authenticator driver for
 a server to verify a client SSL certificate, using the EXTERNAL
@@ -17,12 +18,9 @@ method defined in RFC 4422 Appendix A.
 /* Options specific to the external authentication mechanism. */
 
 optionlist auth_external_options[] = {
-  { "client_send",     opt_stringptr,
-      (void *)(offsetof(auth_external_options_block, client_send)) },
-  { "server_param2",   opt_stringptr,
-      (void *)(offsetof(auth_external_options_block, server_param2)) },
-  { "server_param3",       opt_stringptr,
-      (void *)(offsetof(auth_external_options_block, server_param3)) },
+  { "client_send",     opt_stringptr, OPT_OFF(auth_external_options_block, client_send) },
+  { "server_param2",   opt_stringptr, OPT_OFF(auth_external_options_block, server_param2) },
+  { "server_param3",   opt_stringptr, OPT_OFF(auth_external_options_block, server_param3) },
 };
 
 /* Size of the options list. An extern variable has to be used so that its
@@ -106,7 +104,7 @@ if (expand_nmax == 0)       /* skip if rxd data */
 if (ob->server_param2)
   {
   uschar * s = expand_string(ob->server_param2);
-  auth_vars[expand_nmax] = s;
+  auth_vars[expand_nmax = 1] = s;
   expand_nstring[++expand_nmax] = s;
   expand_nlength[expand_nmax] = Ustrlen(s);
   if (ob->server_param3)