svn commit: samba r13340 - in branches/SAMBA_4_0/source/lib/ldb/tools: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-02-04 09:49:33 +0000 (Sat, 04 Feb 2006)
New Revision: 13340

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

Log:
The gensec_init() needs to be after the popt processing, as it
disables modules based on parametric options.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2006-02-04 09:48:22 UTC (rev 13339)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c	2006-02-04 09:49:33 UTC (rev 13340)
@@ -72,8 +72,6 @@
 	};
 
 #ifdef _SAMBA_BUILD_
-	gensec_init(); 
-
 	r = ldb_register_samba_handlers(ldb);
 	if (r != 0) {
 		goto failed;
@@ -198,6 +196,9 @@
 		}
 
 #ifdef _SAMBA_BUILD_
+		/* Must be after we have processed command line options */
+		gensec_init(); 
+
 		if (ldb_set_opaque(ldb, "sessionInfo", system_session(ldb))) {
 			goto failed;
 		}