diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-07-10 10:50:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:59:21 -0500 |
| commit | 69c0923c5ea02cd89c5465023692927d30043676 (patch) | |
| tree | e75481a6e3029e314fea1f7989709386561ab3f0 /source4 | |
| parent | 702372b343cd764b51f29fc0d6bf512197d2372d (diff) | |
| download | samba-69c0923c5ea02cd89c5465023692927d30043676.tar.gz samba-69c0923c5ea02cd89c5465023692927d30043676.tar.bz2 samba-69c0923c5ea02cd89c5465023692927d30043676.zip | |
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)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 8 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 0c8da06496..b53392e302 100644 --- 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 2d65a4d3ad..08f5dc721f 100644 --- 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" }, |