client: disable dynamic completions when in suid/sgid mode

src/client/commands/drop_db.rs

@@ -19,7 +19,8 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct DropDbArgs {
     /// The MySQL database(s) to drop
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_database_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     name: Vec<MySQLDatabase>,
 
     /// Print the information as JSON

src/client/commands/drop_user.rs

@@ -19,7 +19,8 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct DropUserArgs {
     /// The MySQL user(s) to drop
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     username: Vec<MySQLUser>,
 
     /// Print the information as JSON

src/client/commands/edit_privs.rs

@@ -29,7 +29,7 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct EditPrivsArgs {
     /// The MySQL database to edit privileges for
-    #[arg(add = ArgValueCompleter::new(mysql_database_completer))]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     pub name: Option<MySQLDatabase>,
 
     #[arg(

src/client/commands/lock_user.rs

@@ -17,8 +17,9 @@ use crate::{
 
 #[derive(Parser, Debug, Clone)]
 pub struct LockUserArgs {
-    /// The MySQL user(s) to lock
+    /// The MySQL user(s) to loc
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     username: Vec<MySQLUser>,
 
     /// Print the information as JSON

src/client/commands/passwd_user.rs

@@ -22,7 +22,7 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct PasswdUserArgs {
     /// The MySQL user whose password is to be changed
-    #[arg(add = ArgValueCompleter::new(mysql_user_completer))]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     username: MySQLUser,
 
     /// Read the new password from a file instead of prompting for it

src/client/commands/show_db.rs

@@ -18,7 +18,8 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct ShowDbArgs {
     /// The MySQL database(s) to show
-    #[arg(num_args = 0.., add = ArgValueCompleter::new(mysql_database_completer))]
+    #[arg(num_args = 0..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     name: Vec<MySQLDatabase>,
 
     /// Print the information as JSON

src/client/commands/show_privs.rs

@@ -19,7 +19,8 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct ShowPrivsArgs {
     /// The MySQL database(s) to show privileges for
-    #[arg(num_args = 0.., add = ArgValueCompleter::new(mysql_database_completer))]
+    #[arg(num_args = 0..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     name: Vec<MySQLDatabase>,
 
     /// Print the information as JSON

src/client/commands/show_user.rs

@@ -18,7 +18,8 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct ShowUserArgs {
     /// The MySQL user(s) to show
-    #[arg(num_args = 0.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 0..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     username: Vec<MySQLUser>,
 
     /// Print the information as JSON

src/client/commands/unlock_user.rs

@@ -18,7 +18,8 @@ use crate::{
 #[derive(Parser, Debug, Clone)]
 pub struct UnlockUserArgs {
     /// The MySQL user(s) to unlock
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     username: Vec<MySQLUser>,
 
     /// Print the information as JSON

src/client/mysql_admutils_compatibility/mysql_dbadm.rs

@@ -130,21 +130,23 @@ pub struct CreateArgs {
 #[derive(Parser)]
 pub struct DatabaseDropArgs {
     /// The name of the DATABASE(s) to drop.
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_database_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     name: Vec<MySQLDatabase>,
 }
 
 #[derive(Parser)]
 pub struct DatabaseShowArgs {
     /// The name of the DATABASE(s) to show.
-    #[arg(num_args = 0.., add = ArgValueCompleter::new(mysql_database_completer))]
+    #[arg(num_args = 0..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     name: Vec<MySQLDatabase>,
 }
 
 #[derive(Parser)]
 pub struct EditPermArgs {
     /// The name of the DATABASE to edit permissions for.
-    #[arg(add = ArgValueCompleter::new(mysql_database_completer))]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_database_completer)))]
     pub database: MySQLDatabase,
 }
 

src/client/mysql_admutils_compatibility/mysql_useradm.rs

@@ -93,21 +93,24 @@ pub struct CreateArgs {
 #[derive(Parser)]
 pub struct DeleteArgs {
     /// The name of the USER(s) to delete.
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     name: Vec<MySQLUser>,
 }
 
 #[derive(Parser)]
 pub struct PasswdArgs {
     /// The name of the USER(s) to change the password for.
-    #[arg(num_args = 1.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 1..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     name: Vec<MySQLUser>,
 }
 
 #[derive(Parser)]
 pub struct ShowArgs {
     /// The name of the USER(s) to show.
-    #[arg(num_args = 0.., add = ArgValueCompleter::new(mysql_user_completer))]
+    #[arg(num_args = 0..)]
+    #[cfg_attr(not(feature = "suid-sgid-mode"), arg(add = ArgValueCompleter::new(mysql_user_completer)))]
     name: Vec<MySQLUser>,
 }