r23809: Don't give users the fantasy that we can control choice of GENSEC

security mechanisms at the moment.  I'll put this back when I
implement the functionality.

Andrew Bartlett
(This used to be commit 9a38ddc86fe8c68520622678eae81e4e90f427cf)

diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index 0c8da064965ba6c24ed9a195c29e266beeca276c..b53392e3024d7d1fedbddfc0d44a380621c903f1 100644 (file)
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -33,13 +33,12 @@
  *              -P --machine-pass
  *                 --simple-bind-dn
  *                 --password
- *                 --use-security-mechanisms
  */
 
 
 static BOOL dont_ask;
 
-enum opt { OPT_SIMPLE_BIND_DN, OPT_PASSWORD, OPT_KERBEROS, OPT_GENSEC_MECHS };
+enum opt { OPT_SIMPLE_BIND_DN, OPT_PASSWORD, OPT_KERBEROS };
 
 /*
   disable asking for a password
@@ -121,10 +120,6 @@ static void popt_common_credentials_callback(poptContext con,
                                                   : CRED_DONT_USE_KERBEROS);
                break;
        }
-       case OPT_GENSEC_MECHS:
-               /* Convert a list of strings into a list of available authentication standards */
-               
-               break;
                
        case OPT_SIMPLE_BIND_DN:
                cli_credentials_set_bind_dn(cmdline_credentials, arg);
@@ -144,6 +139,5 @@ struct poptOption popt_common_credentials[] = {
        { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password (implies -k)" },
        { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" },
        { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos" },
-       { "use-security-mechanisms", 0, POPT_ARG_STRING, NULL, OPT_GENSEC_MECHS, "Restricted list of authentication mechanisms available for use with this authentication"},
        { NULL }
 };

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 2d65a4d3ad1a76e4c01f2b470c9a04d40e447128..08f5dc721fb0d80f48dd8330e169ba48b9048729 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -65,7 +65,6 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
                { "all", 'a',    POPT_ARG_NONE, &options.all_records, 0, "(|(objectClass=*)(distinguishedName=*))", NULL },
                { "nosync", 0,   POPT_ARG_NONE, &options.nosync, 0, "non-synchronous transactions", NULL },
                { "sorted", 'S', POPT_ARG_NONE, &options.sorted, 0, "sort attributes", NULL },
-               { "sasl-mechanism", 0, POPT_ARG_STRING, &options.sasl_mechanism, 0, "choose SASL mechanism", "MECHANISM" },
                { "input", 'I', POPT_ARG_STRING, &options.input, 0, "Input File", "Input" },
                { "output", 'O', POPT_ARG_STRING, &options.output, 0, "Output File", "Output" },
                { NULL,    'o', POPT_ARG_STRING, NULL, 'o', "ldb_connect option", "OPTION" },