r11988: Setup the sessionInfo just before the connect, rather than earlier

when we havn't finished popt.

Andrew Bartlett
(This used to be commit e5c5eb97a0ab841442b2c3fb5ea67f0d21b42932)

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index ca9d3847e851394ecbf2e140181d69c9cd0d7b23..0be8951b9f0b0fe16dd3a5c2b319de54d8f42aa5 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -76,10 +76,6 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
                goto failed;
        }
 
-       if (ldb_set_opaque(ldb, "sessionInfo", system_session(ldb))) {
-               goto failed;
-       }
-
 #endif
 
        ret = talloc_zero(ldb, struct ldb_cmdline);
@@ -169,6 +165,12 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const
                if (options.nosync) {
                        flags |= LDB_FLG_NOSYNC;
                }
+
+#ifdef _SAMBA_BUILD_
+               if (ldb_set_opaque(ldb, "sessionInfo", system_session(ldb))) {
+                       goto failed;
+               }
+#endif
                if (ldb_connect(ldb, ret->url, flags, ret->options) != 0) {
                        fprintf(stderr, "Failed to connect to %s - %s\n", 
                                ret->url, ldb_errstring(ldb));