Merge branch 'cpp-1.0' into cpp-1.1

Also updated c/c to 3.3.17 - it was supposed to be merged earlier from
1.0, but has been lost somehow.

Author: lawrinn

README

@@ -176,6 +176,10 @@ logname                  Name of the file to write the log in. If the name is se
                          current dir on Windows, or $HOME or /tmp on other systems.   string
 initSql     One query or a semicolon separated list of queried to be executed at the
             connection time.                                                          string
+restrictedAuth           A comma separated list of allowed to use client-side plugins.
+                         The full list of available plugins is mysql_native_password,
+                         client_ed25519, auth_gssapi_client, caching_sha2_password,
+                         dialog and mysql_clear_password                              string
 
 
 Properties is map of strings, and is another way to pass optional parameters.

README.md

@@ -113,6 +113,7 @@ The list of supported options:
 | **`log`**|The logging level. Setting it to non-zero effectively turns on the logging. The levels are 1- error, 2- warning, 3- info, 4 - debug, 5-trace|*uint*|0||
 | **`logname`** |Name of the file to write the log in. If the name is set, and the log level is not, the level will be set to 'error'. The option does not have default value, but the logger has default name and location for the log file. The name is mariadbccpp.log, the location is %TMP% or %USERPROFILE% or current dir on Windows, or $HOME or /tmp on other systems.|*string*|||
 | **`initSql`** |One query or a semicolon separated list of queried to be executed at the connection time.|*string*|||
+| **`restrictedAuth`** |A comma separated list of allowed to use client-side plugins. The full list of available plugins is mysql_native_password, client_ed25519, auth_gssapi_client, caching_sha2_password, dialog and mysql_clear_password|*string* |||
 
 
 Properties is map of strings, and is another way to pass optional parameters.

libmariadb

@@ -720,6 +720,14 @@ namespace sql
         "SQL command(s) to run at connection time",
         false,
         ""}
+      },
+      {
+        "restrictedAuth", {"restrictedAuth",
+        "1.0.6",
+        "A comma separated list of allowed to use client-side plugins. The full list of available plugins is"
+        " mysql_native_password, client_ed25519, auth_gssapi_client, caching_sha2_password, dialog and mysql_clear_password",
+        false,
+        ""}
       }
     };
 

src/options/DefaultOptions.cpp

@@ -1,5 +1,5 @@
 /************************************************************************************
-   Copyright (C) 2020 MariaDB Corporation AB
+   Copyright (C) 2020,2025 MariaDB Corporation plc
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -141,7 +141,8 @@ namespace mariadb
     OPTIONS_FIELD(useReadAheadInput),
     OPTIONS_FIELD(serverRsaPublicKeyFile),
     OPTIONS_FIELD(tlsPeerFP),
-    OPTIONS_FIELD(initSql)
+    OPTIONS_FIELD(initSql),
+    OPTIONS_FIELD(restrictedAuth)
   };
 
 
@@ -529,6 +530,9 @@ namespace mariadb
     if (!(initSql.compare(opt->initSql) == 0)) {
       return false;
     }
+    if (!(restrictedAuth.compare(opt->restrictedAuth) == 0)) {
+      return false;
+    }
     return minPoolSize == opt->minPoolSize;
   }
 
@@ -626,6 +630,7 @@ namespace mariadb
 
     result= 31*result + (!tlsPeerFPList.empty() ? tlsPeerFPList.hashCode() : 0);
     result= 31*result + (!initSql.empty() ? initSql.hashCode() : 0);
+    result= 31*result + (!restrictedAuth.empty() ? restrictedAuth.hashCode() : 0);
 
     return result;
   }

src/options/Options.cpp

@@ -139,6 +139,7 @@ struct Options
   SQLString serverRsaPublicKeyFile;
   SQLString tlsPeerFP;
   SQLString initSql;
+  SQLString restrictedAuth;
 
   SQLString toString() const;
   bool      equals(Options* obj);

src/options/Options.h

@@ -462,6 +462,10 @@ namespace capi
         mysql_optionsv(connection.get(), MYSQL_INIT_COMMAND, sql.c_str());
       }
     }
+    if (!options.get()->restrictedAuth.empty()) {
+      mysql_optionsv(connection.get(), MARIADB_OPT_RESTRICTED_AUTH, options.get()->restrictedAuth.c_str());
+    }
+
     if (mysql_real_connect(connection.get(), NULL, NULL, NULL, NULL, 0, NULL, CLIENT_MULTI_STATEMENTS) == nullptr)
     {
       throw SQLException(mysql_error(connection.get()), mysql_sqlstate(connection.get()), mysql_errno(connection.get()));