diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-02-04 09:49:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:46 -0500 |
| commit | f1b2c6d686763078fbc7ce97bc63b68844d457da (patch) | |
| tree | 863154458375f9a7e659ac684dbeb18f84dff1c8 | |
| parent | 15f73e6404a9c83140892e51477cf38a24252027 (diff) | |
| download | samba-f1b2c6d686763078fbc7ce97bc63b68844d457da.tar.gz samba-f1b2c6d686763078fbc7ce97bc63b68844d457da.tar.bz2 samba-f1b2c6d686763078fbc7ce97bc63b68844d457da.zip | |
r13340: The gensec_init() needs to be after the popt processing, as it
disables modules based on parametric options.
Andrew Bartlett
(This used to be commit db32a81f3ea661e2308cccca8d6a251a3d57337e)
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 446923f282..1926df4c86 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -72,8 +72,6 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const }; #ifdef _SAMBA_BUILD_ - gensec_init(); - r = ldb_register_samba_handlers(ldb); if (r != 0) { goto failed; @@ -198,6 +196,9 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const } #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; } |