From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 9 Sep 2016 15:18:32 +0000 (+0300)
Subject: auth: Make sure auth_request_log_info() doesn't crash when there are no passdbs
X-Git-Tag: 2.2.26~264
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88eab5220d312cb3aea1e7edb9aa3758ed0cf336;p=thirdparty%2Fdovecot%2Fcore.git

auth: Make sure auth_request_log_info() doesn't crash when there are no passdbs

auth_request_is_disabled_master_user() could have caused such crash.
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index dfeaa83fda..b2e051beae 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -2406,9 +2406,14 @@ void auth_request_log_info(struct auth_request *auth_request,
 	if (auth_request->set->debug) {
 		/* auth_debug=yes overrides auth_verbose settings */
 	} else {
-		const char *db_auth_verbose = auth_request->userdb_lookup ?
-			auth_request->userdb->set->auth_verbose :
-			auth_request->passdb->set->auth_verbose;
+		const char *db_auth_verbose;
+
+		if (auth_request->userdb_lookup)
+			db_auth_verbose = auth_request->userdb->set->auth_verbose;
+		else if (auth_request->passdb != NULL)
+			db_auth_verbose = auth_request->passdb->set->auth_verbose;
+		else
+			db_auth_verbose = "d";
 		switch (db_auth_verbose[0]) {
 		case 'y':
 			break;