lib-auth-client: auth-master - Improve some of the connection failure messages return...

diff --git a/src/lib-auth-client/auth-master.c b/src/lib-auth-client/auth-master.c
index 9960eb9813d2fc94f286b8ca8f40fe2a3a748c78..b363dc87b3dc2369779a7a8a9e16cb54c11b1ecb 100644 (file)
--- a/src/lib-auth-client/auth-master.c
+++ b/src/lib-auth-client/auth-master.c
@@ -207,8 +207,12 @@ static void auth_master_destroy(struct connection *_conn)
                auth_master_connection_failure(conn, NULL);
                break;
        default:
-               if (conn->requests_head != NULL)
+               if (conn->requests_head != NULL) {
                        e_error(conn->conn.event, "Disconnected unexpectedly");
+                       auth_master_connection_failure(conn,
+                               "Unexpectedly disconnected from auth service");
+                       break;
+               }
                auth_master_connection_failure(conn, NULL);
        }
 }
@@ -473,7 +477,8 @@ auth_master_delayed_connect_failure(struct auth_master_connection *conn)
 
        i_assert(conn->to_connect != NULL);
        timeout_remove(&conn->to_connect);
-       auth_master_connection_failure(conn, "Connect failed");
+       auth_master_connection_failure(conn,
+               "Failed to connect to auth service");
 }
 
 int auth_master_connect(struct auth_master_connection *conn)

diff --git a/src/lib-auth-client/test-auth-master.c b/src/lib-auth-client/test-auth-master.c
index dbfcc0c94bfa004888c49c7cc5a3c9772c3b9a95..5680b7da1d0c6bcfefbda04e84a858cf07f0d4c8 100644 (file)
--- a/src/lib-auth-client/test-auth-master.c
+++ b/src/lib-auth-client/test-auth-master.c
@@ -512,13 +512,15 @@ static bool test_client_passdb_disconnect(void)
        ret = test_client_passdb_lookup_simple("hendrik", FALSE, &error);
        test_out("run (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        test_expect_error_string("Disconnected unexpectedly");
        ret = test_client_passdb_lookup_simple_async("hendrik", FALSE, &error);
        test_out("run async (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        return FALSE;
 }
@@ -532,13 +534,15 @@ static bool test_client_passdb_reconnect(void)
        ret = test_client_passdb_lookup_simple("hendrik", TRUE, &error);
        test_out("run (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        test_expect_errors(2);
        ret = test_client_passdb_lookup_simple_async("hendrik", TRUE, &error);
        test_out("run async (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        return FALSE;
 }
@@ -726,13 +730,15 @@ static bool test_client_userdb_disconnect(void)
        ret = test_client_userdb_lookup_simple("hendrik", FALSE, &error);
        test_out("run (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        test_expect_error_string("Disconnected unexpectedly");
        ret = test_client_userdb_lookup_simple_async("hendrik", FALSE, &error);
        test_out("run async (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        return FALSE;
 }
@@ -746,13 +752,15 @@ static bool test_client_userdb_reconnect(void)
        ret = test_client_userdb_lookup_simple("hendrik", TRUE, &error);
        test_out("run (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        test_expect_errors(2);
        ret = test_client_userdb_lookup_simple_async("hendrik", TRUE, &error);
        test_out("run async (ret == -1)", ret == -1);
        test_assert(error != NULL &&
-                   str_begins_with(error, "Disconnected from auth service"));
+                   str_begins_with(error,
+                       "Unexpectedly disconnected from auth service"));
 
        return FALSE;
 }