[?] Use error information in THROW expression on failed connection.

korydraughn · Jul 22, 2024 · d6d5376 · d6d5376
1 parent 0e7a8f3
commit d6d5376
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/lib/core/src/client_connection.cpp b/lib/core/src/client_connection.cpp
@@ -156,9 +156,9 @@ namespace irods::experimental
     {
         only_connect(_host, _port, _username);
 
-        if (clientLogin(conn_.get()) != 0) {
+        if (const auto ec = clientLogin(conn_.get()); ec < 0) {
             // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
-            THROW(AUTHENTICATION_ERROR, "Client login error");
+            THROW(ec, "Client login error");
         }
     } // connect_and_login
 
@@ -169,9 +169,9 @@ namespace irods::experimental
     {
         only_connect(_host, _port, _proxy_username, _username);
 
-        if (clientLogin(conn_.get()) != 0) {
+        if (const auto ec = clientLogin(conn_.get()); ec < 0) {
             // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
-            THROW(AUTHENTICATION_ERROR, "Client login error");
+            THROW(ec, "Client login error");
         }
     } // connect_and_login
 
@@ -183,6 +183,11 @@ namespace irods::experimental
         conn_.reset(
             rcConnect(_host.c_str(), _port, _username.name().c_str(), _username.zone().c_str(), NO_RECONN, &error));
 
+        if (error.status < 0) {
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
+            THROW(error.status, error.msg);
+        }
+
         if (!conn_) {
             // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
             THROW(USER_SOCK_CONNECT_ERR, "Connect error");
@@ -205,6 +210,11 @@ namespace irods::experimental
                                1,
                                NO_RECONN));
 
+        if (error.status < 0) {
+            // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
+            THROW(error.status, error.msg);
+        }
+
         if (!conn_) {
             // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
             THROW(USER_SOCK_CONNECT_ERR, "Connect error");