LScli :: search: remove buggy --subDn parameter

This commit is contained in:
Benjamin Renard 2020-08-07 10:55:18 +02:00
parent 5bbe076e23
commit 3dc0d7f637

View file

@ -1342,7 +1342,6 @@ class LSsearch extends LSlog_staticLoggerClass {
* - Optional arguments : * - Optional arguments :
* - -f|--filter : LDAP filter string * - -f|--filter : LDAP filter string
* - -b|--basedn : LDAP base DN * - -b|--basedn : LDAP base DN
* - --subDn : LDAP sub DN
* - -s|--scope : LDAP search scope (sub, one, base) * - -s|--scope : LDAP search scope (sub, one, base)
* - -l|--limit : search result size limit * - -l|--limit : search result size limit
* - -a|--approx : approximative search on provided pattern * - -a|--approx : approximative search on provided pattern
@ -1377,9 +1376,6 @@ class LSsearch extends LSlog_staticLoggerClass {
case '--basedn': case '--basedn':
$params['basedn'] = $command_args[++$i]; $params['basedn'] = $command_args[++$i];
break; break;
case '--subdn':
$params['subdn'] = $command_args[++$i];
break;
case '-s': case '-s':
case '--scope': case '--scope':
$params['scope'] = $command_args[++$i]; $params['scope'] = $command_args[++$i];
@ -1535,7 +1531,6 @@ class LSsearch extends LSlog_staticLoggerClass {
$command_opts = array ( $command_opts = array (
'-f', '--filter', '-f', '--filter',
'-b', '--basedn', '-b', '--basedn',
'--subdn',
'-s', '--scope', '-s', '--scope',
'-l', '--limit', '-l', '--limit',
'-a', '--approx', '-a', '--approx',
@ -1577,7 +1572,6 @@ class LSsearch extends LSlog_staticLoggerClass {
} }
else { else {
switch ($command_args[$i]) { switch ($command_args[$i]) {
case '--subdn':
case '-s': case '-s':
case '--scope': case '--scope':
case '-f': case '-f':
@ -1607,16 +1601,6 @@ class LSsearch extends LSlog_staticLoggerClass {
// Handle completion of args value // Handle completion of args value
LSlog :: debug("Last complete word = '".$command_args[$comp_word_num-1]."'"); LSlog :: debug("Last complete word = '".$command_args[$comp_word_num-1]."'");
switch ($command_args[$comp_word_num-1]) { switch ($command_args[$comp_word_num-1]) {
case '--subdn':
LScli :: need_ldap_con();
$subDns = LSsession :: getSubDnLdapServer();
if (is_array($subDns)) {
$subDns = array_keys($subDns);
LSlog :: debug('List of available subDns: '.implode(', ', $subDns));
}
else
$subDns = array();
return LScli :: autocomplete_opts($subDns, $comp_word);
case '-s': case '-s':
case '--scope': case '--scope':
return LScli :: autocomplete_opts(array('sub', 'one', 'base'), $comp_word); return LScli :: autocomplete_opts(array('sub', 'one', 'base'), $comp_word);
@ -1723,7 +1707,6 @@ LScli :: add_command(
' - Optional arguments :', ' - Optional arguments :',
' - -f|--filter : LDAP filter string', ' - -f|--filter : LDAP filter string',
' - -b|--basedn : LDAP base DN', ' - -b|--basedn : LDAP base DN',
' - --subDn : LDAP sub DN',
' - -s|--scope : LDAP search scope (sub, one, base)', ' - -s|--scope : LDAP search scope (sub, one, base)',
' - -l|--limit : search result size limit', ' - -l|--limit : search result size limit',
' - -a|--approx : approximative search on provided pattern', ' - -a|--approx : approximative search on provided pattern',