svn commit: samba r23809 - in branches/SAMBA_4_0/source/lib: cmdline ldb/tools

abartlet at samba.org abartlet at samba.org
Tue Jul 10 10:50:47 GMT 2007


Author: abartlet
Date: 2007-07-10 10:50:44 +0000 (Tue, 10 Jul 2007)
New Revision: 23809

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23809

Log:
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

Modified:
   branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
   branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c	2007-07-10 08:56:13 UTC (rev 23808)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c	2007-07-10 10:50:44 UTC (rev 23809)
@@ -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,11 +120,7 @@
 						   : 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);
 		break;
@@ -144,6 +139,5 @@
 	{ "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 }
 };

Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2007-07-10 08:56:13 UTC (rev 23808)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2007-07-10 10:50:44 UTC (rev 23809)
@@ -65,7 +65,6 @@
 		{ "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" },



More information about the samba-cvs mailing list