STRLCPY/neomutt

■ ■ ■ ■ ■ ■

auto.def

		skipped 591 lines
592	592		if {[get-define want-sasl]} {
593	593		if {[get-define want-pkgconf]} {
594	594		pkgconf true libsasl2
595		-	define USE_SASL
	595	+	define USE_SASL_CYRUS
596	596		define-feature SASL
597	597		} else {
598	598		foreach sasl_lib {sasl2 sasl} {
599	599		if {[check-inc-and-lib sasl [opt-val with-sasl $prefix] \
600	600		sasl/sasl.h sasl_encode64 $sasl_lib]} {
601		-	define USE_SASL
	601	+	define USE_SASL_CYRUS
602	602		break
603	603		}
604	604		}
605		-	if {![get-define USE_SASL]} {
	605	+	if {![get-define USE_SASL_CYRUS]} {
606	606		user-error "Unable to find SASL"
607	607		}
608	608		}
		skipped 784 lines

■ ■ ■ ■ ■ ■

conn/lib.h

■ ■ ■ ■ ■ ■

imap/auth.c

		skipped 60 lines
61	61		{ imap_auth_oauth, "oauthbearer" },
62	62		{ imap_auth_xoauth2, "xoauth2" },
63	63		{ imap_auth_plain, "plain" },
64		-	#ifdef USE_SASL
	64	+	#ifdef USE_SASL_CYRUS
65	65		{ imap_auth_sasl, NULL },
66	66		#else
67	67		{ imap_auth_anon, "anonymous" },
		skipped 2 lines
70	70		{ imap_auth_gss, "gssapi" },
71	71		#endif
72	72		/* SASL includes CRAM-MD5 (and GSSAPI, but that's not enabled by default) */
73		-	#ifndef USE_SASL
	73	+	#ifndef HAVE_SASL
74	74		{ imap_auth_cram_md5, "cram-md5" },
75	75		#endif
76	76		{ imap_auth_login, "login" },
		skipped 77 lines

■ ■ ■ ■ ■ ■

imap/auth.h

		skipped 44 lines
45	45
46	46		/* external authenticator prototypes */
47	47		enum ImapAuthRes imap_auth_plain(struct ImapAccountData adata, const char method);
48		-	#ifndef USE_SASL
	48	+	#ifndef USE_SASL_CYRUS
49	49		enum ImapAuthRes imap_auth_anon(struct ImapAccountData adata, const char method);
50	50		enum ImapAuthRes imap_auth_cram_md5(struct ImapAccountData adata, const char method);
51	51		#endif
		skipped 1 lines
53	53		#ifdef USE_GSS
54	54		enum ImapAuthRes imap_auth_gss(struct ImapAccountData adata, const char method);
55	55		#endif
56		-	#ifdef USE_SASL
	56	+	#ifdef USE_SASL_CYRUS
57	57		enum ImapAuthRes imap_auth_sasl(struct ImapAccountData adata, const char method);
58	58		#endif
59	59		enum ImapAuthRes imap_auth_oauth(struct ImapAccountData adata, const char method);
		skipped 4 lines

■ ■ ■ ■ ■ ■

imap/config.c

		skipped 49 lines
50	50		{
51	51		if (imap_auth_is_valid(np->data))
52	52		continue;
53		-	#ifdef USE_SASL
	53	+	#ifdef USE_SASL_CYRUS
54	54		if (sasl_auth_validator(np->data))
55	55		continue;
56	56		#endif
		skipped 101 lines

■ ■ ■ ■ ■ ■

main.c

■ ■ ■ ■ ■ ■

mbox/mbox.c

		skipped 1819 lines
1820	1820		if (flags & (MUTT_MAILBOX_CHECK_FORCE \| MUTT_MAILBOX_CHECK_FORCE_STATS))
1821	1821		{
1822	1822		struct MboxAccountData *adata = mbox_adata_get(m);
1823		-	if (adata && mutt_file_stat_timespec_compare(&st, MUTT_STAT_MTIME, &adata->stats_last_checked) > 0)
	1823	+	if (adata && mutt_file_stat_timespec_compare(&st, MUTT_STAT_MTIME,
	1824	+	&adata->stats_last_checked) > 0)
1824	1825		{
1825	1826		bool old_peek = m->peekonly;
1826	1827		mx_mbox_open(m, MUTT_QUIET \| MUTT_NOSORT \| MUTT_PEEK);
		skipped 75 lines

■ ■ ■ ■ ■ ■

nntp/nntp.c

		skipped 63 lines
64	64		#ifdef USE_HCACHE
65	65		#include "protos.h"
66	66		#endif
67		-	#ifdef USE_SASL
	67	+	#ifdef USE_SASL_CYRUS
68	68		#include <sasl/sasl.h>
69	69		#include <sasl/saslutil.h>
70	70		#endif
		skipped 114 lines
185	185		mutt_str_cat(buf, sizeof(buf), " ");
186	186		mutt_str_copy(authinfo, buf + plen - 1, sizeof(authinfo));
187	187		}
188		-	#ifdef USE_SASL
	188	+	#ifdef USE_SASL_CYRUS
189	189		else if ((plen = mutt_str_startswith(buf, "SASL ")))
190	190		{
191	191		char *p = buf + plen;
		skipped 16 lines
208	208		}
209	209		} while (!mutt_str_equal(".", buf));
210	210		*buf = '\0';
211		-	#ifdef USE_SASL
	211	+	#ifdef USE_SASL_CYRUS
212	212		if (adata->authenticators && mutt_istr_find(authinfo, " SASL "))
213	213		mutt_str_copy(buf, adata->authenticators, sizeof(buf));
214	214		#endif
		skipped 158 lines
373	373		return 0;
374	374		}
375	375
376		-	#ifdef USE_SASL
	376	+	#ifdef USE_SASL_CYRUS
377	377		/**
378	378		* nntp_memchr - Look for a char in a binary buf, conveniently
379	379		* @param haystack [in/out] input: start here, output: store address of hit
		skipped 151 lines
531	531		}
532	532		else
533	533		{
534		-	#ifdef USE_SASL
	534	+	#ifdef USE_SASL_CYRUS
535	535		sasl_conn_t *saslconn = NULL;
536	536		sasl_interact_t *interaction = NULL;
537	537		int rc;
		skipped 115 lines
653	653		continue;
654	654		#else
655	655		continue;
656		-	#endif /* USE_SASL */
	656	+	#endif /* USE_SASL_CYRUS */
657	657		}
658	658
659	659		// L10N: %s is the method name, e.g. Anonymous, CRAM-MD5, GSSAPI, SASL
		skipped 2109 lines

■ ■ ■ ■ ■ ■

pop/auth.c

		skipped 37 lines
38	38		#include "core/lib.h"
39	39		#include "conn/lib.h"
40	40		#include "adata.h"
41		-	#ifdef USE_SASL
	41	+	#ifdef USE_SASL_CYRUS
42	42		#include <sasl/sasl.h>
43	43		#include <sasl/saslutil.h>
44	44		#endif
45	45
46		-	#ifdef USE_SASL
	46	+	#ifdef USE_SASL_CYRUS
47	47		/**
48	48		* pop_auth_sasl - POP SASL authenticator - Implements PopAuth::authenticate()
49	49		*/
		skipped 333 lines
383	383		static const struct PopAuth PopAuthenticators[] = {
384	384		// clang-format off
385	385		{ pop_auth_oauth, "oauthbearer" },
386		-	#ifdef USE_SASL
	386	+	#ifdef USE_SASL_CYRUS
387	387		{ pop_auth_sasl, NULL },
388	388		#endif
389	389		{ pop_auth_apop, "apop" },
		skipped 137 lines

■ ■ ■ ■ ■ ■

pop/config.c

		skipped 49 lines
50	50		{
51	51		if (pop_auth_is_valid(np->data))
52	52		continue;
53		-	#ifdef USE_SASL
	53	+	#ifdef USE_SASL_CYRUS
54	54		if (sasl_auth_validator(np->data))
55	55		continue;
56	56		#endif
		skipped 54 lines

■ ■ ■ ■ ■ ■

send/config.c

		skipped 68 lines
69	69		{
70	70		if (smtp_auth_is_valid(np->data))
71	71		continue;
72		-	#ifdef USE_SASL
	72	+	#ifdef USE_SASL_CYRUS
73	73		if (sasl_auth_validator(np->data))
74	74		continue;
75	75		#endif
		skipped 299 lines

■ ■ ■ ■ ■ ■

send/smtp.c

		skipped 49 lines
50	50		#include "mutt_account.h"
51	51		#include "mutt_globals.h"
52	52		#include "mutt_socket.h"
53		-	#ifdef USE_SASL
	53	+	#ifdef USE_SASL_CYRUS
54	54		#include <sasl/sasl.h>
55	55		#include <sasl/saslutil.h>
56	56		#include "options.h"
		skipped 362 lines
419	419		return smtp_get_resp(adata);
420	420		}
421	421
422		-	#ifdef USE_SASL
	422	+	#ifdef USE_SASL_CYRUS
423	423		/**
424	424		* smtp_auth_sasl - Authenticate using SASL
425	425		* @param adata SMTP Account data
		skipped 295 lines
721	721		{ smtp_auth_xoauth2, "xoauth2" },
722	722		{ smtp_auth_plain, "plain" },
723	723		{ smtp_auth_login, "login" },
724		-	#ifdef USE_SASL
	724	+	#ifdef USE_SASL_CYRUS
725	725		{ smtp_auth_sasl, NULL },
726	726		#endif
727	727		// clang-format on
		skipped 57 lines
785	785		/* Fall back to default: any authenticator */
786	786		mutt_debug(LL_DEBUG2, "Falling back to smtp_auth_sasl, if using sasl.\n");
787	787
788		-	#ifdef USE_SASL
	788	+	#ifdef USE_SASL_CYRUS
789	789		r = smtp_auth_sasl(adata, adata->auth_mechs);
790	790		#else
791	791		mutt_error(_("SMTP authentication requires SASL"));
		skipped 210 lines

■ ■ ■ ■ ■ ■

version.c