X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/44bbabb570db6e700a31469a0faf2ac27bf3bfe0..1ddb1855402d48ad735e46abaf0d662e45600ecd:/src/src/auths/gsasl_exim.h

diff --git a/src/src/auths/gsasl_exim.h b/src/src/auths/gsasl_exim.h
index 785b8538b..93e624362 100644
--- a/src/src/auths/gsasl_exim.h
+++ b/src/src/auths/gsasl_exim.h
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2012 */
+/* Copyright (c) The Exim Maintainers 2019-2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Copyright (c) Twitter Inc 2012 */
@@ -17,9 +18,18 @@ typedef struct {
   uschar *server_realm;
   uschar *server_mech;
   uschar *server_password;
+  uschar *server_key;
+  uschar *server_s_key;
   uschar *server_scram_iter;
   uschar *server_scram_salt;
+
+  uschar *client_username;
+  uschar *client_password;
+  uschar *client_authz;
+  uschar *client_spassword;
+
   BOOL    server_channelbinding;
+  BOOL	  client_channelbinding;
 } auth_gsasl_options_block;
 
 /* Data for reading the authenticator-specific options. */
@@ -35,8 +45,9 @@ extern auth_gsasl_options_block auth_gsasl_option_defaults;
 
 extern void auth_gsasl_init(auth_instance *);
 extern int auth_gsasl_server(auth_instance *, uschar *);
-extern int auth_gsasl_client(auth_instance *, smtp_inblock *,
-                                smtp_outblock *, int, uschar *, int);
-extern void auth_gsasl_version_report(FILE *f);
+extern int auth_gsasl_client(auth_instance *, void *,
+				int, uschar *, int);
+extern gstring * auth_gsasl_version_report(gstring *);
+extern void auth_gsasl_macros(void);
 
 /* End of gsasl_exim.h */